better debugging when running unit tests

JumpMind · Nov 5, 2012 · f8b9033 · f8b9033
1 parent cefa36b
commit f8b9033
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java b/symmetric-client/src/test/java/org/jumpmind/symmetric/test/TestSetupUtil.java
@@ -53,7 +53,7 @@ protected static ISymmetricEngine prepareRoot(String sql) {
 
     public static IDatabasePlatform dropDatabaseTables(String databaseType, ISymmetricEngine engine) {
 
-        engine.uninstall();
+        engine.uninstall();       
 
         ISymmetricDialect dialect = engine.getSymmetricDialect();
 

diff --git a/symmetric-client/src/test/resources/log4j.xml b/symmetric-client/src/test/resources/log4j.xml
@@ -23,7 +23,6 @@
     <category name="org.jumpmind.symmetric.io.data.writer">
         <priority value="DEBUG" />
     </category>
-        -->     
           
     <category name="org.jumpmind.db.alter">
         <priority value="DEBUG" />
@@ -32,6 +31,8 @@
     <category name="org.jumpmind.symmetric.io.data.writer.DefaultDatabaseWriterConflictResolver">
         <priority value="DEBUG" />
     </category>    
+
+        -->     
 
     <category name="org.jumpmind.symmetric.ClientSymmetricEngine$PropertiesFactoryBean">
         <priority value="ERROR" />

diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/AbstractSymmetricEngine.java
@@ -114,7 +114,7 @@ abstract public class AbstractSymmetricEngine implements ISymmetricEngine {
 
     protected ISecurityService securityService;
 
-    protected IParameterService parameterService;
+    protected ParameterService parameterService;
 
     protected ISymmetricDialect symmetricDialect;
 
@@ -506,6 +506,9 @@ public synchronized boolean start(boolean startJobs) {
 
 
     public synchronized void uninstall() {
+
+        log.warn("Attempting an uninstall of all SymmetricDS database objects from the database");
+
         stop();
 
         try {
@@ -532,6 +535,10 @@ public synchronized void uninstall() {
 
         symmetricDialect.dropTablesAndDatabaseObjects();
 
+        parameterService.setDatabaseHasBeenInitialized(false);
+
+        log.warn("Finished uninstalling SymmetricDS database objects from the database");
+
     }    
 
     public synchronized void stop() {