Skip to content
Snippets Groups Projects
Commit e54c76be authored by felmer's avatar felmer
Browse files

remove debug print statements. Replace '==' by equals method in BaseTest.refresh(Space space)

SVN: 38974
parent 52a6a46e
No related branches found
No related tags found
No related merge requests found
...@@ -18,15 +18,11 @@ package ch.systemsx.cisd.openbis.systemtest; ...@@ -18,15 +18,11 @@ package ch.systemsx.cisd.openbis.systemtest;
import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.is;
import java.util.ArrayList;
import java.util.List;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
import ch.systemsx.cisd.common.exceptions.AuthorizationFailureException; 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.Experiment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Project;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy;
...@@ -72,14 +68,6 @@ public class AssignExperimentToProjectTest extends BaseTest ...@@ -72,14 +68,6 @@ public class AssignExperimentToProjectTest extends BaseTest
perform(anUpdateOf(experiment).toProject(destinationProject)); 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))); assertThat(sample, is(inSpace(destinationSpace)));
} }
...@@ -127,7 +115,6 @@ public class AssignExperimentToProjectTest extends BaseTest ...@@ -127,7 +115,6 @@ public class AssignExperimentToProjectTest extends BaseTest
{ {
sourceSpace = create(aSpace()); sourceSpace = create(aSpace());
destinationSpace = create(aSpace()); destinationSpace = create(aSpace());
System.out.println("ASSIGN EXPERIMENT TO PROJECT: destination space: " + destinationSpace+" (" + destinationSpace.getId()+")");
sourceProject = create(aProject().inSpace(sourceSpace)); sourceProject = create(aProject().inSpace(sourceSpace));
destinationProject = create(aProject().inSpace(destinationSpace)); destinationProject = create(aProject().inSpace(destinationSpace));
......
...@@ -498,7 +498,7 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT ...@@ -498,7 +498,7 @@ public abstract class BaseTest extends AbstractTransactionalTestNGSpringContextT
{ {
for (Space refreshed : commonServer.listSpaces(systemSessionToken)) for (Space refreshed : commonServer.listSpaces(systemSessionToken))
{ {
if (space.getId() == refreshed.getId()) if (space.getId().equals(refreshed.getId()))
{ {
return space; return space;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment