Author: bleny Date: 2013-07-13 16:11:55 +0200 (Sat, 13 Jul 2013) New Revision: 311 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: remove deprecated tests, update some tests Removed: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java Modified: trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java =================================================================== --- trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-13 11:48:38 UTC (rev 310) +++ trunk/magalie-services/src/main/java/com/franciaflex/magalie/services/service/RequestedArticleService.java 2013-07-13 14:11:55 UTC (rev 311) @@ -131,7 +131,7 @@ } - success = realTimeStorageMovementTask.isSuccess(); + success = articleIsAvailable; } @@ -367,7 +367,7 @@ + requestedList.getCode() + " as complete"); } - deliveredRequestedList.setStatus(DeliveredRequestedListStatus.COMPLETE); + // deliveredRequestedList.setStatus(DeliveredRequestedListStatus.COMPLETE); } 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-07-13 11:48:38 UTC (rev 310) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/ArticleStorageServiceTest.java 2013-07-13 14:11:55 UTC (rev 311) @@ -23,23 +23,16 @@ * #L% */ -import com.franciaflex.magalie.persistence.entity.Article; import com.franciaflex.magalie.persistence.entity.Building; import com.franciaflex.magalie.persistence.entity.Location; import com.franciaflex.magalie.persistence.entity.MagalieUser; -import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; -import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.Assert; import org.junit.Before; -import org.junit.Test; import java.text.ParseException; import java.util.Date; -import java.util.List; public class ArticleStorageServiceTest extends AbstractMagalieServiceTest { @@ -70,57 +63,4 @@ } - /** - * Checks that lowest quantity first policy is applied and fixed location first = false - * is considered. - */ - @Test - public void testOrder() { - - Article article = fixture("article2"); - - Location fixedLocation = - Iterables.getOnlyElement(article.getFixedLocations()); - - BookArticleRequest bookArticleRequest = - new BookArticleRequest(magalieUser, building, article, 17., destinationLocation, false); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertTrue(bookArticleResult.isSuccess()); - - 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.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()); - - } - - @Test - public void testUserCannotAccessArticle() { - - MagalieUser corinne = fixture("corinne"); - - Article article = fixture("article1"); - - Preconditions.checkState(article.getCode().equals("4034108")); - - BookArticleRequest bookArticleRequest = - new BookArticleRequest(corinne, building, article, 50., destinationLocation, true); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertFalse(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertTrue(bookArticleResult.isArticleInaccessible()); - - } - } Deleted: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-07-13 11:48:38 UTC (rev 310) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/OldFixturesArticleStorageServiceTest.java 2013-07-13 14:11:55 UTC (rev 311) @@ -1,263 +0,0 @@ -package com.franciaflex.magalie.services.service; - -/* - * #%L - * MagaLiE :: Services - * $Id:$ - * $HeadURL:$ - * %% - * Copyright (C) 2013 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ - -import com.franciaflex.magalie.persistence.entity.Article; -import com.franciaflex.magalie.persistence.entity.Building; -import com.franciaflex.magalie.persistence.entity.Location; -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; -import org.junit.Before; -import org.junit.Test; - -import java.text.ParseException; -import java.util.Date; - -public class OldFixturesArticleStorageServiceTest extends AbstractMagalieServiceTest { - - private static final Log log = LogFactory.getLog(OldFixturesArticleStorageServiceTest.class); - - protected ArticleStorageService service; - - protected Building building; - - protected Location destinationLocation; - - @Before - public void setUp() throws ParseException { - - loadFixtures("fixtures2"); - - building = fixture("B1"); - - destinationLocation = fixture("location5"); - - service = newService(ArticleStorageService.class); - - serviceContext.setDate(new Date(1363948427576l)); - - } - - @Test - public void testThrowUnavailableArticle() throws Exception { - - MagalieUser alexandre = fixture("alexandre"); - Article article = fixture("article1"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(alexandre, building, article, 100., destinationLocation, false); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertFalse(bookArticleResult.isSuccess()); - - Assert.assertTrue(bookArticleResult.isArticleUnavailable()); - - } - - @Test - public void testThrowRequiredDriverLicenceException() throws Exception { - - MagalieUser basile = fixture("basile"); - Article article = fixture("article1"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertFalse(bookArticleResult.isSuccess()); - Assert.assertTrue(bookArticleResult.isArticleInaccessible()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - - } - - @Test - public void testWithdrawArticleWithoutDriverLicense() throws Exception { - - MagalieUser basile = fixture("basile"); - Article article = fixture("article2"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 5., destinationLocation, false); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - - Assert.assertEquals(1, bookArticleResult.getStorageMovementOrder().getStorageMovements().size()); - - } - - @Test - public void testWithdrawArticleWithDriverLicense() throws Exception { - - MagalieUser alexandre = fixture("alexandre"); - Article article = fixture("article1"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(alexandre, building, article, 50., destinationLocation, false); - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); - StorageMovement location1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., location1.getExpectedQuantity(), DELTA); - StorageMovement location2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(30., location2.getExpectedQuantity(), DELTA); - - } - - @Test - public void testThrowRequiredCraneManLicenceException() throws Exception { - - MagalieUser basile = fixture("basile"); - Article article = fixture("article4"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertFalse(bookArticleResult.isSuccess()); - Assert.assertTrue(bookArticleResult.isArticleInaccessible()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - - } - - @Test - public void testWithCraneManWithLocationRequiredCraneMan() throws Exception { - - MagalieUser basile = fixture("alexandre"); - Article article = fixture("article4"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(basile, building, article, 70., destinationLocation, false); - - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - - } - - @Test - public void testWithdrawArticleConsiderAlreadyRemovedItem() throws Exception { - - MagalieUser alexandre = fixture("alexandre"); - MagalieUser cathy = fixture("cathy"); - - Article article = fixture("article1"); - - { - BookArticleRequest bookArticleRequest = new BookArticleRequest(alexandre, building, article, 30., destinationLocation, false); - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - Assert.assertEquals(2, storageMovementOrder.getStorageMovements().size()); - StorageMovement storageMovement1 = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(20., storageMovement1.getExpectedQuantity(), DELTA); - Assert.assertEquals("B2", storageMovement1.getOriginLocation().getCode()); - StorageMovement storageMovement2 = Iterables.get(storageMovementOrder.getStorageMovements(), 1, null); - Assert.assertEquals(10., storageMovement2.getExpectedQuantity(), DELTA); - Assert.assertEquals("A1", storageMovement2.getOriginLocation().getCode()); - } - - { - - BookArticleRequest bookArticleRequest = new BookArticleRequest(cathy, building, article, 30., destinationLocation, false); - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); - StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals(30., storageMovement.getExpectedQuantity(), DELTA); - Assert.assertEquals("A1", storageMovement.getOriginLocation().getCode()); - } - } - - @Test - public void testWithdrawArticleConsiderLocationsInError() throws Exception { - - MagalieUser alexandre = fixture("alexandre"); - MagalieUser cathy = fixture("cathy"); - - Article article = fixture("article1"); - - // report location 2 in error - Location location2 = fixture("location2"); - LocationErrorsService locationErrorsService = newService(LocationErrorsService.class); - locationErrorsService.reportError(location2, article, alexandre); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(cathy, building, article, 30., destinationLocation, false); - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - - Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); - StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertNotEquals( - "location2 must not be returned because it was reported in error", - location2.getId(), - storageMovement.getOriginLocation().getId()); - - } - - @Test - public void testWithdrawArticleWithBestEffortPolicy() throws Exception { - - MagalieUser alexandre = fixture("alexandre"); - Article article = fixture("article2"); - Location location1 = fixture("location1"); - - BookArticleRequest bookArticleRequest = new BookArticleRequest(alexandre, building, article, 30., destinationLocation, true); - BookArticleResult bookArticleResult = service.bookArticle(bookArticleRequest); - StorageMovementOrder storageMovementOrder = bookArticleResult.getStorageMovementOrder(); - - Assert.assertTrue(bookArticleResult.isSuccess()); - Assert.assertFalse(bookArticleResult.isArticleUnavailable()); - Assert.assertFalse(bookArticleResult.isArticleInaccessible()); - Assert.assertEquals(1, storageMovementOrder.getStorageMovements().size()); - StorageMovement storageMovement = Iterables.get(storageMovementOrder.getStorageMovements(), 0, null); - Assert.assertEquals("only 10 is available, so don't propose more", 10., storageMovement.getActualQuantity(), DELTA); - Assert.assertEquals(location1.getId(), storageMovement.getOriginLocation().getId()); - - } - -} Modified: trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java =================================================================== --- trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-07-13 11:48:38 UTC (rev 310) +++ trunk/magalie-services/src/test/java/com/franciaflex/magalie/services/service/RequestedArticleServiceTest.java 2013-07-13 14:11:55 UTC (rev 311) @@ -24,12 +24,13 @@ */ import com.franciaflex.magalie.persistence.entity.Building; -import com.franciaflex.magalie.persistence.entity.DeliveredRequestedList; -import com.franciaflex.magalie.persistence.entity.DeliveredRequestedListStatus; import com.franciaflex.magalie.persistence.entity.MagalieUser; import com.franciaflex.magalie.persistence.entity.RequestedArticle; +import com.franciaflex.magalie.persistence.entity.StorageMovement; import com.franciaflex.magalie.services.AbstractMagalieServiceTest; +import com.franciaflex.magalie.services.StorageMovementConfirmation; import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; import org.apache.commons.logging.Log; @@ -167,18 +168,20 @@ service.findOrderToExecute(fakePrioritySet, magalieUser, building); Assert.assertFalse(orderToExecute.isNothingToDo()); - Assert.assertTrue(orderToExecute.isEverythingUnavailable()); + Assert.assertFalse(orderToExecute.isEverythingUnavailable()); Assert.assertFalse(orderToExecute.isDriverLicenseRequired()); - Assert.assertFalse(orderToExecute.isSuccess()); + Assert.assertTrue(orderToExecute.isSuccess()); Assert.assertNull(orderToExecute.getOldAffectation()); - Assert.assertNull(orderToExecute.getNewAffectation()); + Assert.assertNotNull(orderToExecute.getNewAffectation()); } @Test public void testFindOrderAffectations() { + ImmutableSet<StorageMovement> emptySet = ImmutableSet.of(); + FindOrderToExecuteResult orderToExecute; // user is affected to first list, must know new affectation @@ -189,6 +192,10 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNotNull(orderToExecute.getNewAffectation()); + StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); + confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); + service.onStorageMovementConfirmation(confirmation, emptySet); + } // continuing first list, user affectation not changed @@ -199,6 +206,10 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNull(orderToExecute.getNewAffectation()); + StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); + confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); + service.onStorageMovementConfirmation(confirmation, emptySet); + } // first list is finished, must know old affectation and new affectation @@ -212,6 +223,10 @@ orderToExecute.getOldAffectation().getRequestedList(), orderToExecute.getNewAffectation().getRequestedList()); + StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); + confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); + service.onStorageMovementConfirmation(confirmation, emptySet); + } { @@ -221,51 +236,12 @@ Assert.assertNull(orderToExecute.getOldAffectation()); Assert.assertNull(orderToExecute.getNewAffectation()); - } + StorageMovementConfirmation confirmation = new StorageMovementConfirmation(); + confirmation.setRequestedArticleId(orderToExecute.getRequestedArticle().getId()); + service.onStorageMovementConfirmation(confirmation, emptySet); - } - - @Test - public void testCompleteStatusIsReachable() throws Exception { - - FindOrderToExecuteResult orderToExecute; - StorageMovementOrder storageMovementOrder; - DeliveredRequestedList deliveredRequestedList; - - // we will process a requested list with to articles to checks that the state is updated - - // first article - - { - - orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); - - Preconditions.checkState(orderToExecute.isSuccess()); - - storageMovementOrder = orderToExecute.getStorageMovementOrder(); - - service.onStorageMovementConfirmation(storageMovementOrder); - - deliveredRequestedList = service.getDeliveredRequestedList(storageMovementOrder.getId()); - - Assert.assertNotEquals(DeliveredRequestedListStatus.COMPLETE, deliveredRequestedList.getStatus()); - } - // now treat last article of the list to make it complete - - orderToExecute = service.findOrderToExecute(magalieUser, building, LIST_TYPE); - - Preconditions.checkState(orderToExecute.isSuccess()); - - storageMovementOrder = orderToExecute.getStorageMovementOrder(); - - service.onStorageMovementConfirmation(storageMovementOrder); - - deliveredRequestedList = service.getDeliveredRequestedList(storageMovementOrder.getId()); - - Assert.assertNotEquals(DeliveredRequestedListStatus.COMPLETE, deliveredRequestedList.getStatus()); - } }