re-integrating branch cdmlib/3.x-unitils-upgrade

[cdmlib.git] / cdmlib-persistence / src / test / java / eu / etaxonomy / cdm / test / suite / CdmTestSuite.java

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
index 2fa61a928a5651224a334f332b4427c889b0d452..d13e35d64e35937b451957687df7dd6f70f03604 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/CdmTestSuite.java
@@ -1,42 +1,57 @@
+/**\r
+* Copyright (C) 2009 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
+\r
 package eu.etaxonomy.cdm.test.suite;\r
 \r
 import org.junit.runner.RunWith;\r
 import org.junit.runners.Suite;\r
 import org.apache.log4j.Logger;\r
 \r
+import eu.etaxonomy.cdm.database.CdmDataSourceTest;\r
 import eu.etaxonomy.cdm.database.DatabaseEnumTest;\r
-import eu.etaxonomy.cdm.persistence.dao.common.CdmEntityDaoBaseTest;\r
-import eu.etaxonomy.cdm.persistence.dao.common.DaoBaseTest;\r
-import eu.etaxonomy.cdm.persistence.dao.common.DefinedTermDaoImplTest;\r
-import eu.etaxonomy.cdm.persistence.dao.common.IdentifiableDaoBaseTest;\r
-import eu.etaxonomy.cdm.persistence.dao.taxon.TaxonDaoHibernateImplTest;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.CdmEntityDaoBaseTest;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.DaoBaseTest;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.DefinedTermDaoImplTest;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.common.IdentifiableDaoBaseTest;\r
+import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImplTest;\r
 \r
 \r
 @RunWith(Suite.class)\r
-@Suite.SuiteClasses( \r
-               {       \r
+@Suite.SuiteClasses(\r
+               {\r
                        //database\r
-                       DatabaseEnumTest.class,                 \r
+//                     CdmDataSourceTest.class,\r
+//                     DatabaseEnumTest.class,\r
+\r
                        //dao.common\r
-                       CdmEntityDaoBaseTest.class,\r
-                       DaoBaseTest.class,\r
+//                     CdmEntityDaoBaseTest.class,\r
+//                     DaoBaseTest.class,\r
                        DefinedTermDaoImplTest.class,\r
                        IdentifiableDaoBaseTest.class,\r
+\r
                        //dao.Taxon\r
-                       TaxonDaoHibernateImplTest.class\r
+//                     TaxonDaoHibernateImplTest.class\r
                }\r
        )\r
 public class CdmTestSuite {\r
-       static Logger logger = Logger.getLogger(CdmTestSuite.class);\r
+       @SuppressWarnings("unused")\r
+       private static final  Logger logger = Logger.getLogger(CdmTestSuite.class);\r
 \r
-       // the class remains completely empty, \r
+       // the class remains completely empty,\r
        // being used only as a holder for the above annotations\r
 \r
        //console test  //TODO test\r
        public static void consoleRun() {\r
                org.junit.runner.JUnitCore.runClasses(\r
                                //database\r
-                               DatabaseEnumTest.class,                 \r
+                               CdmDataSourceTest.class,\r
+                               DatabaseEnumTest.class,\r
                                //dao.common\r
                                CdmEntityDaoBaseTest.class,\r
                                DaoBaseTest.class,\r