Fix most tests

jenkinsci · May 27, 2019 · 052e859 · 052e859
1 parent e19691c
commit 052e859
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/main/java/com/sonyericsson/jenkins/plugins/bfa/PluginImpl.java b/src/main/java/com/sonyericsson/jenkins/plugins/bfa/PluginImpl.java
@@ -165,7 +165,7 @@ public PluginImpl() {
      * {@inheritDoc}
      */
     @Override
-    protected XmlFile getConfigFile() {
+    public XmlFile getConfigFile() {
         return new XmlFile(
                 XSTREAM,
                 new File(Jenkins.getInstance().getRootDir(), "build-failure-analyzer.xml")

diff --git a/src/test/java/com/sonyericsson/jenkins/plugins/bfa/db/EmbeddedMongoStatisticsTest.java b/src/test/java/com/sonyericsson/jenkins/plugins/bfa/db/EmbeddedMongoStatisticsTest.java
@@ -32,6 +32,7 @@
 import com.sonyericsson.jenkins.plugins.bfa.statistics.Statistics;
 import com.sonyericsson.jenkins.plugins.bfa.statistics.Statistics.UpstreamCause;
 import com.sonyericsson.jenkins.plugins.bfa.utils.ObjectCountPair;
+import jenkins.model.Jenkins;
 import org.jfree.data.time.Day;
 import org.jfree.data.time.Hour;
 import org.jfree.data.time.TimePeriod;
@@ -43,6 +44,7 @@
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -61,6 +63,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
 import static org.powermock.api.mockito.PowerMockito.mockStatic;
 import static org.powermock.api.mockito.PowerMockito.when;
 
@@ -71,7 +74,7 @@
  *
  */
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(PluginImpl.class)
+@PrepareForTest(value = {PluginImpl.class, Jenkins.class})
 @PowerMockIgnore("javax.management.*") //Solves PowerMock issue 277
 public class EmbeddedMongoStatisticsTest extends EmbeddedMongoTest {
     // CS IGNORE MagicNumber FOR NEXT 600 LINES. REASON: Test data.
@@ -110,6 +113,11 @@ public void setUp() throws IOException {
         filter1 = new GraphFilterBuilder();
         filter2 = new GraphFilterBuilder();
 
+        Jenkins mockJenkins = mock(Jenkins.class);
+        mockStatic(Jenkins.class);
+        when(Jenkins.getInstance()).thenReturn(mockJenkins);
+        when(mockJenkins.getRootDir()).thenReturn(new File(""));
+
         PluginImpl plugin = new PluginImpl();
         mockStatic(PluginImpl.class);
         when(PluginImpl.getInstance()).thenReturn(plugin);

diff --git a/src/test/resources/com/sonyericsson/jenkins/plugins/bfa/jcasc/jcasc-mongo-expected.yml b/src/test/resources/com/sonyericsson/jenkins/plugins/bfa/jcasc/jcasc-mongo-expected.yml
@@ -10,7 +10,7 @@ knowledgeBase:
 
     port: 27017
     successfulLogging: false
-    userName: bfa
+    userName: "bfa"
 maxLogSize: 10
 noCausesMessage: "No problems were identified. If you know why this problem occurred,\
   \ please add a suitable Cause for it."