Author: bleny Date: 2013-04-26 11:11:47 +0200 (Fri, 26 Apr 2013) New Revision: 142 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: fix usage of fixedLocationFirsts comparator Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-04-26 08:53:22 UTC (rev 141) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/StoredArticles.java 2013-04-26 09:11:47 UTC (rev 142) @@ -51,12 +51,7 @@ Preconditions.checkArgument(article.equals(y.getArticle())); boolean xIsInFixedLocation = article.isFixedLocation(x.getLocation()); boolean yIsInFixedLocation = article.isFixedLocation(y.getLocation()); - int compare; - if (article.isFixedLocationsFirst()) { - compare = BooleanComparator.getTrueFirstComparator().compare(xIsInFixedLocation, yIsInFixedLocation); - } else { - compare = 0; - } + int compare = BooleanComparator.getBooleanComparator(article.isFixedLocationsFirst()).compare(xIsInFixedLocation, yIsInFixedLocation); return compare; } Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-26 08:53:22 UTC (rev 141) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-04-26 09:11:47 UTC (rev 142) @@ -6,6 +6,7 @@ import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -54,8 +55,11 @@ Article article = fixture("article2"); + Location fixedLocation = + Iterables.getOnlyElement(article.getFixedLocations()); + BookArticleRequest bookArticleRequest = - new BookArticleRequest(magalieUser, building, article, 11., destinationLocation, false); + new BookArticleRequest(magalieUser, building, article, 17., destinationLocation, false); BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); @@ -63,8 +67,15 @@ List<StorageMovement> storageMovements = bookArticleResult.getStorageMovementOrder().getStorageMovements(); + // for this article, not-fixed locations first, from lowest quantities to highest quantities Assert.assertEquals(2., storageMovements.get(0).getExpectedQuantity(), DELTA); - Assert.assertEquals(9., storageMovements.get(1).getExpectedQuantity(), DELTA); + Assert.assertNotEquals(fixedLocation, storageMovements.get(0).getOriginLocation()); + Assert.assertEquals(10., storageMovements.get(1).getExpectedQuantity(), DELTA); + Assert.assertNotEquals(fixedLocation, storageMovements.get(1).getOriginLocation()); + // now there is only the fixed site is remaining + Assert.assertEquals(5., storageMovements.get(2).getExpectedQuantity(), DELTA); + Assert.assertEquals(fixedLocation, storageMovements.get(2).getOriginLocation()); + } }