Fix hanging tests.

Dempsy · May 17, 2017 · 0848587 · 0848587
1 parent 57defbe
commit 0848587
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/dempsy-framework.impl/src/main/java/net/dempsy/output/CronOutputSchedule.java b/dempsy-framework.impl/src/main/java/net/dempsy/output/CronOutputSchedule.java
@@ -34,7 +34,7 @@
 public class CronOutputSchedule implements OutputScheduler {
 
     /** The logger. */
-    private static Logger logger = LoggerFactory.getLogger(CronOutputSchedule.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(CronOutputSchedule.class);
 
     /** The scheduler. */
     private Scheduler scheduler;
@@ -80,7 +80,7 @@ public void start(final Infrastructure infra) {
             scheduler.scheduleJob(jobDetail, trigger);
             scheduler.start();
         } catch (final SchedulerException se) {
-            logger.error("Error occurred while starting the cron scheduler : " + se.getMessage(), se);
+            LOGGER.error("Error occurred while starting the cron scheduler : " + se.getMessage(), se);
         }
     }
 
@@ -98,9 +98,9 @@ public boolean isReady() {
     public void stop() {
         try {
             // gracefully shutting down
-            scheduler.shutdown(true);
+            scheduler.shutdown(false);
         } catch (final SchedulerException se) {
-            logger.error("Error occurred while stopping the cron scheduler : " + se.getMessage(), se);
+            LOGGER.error("Error occurred while stopping the cron scheduler : " + se.getMessage(), se);
         }
     }
 

diff --git a/dempsy-framework.impl/src/main/java/net/dempsy/output/RelativeOutputSchedule.java b/dempsy-framework.impl/src/main/java/net/dempsy/output/RelativeOutputSchedule.java
@@ -35,7 +35,7 @@
 public class RelativeOutputSchedule implements OutputScheduler {
 
     /** The logger. */
-    private static Logger logger = LoggerFactory.getLogger(RelativeOutputSchedule.class);
+    private static Logger LOGGER = LoggerFactory.getLogger(RelativeOutputSchedule.class);
 
     /** The interval. */
     private final long interval;
@@ -97,7 +97,7 @@ public void start(final Infrastructure infra) {
             scheduler.scheduleJob(jobDetail, trigger);
             scheduler.start();
         } catch (final SchedulerException se) {
-            logger.error("Error occurred while starting the relative scheduler : " + se.getMessage(), se);
+            LOGGER.error("Error occurred while starting the relative scheduler : " + se.getMessage(), se);
         }
     }
 
@@ -113,9 +113,9 @@ public boolean isReady() {
     public void stop() {
         try {
             // gracefully shutting down
-            scheduler.shutdown(true);
+            scheduler.shutdown(false);
         } catch (final SchedulerException se) {
-            logger.error("Error occurred while stopping the relative scheduler : " + se.getMessage(), se);
+            LOGGER.error("Error occurred while stopping the relative scheduler : " + se.getMessage(), se);
         }
     }
 }
diff --git a/dempsy-framework.impl/src/test/java/net/dempsy/DempsyBaseTest.java b/dempsy-framework.impl/src/test/java/net/dempsy/DempsyBaseTest.java
@@ -36,7 +36,7 @@ public abstract class DempsyBaseTest {
      * Setting 'hardcore' to true causes EVERY SINGLE IMPLEMENTATION COMBINATION to be used in
      * every runCombos call. This can make tests run for a loooooong time.
      */
-    public static boolean hardcore = Boolean.parseBoolean(System.getProperty("hardcore", "false"));
+    public static boolean hardcore = Boolean.parseBoolean(System.getProperty("hardcore", "true"));
 
     /**
      * If this is set to <code>true</code> then the serializers will be rotated through but
@@ -45,7 +45,7 @@ public abstract class DempsyBaseTest {
      * this to false isn't likely to provide any better results than running the test multiple
      * times.
      */
-    public static boolean butRotateSerializer = Boolean.parseBoolean(System.getProperty("butRotateSerializer", "true"));
+    public static boolean butRotateSerializer = Boolean.parseBoolean(System.getProperty("butRotateSerializer", "false"));
 
     protected Logger LOGGER;
 
@@ -228,8 +228,8 @@ public NodeManagerWithContext(final NodeManager manager, final ClassPathXmlAppli
 
         @Override
         public void close() throws Exception {
-            ctx.close();
             manager.close();
+            ctx.close();
         }
     }