This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 741a13826817ce59543b6499905f6cc04982c809 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Aug 23 19:50:07 2015 +0200 Ajout d'une méthode pour tester que toutes les types d'entités sont bien créer sur un base --- observe-test-data/pom.xml | 5 ++ .../main/java/fr/ird/observe/test/TestHelper.java | 61 +++++++++------------- 2 files changed, 29 insertions(+), 37 deletions(-) diff --git a/observe-test-data/pom.xml b/observe-test-data/pom.xml index a43fad1..3d78039 100644 --- a/observe-test-data/pom.xml +++ b/observe-test-data/pom.xml @@ -77,6 +77,11 @@ <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.topia</groupId> + <artifactId>topia-persistence</artifactId> + </dependency> + <!-- test --> <dependency> <groupId>junit</groupId> 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 73267bd..5b7f739 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 @@ -23,10 +23,16 @@ package fr.ird.observe.test; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.nuiton.topia.persistence.TopiaApplicationContext; +import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaPersistenceContext; import org.nuiton.util.version.Version; import java.io.File; +import java.lang.reflect.Modifier; import java.util.Date; +import java.util.List; /** * @author Tony Chemit - chemit@codelutin.com @@ -69,22 +75,24 @@ public abstract class TestHelper { public static Class<?> testClass; -// public static void assertSchemaCreated(DataSource service, boolean noData) { -// -// // on verifie que le schema a bien ete cree -// for (Class<? extends TopiaEntity> c : -// ObserveDAOHelper.getContractClasses()) { -// if (Modifier.isAbstract(c.getModifiers())) { -// continue; -// } -// List<?> r = dataService.getList(service, c); -// Assert.assertNotNull(r); -// if (noData) { -// Assert.assertEquals(0, r.size()); -// } -// } -// } -// + public static void assertSchemaCreated(TopiaApplicationContext topiaApplicationContext, TopiaPersistenceContext persistenceContext, boolean noData) { + + // on verifie que le schema a bien ete cree + for (Class<TopiaEntity> c : topiaApplicationContext.getContractClasses()) { + if (Modifier.isAbstract(topiaApplicationContext.getImplementationClass(c).getModifiers())) { + continue; + } + if (log.isDebugEnabled()) { + log.debug("check table exists for entity: " + c.getName()); + } + List<?> r = persistenceContext.getDao(c).findAll(); + Assert.assertNotNull(r); + if (noData) { + Assert.assertEquals(0, r.size()); + } + } + } + // public static void assertReferentiel(DataSource localService, // DataSource importService, // ObserveEntityEnum... empty) @@ -207,10 +215,6 @@ public abstract class TestHelper { return new File(testsBasedir, testClass.getSimpleName()); } - public static File newLocalDB(String name) { - return new File(TEST_BASEDIR, "localDB_" + name); - } - public static File newFile(String name) { return new File(TEST_BASEDIR, name); } @@ -219,23 +223,6 @@ public abstract class TestHelper { return basedir; } -// public static void setConfig(String key, String value) { -// DefaultApplicationContext context = -// ObserveServiceHelper.get(); -// ApplicationConfig config = -// context.getContextValue(ApplicationConfig.class); -// config.setOption(key, value); -// } -// -// public static void createApplicationContext() { -// -// ObserveServiceHelper.close(); -// ObserveApplicationContext context = new ObserveApplicationContext(); -// ApplicationConfig conf = new ApplicationConfig(); -// context.setContextValue(conf); -// ObserveServiceHelper.set(context); -// } - public static void initTest(Class<?> testClass) { TEST_BASEDIR = getTestDir(testClass); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.