Author: bleny Date: 2013-05-21 15:16:47 +0200 (Tue, 21 May 2013) New Revision: 172 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2165 suggest locations of the same warehouse first Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-21 13:12:25 UTC (rev 171) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ReceptionServiceTest.java 2013-05-21 13:16:47 UTC (rev 172) @@ -117,11 +117,11 @@ List<StoredArticle> receivedArticles = service.getReceivedArticles(building, supplier.getId()); - StoredArticle onlyElement = + StoredArticle receivedArticle = Iterables.getOnlyElement(receivedArticles); ReceptionTask receptionTask = - service.getReceptionTask(onlyElement.getId()); + service.getReceptionTask(receivedArticle.getId()); Location fixedLocation = Iterables.getOnlyElement(article.getFixedLocations()); @@ -129,18 +129,18 @@ Assert.assertEquals(fixedLocation, receptionTask.getLocations().get(0)); // locations of the same warehouse - Assert.assertEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(1).getWarehouse()); - Assert.assertEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(2).getWarehouse()); - Assert.assertEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(3).getWarehouse()); + Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(1).getWarehouse()); + Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(2).getWarehouse()); + Assert.assertEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(3).getWarehouse()); // locations in another warehouse last - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(4).getWarehouse()); - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(5).getWarehouse()); - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(6).getWarehouse()); - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(7).getWarehouse()); - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(8).getWarehouse()); - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(9).getWarehouse()); - Assert.assertNotEquals(onlyElement.getLocation().getWarehouse(), receptionTask.getLocations().get(10).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(4).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(5).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(6).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(7).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(8).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(9).getWarehouse()); + Assert.assertNotEquals(receivedArticle.getLocation().getWarehouse(), receptionTask.getLocations().get(10).getWarehouse()); for (Location location : receptionTask.getLocations()) {