fixing syntax problems

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 d13e35d64e35937b451957687df7dd6f70f03604..7f03d600ad4fd0102956f6f184cd775c68617c2a 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
@@ -24,41 +24,41 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImplTes
 \r
 @RunWith(Suite.class)\r
 @Suite.SuiteClasses(\r
-               {\r
-                       //database\r
+        {\r
+            //database\r
 //                     CdmDataSourceTest.class,\r
 //                     DatabaseEnumTest.class,\r
 \r
-                       //dao.common\r
+            //dao.common\r
 //                     CdmEntityDaoBaseTest.class,\r
 //                     DaoBaseTest.class,\r
-                       DefinedTermDaoImplTest.class,\r
-                       IdentifiableDaoBaseTest.class,\r
+            DefinedTermDaoImplTest.class,\r
+            IdentifiableDaoBaseTest.class\r
 \r
-                       //dao.Taxon\r
+            //dao.Taxon\r
 //                     TaxonDaoHibernateImplTest.class\r
-               }\r
-       )\r
+        }\r
+    )\r
 public class CdmTestSuite {\r
-       @SuppressWarnings("unused")\r
-       private static final  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
-       // being used only as a holder for the above annotations\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
-                               CdmDataSourceTest.class,\r
-                               DatabaseEnumTest.class,\r
-                               //dao.common\r
-                               CdmEntityDaoBaseTest.class,\r
-                               DaoBaseTest.class,\r
-                               DefinedTermDaoImplTest.class,\r
-                               IdentifiableDaoBaseTest.class,\r
-                               //dao.Taxon\r
-                               TaxonDaoHibernateImplTest.class\r
-                                       );\r
-       }\r
+    //console test  //TODO test\r
+    public static void consoleRun() {\r
+        org.junit.runner.JUnitCore.runClasses(\r
+                //database\r
+                CdmDataSourceTest.class,\r
+                DatabaseEnumTest.class,\r
+                //dao.common\r
+                CdmEntityDaoBaseTest.class,\r
+                DaoBaseTest.class,\r
+                DefinedTermDaoImplTest.class,\r
+                IdentifiableDaoBaseTest.class,\r
+                //dao.Taxon\r
+                TaxonDaoHibernateImplTest.class\r
+                    );\r
+    }\r
 }
\ No newline at end of file

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_1.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_1.java
index cf835f223d7fac5d8c0d2f0e8218c01b65c57dc1..aa3cd916a91a57cab2110f7afc3c5ecfd882b154 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_1.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_1.java
@@ -24,23 +24,23 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImplTes
 \r
 @RunWith(Suite.class)\r
 @Suite.SuiteClasses(\r
-               {\r
-                       DefinedTermDaoImplTest.class,\r
-                       IdentifiableDaoBaseTest.class,\r
-                       /* FIXED:\r
-                        * eu.etaxonomy.cdm.persistence.dao.common.OperationNotSupportedInPriorViewException:\r
-                        *    IdentifiableDaoBase.findByTitle(String queryString, CdmBase sessionObject)\r
-                        *        at eu.etaxonomy.cdm.persistence.dao.hibernate.common.VersionableDaoBase.checkNotInPriorView(VersionableDaoBase.java:63)\r
-                        *\r
-                        */\r
-\r
-               }\r
-       )\r
+        {\r
+            DefinedTermDaoImplTest.class,\r
+            IdentifiableDaoBaseTest.class\r
+            /* FIXED:\r
+             * eu.etaxonomy.cdm.persistence.dao.common.OperationNotSupportedInPriorViewException:\r
+             *    IdentifiableDaoBase.findByTitle(String queryString, CdmBase sessionObject)\r
+             *           at eu.etaxonomy.cdm.persistence.dao.hibernate.common.VersionableDaoBase.checkNotInPriorView(VersionableDaoBase.java:63)\r
+             *\r
+             */\r
+\r
+        }\r
+    )\r
 public class TestsShouldNotFailInSuite_1 {\r
 \r
-       private static final  Logger logger = Logger.getLogger(TestsShouldNotFailInSuite_1.class);\r
+    private static final  Logger logger = Logger.getLogger(TestsShouldNotFailInSuite_1.class);\r
 \r
-       // the class remains completely empty,\r
-       // being used only as a holder for the above annotations\r
+    // the class remains completely empty,\r
+    // being used only as a holder for the above annotations\r
 \r
 }
\ No newline at end of file

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_2.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_2.java
index 4685c0acbf0e24f3cdb2477df7e5dc696b14929a..b6d091e449df11d317be30270da856fee554ff64 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_2.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_2.java
@@ -26,21 +26,21 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImplTes
 \r
 @RunWith(Suite.class)\r
 @Suite.SuiteClasses(\r
-               {\r
-                       AgentDaoImplTest.class,\r
-                       TypeDesignationDaoHibernateImplTest.class,\r
-                       /* TODO fails in TypeDesignationDaoHibernateImplTest.testSaveTypeDesignations\r
-                        * with:\r
-                        * org.hibernate.HibernateException: No Hibernate Session bound to thread, and configuration does not allow creation of non-transactional one here\r
-                        * at org.springframework.orm.hibernate3.SpringSessionContext.currentSession(SpringSessionContext.java:63)\r
-                        */\r
-               }\r
-       )\r
+        {\r
+            AgentDaoImplTest.class,\r
+            TypeDesignationDaoHibernateImplTest.class\r
+            /* TODO fails in TypeDesignationDaoHibernateImplTest.testSaveTypeDesignations\r
+             * with:\r
+             * org.hibernate.HibernateException: No Hibernate Session bound to thread, and configuration does not allow creation of non-transactional one here\r
+             * at org.springframework.orm.hibernate3.SpringSessionContext.currentSession(SpringSessionContext.java:63)\r
+             */\r
+        }\r
+    )\r
 public class TestsShouldNotFailInSuite_2 {\r
 \r
-       private static final  Logger logger = Logger.getLogger(TestsShouldNotFailInSuite_2.class);\r
+    private static final  Logger logger = Logger.getLogger(TestsShouldNotFailInSuite_2.class);\r
 \r
-       // the class remains completely empty,\r
-       // being used only as a holder for the above annotations\r
+    // the class remains completely empty,\r
+    // being used only as a holder for the above annotations\r
 \r
 }
\ No newline at end of file

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_3.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_3.java
index f7ff204c8b5a891831736ed5a535076e7cce1dee..d5248af517a0de51d59f8d45d3670a22bc39248b 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_3.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/suite/TestsShouldNotFailInSuite_3.java
@@ -20,40 +20,40 @@ import eu.etaxonomy.cdm.persistence.dao.hibernate.taxon.TaxonDaoHibernateImplTes
 \r
 @RunWith(Suite.class)\r
 @Suite.SuiteClasses(\r
-               {\r
-                       //MethodCacheImplTest.class,\r
-                       //GroupDaoHibernateImplTest.class,\r
-                       //OccurrenceDaoHibernateImplTest.class,\r
-                       CdmEntityDaoBaseTest.class,\r
-                       /*\r
-                        * FIXME:\r
-                        * DescriptionDaoHibernateImplTest.class Fails with "java.sql.BatchUpdateException: failed batch" on rollback after test,\r
-                        * this can be circumvented by manually editing org/unitils/dbunit/DbUnitModule.java in order to disable batched statements:\r
-                        * LINE 461: config.setProperty(FEATURE_BATCHED_STATEMENTS, "false");\r
-                        *\r
-                        * This reveals other errors during org.unitils.database.DatabaseModule.rollbackTransaction()\r
-                        * of test method testSaveClonedDescription():\r
-                        *\r
-                        *  - in hsqldb:\r
-                        *      Caused by: java.sql.SQLException: Violation of unique constraint SYS_PK_1209:\r
-                        *      duplicate value(s) for column(s) ID in statement\r
-                        *      [insert into TaxonBase (created, createdby_id, uuid, updated, updatedby_id, lsid_authority, lsid_lsid, lsid_namespace, lsid_object, lsid_revision, protectedtitlecache, titleCache, appendedphrase, doubtful, name_id, sec_id, usenamecache, excluded, taxonstatusunknown, taxonomicchildrencount, taxonomicparentcache_id, unplaced, DTYPE, id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Taxon', ?)]\r
-                        *              at org.hsqldb.jdbc.Util.throwError(Util.java:58)\r
-                        *\r
-                        *  - in h2:\r
-                        *              Caused by: org.h2.jdbc.JdbcSQLException: Unique index or primary key violation:\r
-                        *      PRIMARY_KEY_C0 ON PUBLIC.TAXONBASE(ID); SQL statement:\r
-                        *              insert into TaxonBase (created, createdby_id, uuid, updated, updatedby_id, lsid_authority, lsid_lsid, lsid_namespace, lsid_object, lsid_revision, protectedtitlecache, titleCache, appendedphrase, doubtful, name_id, sec_id, usenamecache, excluded, taxonstatusunknown, taxonomicchildrencount, taxonomicparentcache_id, unplaced, DTYPE, id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Taxon', ?) [23001-115]\r
-                        *\r
-                        */\r
-                       DescriptionDaoHibernateImplTest.class,\r
-                       TaxonDaoHibernateImplTest.class\r
-\r
-               }\r
-       )\r
+        {\r
+            //MethodCacheImplTest.class,\r
+            //GroupDaoHibernateImplTest.class,\r
+            //OccurrenceDaoHibernateImplTest.class,\r
+            CdmEntityDaoBaseTest.class,\r
+            /*\r
+             * FIXME:\r
+             * DescriptionDaoHibernateImplTest.class Fails with "java.sql.BatchUpdateException: failed batch" on rollback after test,\r
+             * this can be circumvented by manually editing org/unitils/dbunit/DbUnitModule.java in order to disable batched statements:\r
+             * LINE 461: config.setProperty(FEATURE_BATCHED_STATEMENTS, "false");\r
+             *\r
+             * This reveals other errors during org.unitils.database.DatabaseModule.rollbackTransaction()\r
+             * of test method testSaveClonedDescription():\r
+             *\r
+             *  - in hsqldb:\r
+             *      Caused by: java.sql.SQLException: Violation of unique constraint SYS_PK_1209:\r
+             *      duplicate value(s) for column(s) ID in statement\r
+             *      [insert into TaxonBase (created, createdby_id, uuid, updated, updatedby_id, lsid_authority, lsid_lsid, lsid_namespace, lsid_object, lsid_revision, protectedtitlecache, titleCache, appendedphrase, doubtful, name_id, sec_id, usenamecache, excluded, taxonstatusunknown, taxonomicchildrencount, taxonomicparentcache_id, unplaced, DTYPE, id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Taxon', ?)]\r
+             *         at org.hsqldb.jdbc.Util.throwError(Util.java:58)\r
+             *\r
+             *  - in h2:\r
+             *                 Caused by: org.h2.jdbc.JdbcSQLException: Unique index or primary key violation:\r
+             *      PRIMARY_KEY_C0 ON PUBLIC.TAXONBASE(ID); SQL statement:\r
+             *                 insert into TaxonBase (created, createdby_id, uuid, updated, updatedby_id, lsid_authority, lsid_lsid, lsid_namespace, lsid_object, lsid_revision, protectedtitlecache, titleCache, appendedphrase, doubtful, name_id, sec_id, usenamecache, excluded, taxonstatusunknown, taxonomicchildrencount, taxonomicparentcache_id, unplaced, DTYPE, id) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, 'Taxon', ?) [23001-115]\r
+             *\r
+             */\r
+            DescriptionDaoHibernateImplTest.class,\r
+            TaxonDaoHibernateImplTest.class\r
+\r
+        }\r
+    )\r
 public class TestsShouldNotFailInSuite_3 {\r
 \r
-       // the class remains completely empty,\r
-       // being used only as a holder for the above annotations\r
+    // the class remains completely empty,\r
+    // being used only as a holder for the above annotations\r
 \r
 }
\ No newline at end of file