Skip to content
Snippets Groups Projects
Commit 5d8be035 authored by brinn's avatar brinn
Browse files

fix: test expectations due to changed order of returned result

SVN: 17201
parent 370e8165
No related branches found
No related tags found
No related merge requests found
...@@ -100,7 +100,7 @@ public class ScreeningApiImplTest extends AbstractServerTestCase ...@@ -100,7 +100,7 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
@Test @Test
public void testListImageDatasetsWithMissingPlateGeometry() public void testListImageDatasetsWithMissingPlateGeometry()
{ {
final PlateIdentifier pi1 = new PlateIdentifier("p1", null); final PlateIdentifier pi1 = new PlateIdentifier("p1", null, "permId");
context.checking(new Expectations() context.checking(new Expectations()
{ {
{ {
...@@ -123,7 +123,7 @@ public class ScreeningApiImplTest extends AbstractServerTestCase ...@@ -123,7 +123,7 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
fail("UserFailureException expected"); fail("UserFailureException expected");
} catch (UserFailureException ex) } catch (UserFailureException ex)
{ {
assertEquals("Sample /p1 has no property " + ScreeningConstants.PLATE_GEOMETRY, ex assertEquals("Sample 'permId' has no property " + ScreeningConstants.PLATE_GEOMETRY, ex
.getMessage()); .getMessage());
} }
context.assertIsSatisfied(); context.assertIsSatisfied();
...@@ -185,16 +185,18 @@ public class ScreeningApiImplTest extends AbstractServerTestCase ...@@ -185,16 +185,18 @@ public class ScreeningApiImplTest extends AbstractServerTestCase
screeningApi.listFeatureVectorDatasets(Arrays.asList(pi1)); screeningApi.listFeatureVectorDatasets(Arrays.asList(pi1));
assertEquals(2, dataSets.size()); assertEquals(2, dataSets.size());
assertEquals("3", dataSets.get(0).getDatasetCode());
assertEquals("2", dataSets.get(1).getDatasetCode()); assertEquals("2", dataSets.get(0).getDatasetCode());
assertEquals(Geometry.createFromRowColDimensions(16, 24), dataSets.get(0) assertEquals(Geometry.createFromRowColDimensions(16, 24), dataSets.get(0)
.getPlateGeometry()); .getPlateGeometry());
assertEquals(new Date(300), dataSets.get(0).getRegistrationDate()); assertEquals(new Date(200), dataSets.get(0).getRegistrationDate());
assertEquals(SERVER_URL, dataSets.get(0).getDatastoreServerUrl()); assertEquals(SERVER_URL, dataSets.get(0).getDatastoreServerUrl());
assertEquals(pi1, dataSets.get(0).getPlate()); assertEquals(pi1, dataSets.get(0).getPlate());
assertEquals("3", dataSets.get(1).getDatasetCode());
assertEquals(Geometry.createFromRowColDimensions(16, 24), dataSets.get(1) assertEquals(Geometry.createFromRowColDimensions(16, 24), dataSets.get(1)
.getPlateGeometry()); .getPlateGeometry());
assertEquals(new Date(200), dataSets.get(1).getRegistrationDate()); assertEquals(new Date(300), dataSets.get(1).getRegistrationDate());
assertEquals(SERVER_URL, dataSets.get(1).getDatastoreServerUrl()); assertEquals(SERVER_URL, dataSets.get(1).getDatastoreServerUrl());
assertEquals(pi1, dataSets.get(1).getPlate()); assertEquals(pi1, dataSets.get(1).getPlate());
context.assertIsSatisfied(); context.assertIsSatisfied();
......
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