[JENKINS-25735] [JENKINS-41955] - Tests should invalidate caches wher…

…e possible
jenkinsci · Mar 16, 2017 · d3d8c23 · d3d8c23
1 parent ffd1d9b
commit d3d8c23
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 2 deletions.
diff --git a/src/main/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsConfig.java b/src/main/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsConfig.java
@@ -182,7 +182,7 @@ public synchronized void clear() {
         invalidatePasswordValueClassCaches();
     }
 
-    public synchronized void invalidatePasswordValueClassCaches() {
+    /*package*/ synchronized void invalidatePasswordValueClassCaches() {
         paramValueCache_maskedClasses.clear();
         paramValueCache_nonMaskedClasses.clear();
     }

diff --git a/...test/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsURLEncodingTest.java b/...test/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsURLEncodingTest.java
@@ -42,6 +42,7 @@
 import java.net.URLEncoder;
 import java.util.Set;
 import java.util.TreeSet;
+import org.junit.Before;
 
 @Issue("JENKINS-34908")
 public class MaskPasswordsURLEncodingTest {
@@ -52,7 +53,11 @@ public class MaskPasswordsURLEncodingTest {
     @Rule
     public RestartableJenkinsRule story = new RestartableJenkinsRule();
 
-
+    @Before
+    public void dropCache() {
+        MaskPasswordsConfig.getInstance().clear();
+    }
+
     @Test
     public void passwordMaskedEncoded() throws Exception {
         story.addStep(new Statement() {

diff --git a/src/test/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsWorkflowTest.java b/src/test/java/com/michelin/cio/hudson/plugins/maskpasswords/MaskPasswordsWorkflowTest.java
@@ -47,6 +47,7 @@
 import org.jenkinsci.plugins.workflow.test.steps.SemaphoreStep;
 import org.junit.Test;
 import static org.junit.Assert.*;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.runners.model.Statement;
@@ -63,6 +64,11 @@ public class MaskPasswordsWorkflowTest {
     @Rule
     public RestartableJenkinsRule story = new RestartableJenkinsRule();
 
+    @Before
+    public void dropCache() {
+        MaskPasswordsConfig.getInstance().clear();
+    }
+
     @Test
     public void configRoundTrip() throws Exception {
         story.addStep(new Statement() {

diff --git a/src/test/java/com/michelin/cio/hudson/plugins/passwordparam/PasswordParameterTest.java b/src/test/java/com/michelin/cio/hudson/plugins/passwordparam/PasswordParameterTest.java
@@ -39,6 +39,7 @@
 import java.io.IOException;
 import java.util.Collections;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.ClassRule;
 import org.junit.Rule;
 import org.junit.Test;
@@ -59,6 +60,11 @@ public class PasswordParameterTest {
     @Rule
     public JenkinsRule j = new JenkinsRule();
 
+    @Before
+    public void dropCache() {
+        MaskPasswordsConfig.getInstance().clear();
+    }
+
     @Test
     @Issue("JENKINS-41955")
     public void shouldMaskPasswordParameterClassByDefault() {