This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 7d6ffc34ab281ff1d54dd30eac5b31a71523547c Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Jan 9 18:50:09 2016 +0100 Toujours produire les tests au même endroit (on nettoie avat chaque test) afin de réduire l'empreinte disque --- .../fr/ird/observe/services/TestClassResource.java | 3 +- .../services/ApplicationContextResource.java | 2 +- .../main/java/fr/ird/observe/test/TestHelper.java | 140 ++------------------- 3 files changed, 15 insertions(+), 130 deletions(-) diff --git a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java index 6cf42cd..4a56d89 100644 --- a/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java +++ b/observe-services-rest/src/test/java/fr/ird/observe/services/TestClassResource.java @@ -35,6 +35,7 @@ import org.junit.runners.model.Statement; import org.nuiton.util.version.Version; import java.io.File; +import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Path; @@ -127,7 +128,7 @@ public class TestClassResource implements TestRule { }; } - protected void before(Description description) { + protected void before(Description description) throws IOException { Class<?> testClass = description.getTestClass(); if (log.isDebugEnabled()) { diff --git a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java index 95c6480..580378e 100644 --- a/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java +++ b/observe-services-topia/src/test/java/fr/ird/observe/services/ApplicationContextResource.java @@ -190,7 +190,7 @@ public class ApplicationContextResource implements TestRule { }; } - protected void before(Description description) { + protected void before(Description description) throws IOException { Class<?> testClass = description.getTestClass(); if (log.isDebugEnabled()) { diff --git a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java b/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java index aa3defc..cc1054b 100644 --- a/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java +++ b/observe-test-data/src/main/java/fr/ird/observe/test/TestHelper.java @@ -24,6 +24,7 @@ package fr.ird.observe.test; import com.google.common.base.Preconditions; import com.google.common.io.ByteStreams; import com.google.common.io.Resources; +import org.apache.commons.io.FileUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; @@ -39,7 +40,6 @@ import java.io.InputStream; import java.lang.annotation.Annotation; import java.lang.reflect.Modifier; import java.net.URL; -import java.util.Date; import java.util.List; import java.util.Properties; @@ -48,13 +48,13 @@ import java.util.Properties; */ public abstract class TestHelper { - /** Logger */ + /** + * Logger + */ private static final Log log = LogFactory.getLog(TestHelper.class); protected static final String BACKUP_SCRIPT_PATTERN = "/db/%1$s/%2$s.sql.gz"; - private static final String TEST_BASEDIR_PATTERN = "target%1$ssurefire-workdir%1$s%2$td_%2$tm_%2$tY%1$s%2$tH_%2$tM_%2$tS"; - public static final String TEST_H2_LOGIN = "sa"; public static final char[] TEST_H2_PASSWORD = "sa".toCharArray(); @@ -76,8 +76,6 @@ public abstract class TestHelper { protected static final String MODEL_VERSION_PROPERTY_NAME = "observetest.model.version"; - static private Long testsTimeStamp; - static private File testsBasedir; static private File basedir; @@ -108,109 +106,6 @@ public abstract class TestHelper { } } -// public static void assertReferentiel(DataSource localService, -// DataSource importService, -// ObserveEntityEnum... empty) -// throws DataSourceException { -// -// try { -// if (importService != null && !importService.isOpen()) { -// importService.doOpen(); -// } -// List<ObserveEntityEnum> observeEntityEnums = -// Arrays.asList(empty); -// // on verifie que le referentiel existe sur la nouvelle base -// for (ObserveEntityEnum constant : -// Entities.REFERENCE_ENTITIES) { -// Class<? extends TopiaEntity> c = constant.getContract(); -// List<?> actual = dataService.getList(localService, c); -// Assert.assertNotNull(actual); -// if (!observeEntityEnums.contains(constant)) { -// // FIXME Remove the empty reference list when all references will be filled -// if (!REFERENCE_TO_FILL.contains(constant)) -// // must not be empty -// Assert.assertFalse("la donnee de type " + c + -// " ne devrait pas etre vide...", -// actual.isEmpty()); -// } -//// Assert.assertFalse(c.getName(), actual.isEmpty()); -// if (importService != null) { -// List<?> expected = dataService.getList(importService, c); -// Assert.assertNotNull(expected); -// Assert.assertEquals(expected.size(), actual.size()); -// } -// } -// } finally { -// if (importService != null) { -// importService.doClose(false); -// } -// } -// } - -// protected static final Set<ObserveEntityEnum> REFERENCE_TO_FILL = Sets.newHashSet( -// Arrays.asList(ObserveEntityEnum.FpaZone, -// ObserveEntityEnum.BaitHaulingStatus, -// ObserveEntityEnum.BaitSettingStatus, -// ObserveEntityEnum.BaitType, -// ObserveEntityEnum.CatchFateLongline, -// ObserveEntityEnum.EncounterType, -// ObserveEntityEnum.Healthness, -// ObserveEntityEnum.HookPosition, -// ObserveEntityEnum.HookSize, -// ObserveEntityEnum.HookType, -// ObserveEntityEnum.ItemVerticalPosition, -// ObserveEntityEnum.ItemHorizontalPosition, -// ObserveEntityEnum.LightsticksColor, -// ObserveEntityEnum.LightsticksType, -// ObserveEntityEnum.LineType, -// ObserveEntityEnum.MaturityStatus, -// ObserveEntityEnum.MitigationType, -// ObserveEntityEnum.SensorBrand, -// ObserveEntityEnum.SensorDataFormat, -// ObserveEntityEnum.SensorType, -// ObserveEntityEnum.SettingShape, -// ObserveEntityEnum.SizeMeasureType, -// ObserveEntityEnum.StomacFullness, -// ObserveEntityEnum.TripType, -// ObserveEntityEnum.VesselActivityLongline, -// ObserveEntityEnum.WeightMeasureType -// )); -// -// public static PGDataSourceConfig createPGConfig(String dbName, -// boolean canMigrate, -// boolean canConnect, -// boolean isvalid) { -// -// PGDataSourceConfig config = DataSourceFactory.newPGConfig( -// dbName, -// TestHelper.TEST_REMOTE_ADMIN_LOGIN, -// TestHelper.TEST_REMOTE_PASSWORD, -// TestHelper.TEST_REMOTE_URL, -// canMigrate -// ); -// -// if (log.isInfoEnabled()) { -// log.info("==== create remotedb config : " + config.getLabel()); -// } -// if (canConnect) { -// Assert.assertEquals(canConnect, config.canConnect()); -// Assert.assertEquals(isvalid, config.isValid()); -// } -// Assert.assertEquals(canMigrate, config.isCanMigrate()); -// -// return config; -// } - - public static Long getTestsTimeStamp() { - if (testsTimeStamp == null) { - testsTimeStamp = System.currentTimeMillis(); - if (log.isInfoEnabled()) { - log.info("tests timestamp : " + testsTimeStamp); - } - } - return testsTimeStamp; - } - public static File getTestDir(Class<?> testClass) { return new File(getTestsBasedir(), testClass.getSimpleName()); } @@ -220,7 +115,8 @@ public abstract class TestHelper { } public static File getCommonsDir() { - return new File(testsBasedir, "commons"); + File baseDir = new File(System.getProperty("java.io.tmpdir")); + return new File(baseDir, "commons"); } public static File getBasedir() { @@ -236,30 +132,18 @@ public abstract class TestHelper { public static File getTestsBasedir() { if (testsBasedir == null) { - - String name = String.format(TEST_BASEDIR_PATTERN, - File.separator, - new Date(getTestsTimeStamp()) - ); - testsBasedir = new File(getBasedir(), name); + testsBasedir = getBasedir().toPath().resolve("target").resolve("surefire-workdir").resolve("tests").toFile(); } return testsBasedir; } - public static void initTest(Class<?> testClass) { + public static void initTest(Class<?> testClass) throws IOException { TEST_BASEDIR = getTestDir(testClass); - } -// public static SecurityModel createTestSecurityModel() { -// -// SecurityModel securityModel = new SecurityModel(); -// -// securityModel.setAdministrateur(TEST_REMOTE_ADMIN_LOGIN); -//// securityModel.setRole(Arrays.asList(TEST_REMOTE_TECHNICIENS_LOGIN), SecurityModel.Role.technicien); -// securityModel.setRole(TEST_REMOTE_UTILISATEUR_LOGIN, SecurityModel.Role.utilisateur, false); -// securityModel.setRole(TEST_REMOTE_REFERENTIEL_LOGIN, SecurityModel.Role.referentiel, false); -// return securityModel; -// } + if (TEST_BASEDIR.exists()) { + FileUtils.cleanDirectory(TEST_BASEDIR); + } + } public static String getBackupScript(Version version, String loadScript) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.