debug and log

diff --git a/.gitignore b/.gitignore
index 5317e52e44ec3b54324569adda7f590955acac81..beed1be412b004e2b4c0fb5d25b32ec4381aedf7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -88,6 +88,7 @@ cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/PUBLIC.xsd
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/api/service/dataset.xsd
 cdmlib-services/src/test/resources/eu/etaxonomy/cdm/integrationTest.xml
 cdmlib-services/target
+cdmlib-services/testTaxonNodeByNameComparator-dump.xml
 /latestChanges.patch
 /target
 /testANTLR

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
index 5da8103124345248f6384dbb91511bd305881722..37423244f1715c578a767525f4a9c1a86bba94dc 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/api/service/ClassificationServiceImplTest.java
@@ -10,6 +10,9 @@
 
 package eu.etaxonomy.cdm.api.service;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -46,27 +49,27 @@ public class ClassificationServiceImplTest extends CdmIntegrationTest{
 
     @SpringBeanByType
     IClassificationService service;
-    
+
     @SpringBeanByType
     ITaxonNodeService taxonNodeService;
     private static final List<String> NODE_INIT_STRATEGY = Arrays.asList(new String[]{
-               "childNodes",
-               "childNodes.taxon",
-               "childNodes.taxon.name",
-                       "taxon.sec", 
-                       "taxon.name.*"
-                       });
-    
+            "childNodes",
+            "childNodes.taxon",
+            "childNodes.taxon.name",
+            "taxon.sec",
+            "taxon.name.*"
+            });
+
     private Comparator<? super TaxonNode> taxonNodeComparator;
-       
+
 
     /**
      * Test method for {@link eu.etaxonomy.cdm.api.service.ClassificationServiceImpl#setTaxonNodeComparator(eu.etaxonomy.cdm.model.taxon.ITaxonNodeComparator)}.
      */
     @Test
     public final void testSetTaxonNodeComparator() {
-       
-       
+
+
 //             fail("Not yet implemented");
     }
 
@@ -86,51 +89,59 @@ public class ClassificationServiceImplTest extends CdmIntegrationTest{
 //             fail("Not yet implemented");
     }
 
-   
+
     @Test
     @DataSet
     public final void testTaxonNodeByNameComparator() {
-       taxonNodeComparator = new TaxonNodeByNameComparator();
-       Classification classification = service.find(UUID.fromString("6c2bc8d9-ee62-4222-be89-4a8e31770878"));
-       
-       
-               //List<TaxonNode> taxonNodes = service.loadRankSpecificRootNodes(classification, Rank.GENUS(), NODE_INIT_STRATEGY);
-               
-               List<TaxonNode> taxonNodes = service.getAllNodes();
-               for (TaxonNode node: taxonNodes){
-                       taxonNodeService.load(node.getUuid(), NODE_INIT_STRATEGY);
-               }
-               TaxonNode nodeGenus = taxonNodeService.find(UUID.fromString("19a4fce2-8be5-4ec7-a6a7-f3974047ba5f"));
-               int index = taxonNodes.indexOf(nodeGenus);
-               taxonNodes.remove(index);
-               Collections.sort(taxonNodes, taxonNodeComparator);
-               
-               Assert.assertEquals("Acacia subg. Aculeiferum Pedley", taxonNodes.get(0).getTaxon().getName().getTitleCache());
-               
-               System.err.println();
-               for (TaxonNode node: taxonNodes){
-               System.err.println(node.getTaxon().getName().getTitleCache() );
-               /*for (TaxonNode child : node.getChildNodes()){
-                       System.err.println(child.getTaxon().getName().getTitleCache());
-               }*/
-       }
-               /*
-               ((TaxonNodeByNameComparator)taxonNodeComparator).setSortInfraGenericFirst(false);
-               Collections.sort(taxonNodes, taxonNodeComparator);
-               
-               Assert.assertEquals("Acacia cuspidifolia Maslin", taxonNodes.get(0).getTaxon().getName().getTitleCache());
-               System.err.println();
-               for (TaxonNode node: taxonNodes){
-               System.err.println(node.getTaxon().getName().getTitleCache() );
-               /*for (TaxonNode child : node.getChildNodes()){
-                       System.err.println(child.getTaxon().getName().getTitleCache());
-               }
-       }*/
+        taxonNodeComparator = new TaxonNodeByNameComparator();
+        Classification classification = service.find(UUID.fromString("6c2bc8d9-ee62-4222-be89-4a8e31770878"));
+
+//        try {
+//            printDataSet(new FileOutputStream(new File("testTaxonNodeByNameComparator-dump.xml")), new String[] {"DefinedTermBase," +
+//                    "AUDITEVENT", "HIBERNATE_SEQUENCES", "DEFINEDTERMBASE", "DEFINEDTERMBASE_AUD", "DEFINEDTERMBASE_CONTINENT", "DEFINEDTERMBASE_REPRESENTATION",
+//                    "DEFINEDTERMBASE_REPRESENTATION_AUD", "RELATIONSHIPTERMBASE_INVERSEREPRESENTATION", "RELATIONSHIPTERMBASE_INVERSEREPRESENTATION_AUD",
+//                    "REPRESENTATION", "REPRESENTATION_AUD", "TERMVOCABULARY", "TERMVOCABULARY_AUD", "TERMVOCABULARY_REPRESENTATION", "TERMVOCABULARY_REPRESENTATION_AUD" });
+//        } catch (FileNotFoundException e) {
+//            /* IGNORE */
+//        }
+
+        //List<TaxonNode> taxonNodes = service.loadRankSpecificRootNodes(classification, Rank.GENUS(), NODE_INIT_STRATEGY);
+
+        List<TaxonNode> taxonNodes = service.getAllNodes();
+        for (TaxonNode node: taxonNodes){
+            taxonNodeService.load(node.getUuid(), NODE_INIT_STRATEGY);
+        }
+        TaxonNode nodeGenus = taxonNodeService.find(UUID.fromString("19a4fce2-8be5-4ec7-a6a7-f3974047ba5f"));
+        int index = taxonNodes.indexOf(nodeGenus);
+        taxonNodes.remove(index);
+        Collections.sort(taxonNodes, taxonNodeComparator);
+
+        Assert.assertEquals("Acacia subg. Aculeiferum Pedley", taxonNodes.get(0).getTaxon().getName().getTitleCache());
+
+        System.err.println();
+        for (TaxonNode node: taxonNodes){
+            System.err.println(node.getTaxon().getName().getTitleCache() );
+            /*for (TaxonNode child : node.getChildNodes()){
+                System.err.println(child.getTaxon().getName().getTitleCache());
+            }*/
+        }
+        /*
+        ((TaxonNodeByNameComparator)taxonNodeComparator).setSortInfraGenericFirst(false);
+        Collections.sort(taxonNodes, taxonNodeComparator);
+
+        Assert.assertEquals("Acacia cuspidifolia Maslin", taxonNodes.get(0).getTaxon().getName().getTitleCache());
+        System.err.println();
+        for (TaxonNode node: taxonNodes){
+            System.err.println(node.getTaxon().getName().getTitleCache() );
+            /*for (TaxonNode child : node.getChildNodes()){
+                System.err.println(child.getTaxon().getName().getTitleCache());
+            }
+        }*/
 //             fail("Not yet implemented");
-    
+
     }
-    
-    
+
+
     /**
      * Test method for {@link eu.etaxonomy.cdm.api.service.ClassificationServiceImpl#loadRankSpecificRootNodes(eu.etaxonomy.cdm.model.taxon.Classification, eu.etaxonomy.cdm.model.name.Rank, java.util.List)}.
      */
@@ -138,11 +149,11 @@ public class ClassificationServiceImplTest extends CdmIntegrationTest{
     @DataSet
     @Ignore
     public final void testloadRankSpecificRootNodes(){
-       Classification classification = service.find(UUID.fromString("6c2bc8d9-ee62-4222-be89-4a8e31770878"));
-       
-               List<TaxonNode> taxonNodes = service.loadRankSpecificRootNodes(classification, Rank.SECTION_BOTANY(), NODE_INIT_STRATEGY);
-               Assert.assertEquals(2, taxonNodes.size());
-               
+        Classification classification = service.find(UUID.fromString("6c2bc8d9-ee62-4222-be89-4a8e31770878"));
+
+        List<TaxonNode> taxonNodes = service.loadRankSpecificRootNodes(classification, Rank.SECTION_BOTANY(), NODE_INIT_STRATEGY);
+        Assert.assertEquals(2, taxonNodes.size());
+
     }
 
     /**

diff --git a/cdmlib-services/src/test/resources/log4j.properties b/cdmlib-services/src/test/resources/log4j.properties
index 5509e355c9eecff4ca17dfd18b8eebfd07078482..81c96ba065ff160052b43c27924621d932314c09 100644 (file)
--- a/cdmlib-services/src/test/resources/log4j.properties
+++ b/cdmlib-services/src/test/resources/log4j.properties
@@ -1,7 +1,7 @@
 #
 #
-# If you are having problems with logging you may debug Log4J initialization, 
-# start the application with a system property log4j.configDebug set to "true". 
+# If you are having problems with logging you may debug Log4J initialization,
+# start the application with a system property log4j.configDebug set to "true".
 # E.g.:
 #
 #     java -Dlog4j.configDebug=true
@@ -27,10 +27,9 @@ log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
 log4j.rootLogger=warn, stdout, file
 
-       ### *** CDM *** ###
+  ### *** CDM *** ###
 
 log4j.logger.eu.etaxonomy.cdm = info
-log4j.logger.eu.etaxonomy.cdm.database.init = warn
 #
 log4j.logger.eu.etaxonomy.cdm.model.common.init = warn
 #
@@ -40,13 +39,14 @@ log4j.logger.eu.etaxonomy.cdm.api.application = warn
 log4j.logger.eu.etaxonomy.cdm.api.service = info
 #log4j.logger.eu.etaxonomy.cdm.database.VocabularyStoreImpl = warn
 #
-log4j.logger.eu.etaxonomy.cdm.database = warn
+log4j.logger.eu.etaxonomy.cdm.database.init = warn
+log4j.logger.eu.etaxonomy.cdm.database = info
 log4j.logger.eu.etaxonomy.cdm.persistence.dao.hibernate.common = warn
 
-               
 
 
-       ### *** SPRING ************ ###
+
+  ### *** SPRING ************ ###
 log4j.logger.org.springframework.transaction = warn
 log4j.logger.org.hibernate.engine.LoadContexts = warn
 log4j.logger.org.springframework.orm.hibernate3.SessionFactoryUtils = warn
@@ -55,7 +55,7 @@ log4j.logger.org.springframework.FileSystemXmlApplicationContext = warn;
 log4j.logger.org.springframework.core.io.support = warn
 
 
-       ### ***HIBERNATE ************ ###
+  ### ***HIBERNATE ************ ###
 
 log4j.logger.org.hibernate=warn
 
@@ -99,7 +99,7 @@ log4j.logger.org.hibernate.jdbc=info
 
 
    ### *** Profiling Logger ************ ###
-   
+
 #log4j.logger.org.springframework.aop.interceptor.PerformanceMonitorInterceptor=TRACE, profiling
 ### Profiling output
 #log4j.appender.profiling=org.apache.log4j.RollingFileAppender