Author: tchemit Date: 2012-11-25 12:42:20 +0100 (Sun, 25 Nov 2012) New Revision: 786 Url: http://forge.codelutin.com/repositories/revision/echobase/786 Log: replace usage of deprecated API Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/EchoBaseDateConverterTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -24,10 +24,10 @@ import fr.ifremer.echobase.entities.EntityModificationLog; import fr.ifremer.echobase.entities.EntityModificationLogImpl; -import junit.framework.Assert; import org.apache.commons.beanutils.BeanUtils; import org.apache.commons.beanutils.ConvertUtils; import org.apache.commons.beanutils.Converter; +import org.junit.Assert; import org.junit.Test; import java.util.Calendar; Modified: trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java =================================================================== --- trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-domain/src/test/java/fr/ifremer/echobase/persistence/EchoBaseDbMetaTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.references.Mission; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/DecoratorServiceTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -24,7 +24,7 @@ package fr.ifremer.echobase.services; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; -import junit.framework.Assert; +import org.junit.Assert; import org.junit.Test; import org.nuiton.util.decorator.Decorator; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/exportdb/ExportDbServiceTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -42,12 +42,11 @@ import fr.ifremer.echobase.io.EchoBaseIOUtil; import fr.ifremer.echobase.services.EchoBaseTestServiceSupport; import fr.ifremer.echobase.services.FakeEchoBaseServiceContext; -import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; import org.junit.Test; -import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.csv.in.TopiaCsvImports; import org.nuiton.topia.persistence.metadata.TableMeta; Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-11-25 11:29:52 UTC (rev 785) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/AbstractRemoveDataServiceTest.java 2012-11-25 11:42:20 UTC (rev 786) @@ -93,8 +93,8 @@ import fr.ifremer.echobase.services.importdata.ResultsVoyageImportService; import fr.ifremer.echobase.services.removedata.RemoveDataConfiguration; import fr.ifremer.echobase.services.removedata.RemoveDataService; -import junit.framework.Assert; import org.apache.commons.collections.CollectionUtils; +import org.junit.Assert; import org.junit.Before; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaDAO;