Fix another test

jenkinsci · May 28, 2019 · 971794b · 971794b
1 parent 052e859
commit 971794b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/main/java/com/sonyericsson/jenkins/plugins/bfa/sod/ScanOnDemandQueue.java b/src/main/java/com/sonyericsson/jenkins/plugins/bfa/sod/ScanOnDemandQueue.java
@@ -87,19 +87,20 @@ public static void queue(ScanOnDemandTask task) {
      *
      */
     protected void startQueue() {
+        PluginImpl instance = PluginImpl.getInstance();
         if (executor == null) {
             logger.debug("Starting the sending thread pool.");
             executor = new ThreadPoolExecutor(
-                    PluginImpl.getInstance().getSodVariables().getMinimumSodWorkerThreads(),
-                    PluginImpl.getInstance().getSodVariables().getMinimumSodWorkerThreads(),
-                    PluginImpl.getInstance().getSodVariables().getSodThreadKeepAliveTime(), TimeUnit.MINUTES,
-                    new LinkedBlockingQueue<Runnable>());
+                    instance.getSodVariables().getMinimumSodWorkerThreads(),
+                    instance.getSodVariables().getMinimumSodWorkerThreads(),
+                    instance.getSodVariables().getSodThreadKeepAliveTime(), TimeUnit.MINUTES,
+                    new LinkedBlockingQueue<>());
             executor.allowCoreThreadTimeOut(true);
             executor.prestartCoreThread();
             logger.info("SendQueue started! Current pool size: {}", executor.getPoolSize());
         }
-        executor.setMaximumPoolSize(PluginImpl.getInstance().getSodVariables().getMaximumSodWorkerThreads());
-        executor.setCorePoolSize(PluginImpl.getInstance().getSodVariables().getSodCorePoolNumberOfThreads());
+        executor.setMaximumPoolSize(instance.getSodVariables().getMaximumSodWorkerThreads());
+        executor.setCorePoolSize(instance.getSodVariables().getSodCorePoolNumberOfThreads());
         logger.debug("SendQueue running. Current pool size: {}. Current Queue size: {}",
                 executor.getPoolSize(), getQueueSize());
         logger.debug("Nr of active pool-threads: {}", executor.getActiveCount());

diff --git a/src/test/java/com/sonyericsson/jenkins/plugins/bfa/sod/ScanOnDemandBaseActionTest.java b/src/test/java/com/sonyericsson/jenkins/plugins/bfa/sod/ScanOnDemandBaseActionTest.java
@@ -41,6 +41,7 @@
 import java.util.concurrent.TimeUnit;
 
 import jenkins.model.Jenkins;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.jvnet.hudson.test.JenkinsRule;
@@ -66,6 +67,11 @@ public class ScanOnDemandBaseActionTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    @Before
+    public void setup() {
+        PluginImpl.getInstance().setSodVariables(new ScanOnDemandVariables());
+    }
+
     private static final String TO_PRINT = "ERROR";
     /**
      * Tests for performScanMethod by passing failed build.