From e54c76be4fc5014e8c60ed942b86aca827067f5e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 29 Nov 2017 06:45:53 +0000
Subject: [PATCH] remove debug print statements. Replace '==' by equals method
in BaseTest.refresh(Space space)
SVN: 38974
---
.../systemtest/AssignExperimentToProjectTest.java | 13 -------------
.../cisd/openbis/systemtest/base/BaseTest.java | 2 +-
2 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
index fcc6024b7ab..77fe313cab2 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/AssignExperimentToProjectTest.java
@@ -18,15 +18,11 @@ package ch.systemsx.cisd.openbis.systemtest;
import static org.hamcrest.CoreMatchers.is;
-import java.util.ArrayList;
-import java.util.List;
-
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException;
-import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
@@ -72,14 +68,6 @@ public class AssignExperimentToProjectTest extends BaseTest
perform(anUpdateOf(experiment).toProject(destinationProject));
- List<Space> listSpaces = commonServer.listSpaces(systemSessionToken);
- List<String> rs = new ArrayList<String>();
- for (Space space : listSpaces)
- {
- rs.add(space + " (" + space.getId()+ ")");
- }
- System.out.println("ASSIGN EXPERIMENT TO PROJECT: spaces: " + rs);
-
assertThat(sample, is(inSpace(destinationSpace)));
}
@@ -127,7 +115,6 @@ public class AssignExperimentToProjectTest extends BaseTest
{
sourceSpace = create(aSpace());
destinationSpace = create(aSpace());
- System.out.println("ASSIGN EXPERIMENT TO PROJECT: destination space: " + destinationSpace+" (" + destinationSpace.getId()+")");
sourceProject = create(aProject().inSpace(sourceSpace));
destinationProject = create(aProject().inSpace(destinationSpace));
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java
index 7d0e6914943..ab79c313ab7 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java
@@ -498,7 +498,7 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
{
for (Space refreshed : commonServer.listSpaces(systemSessionToken))
{
- if (space.getId() == refreshed.getId())
+ if (space.getId().equals(refreshed.getId()))
{
return space;
}
--
GitLab