Reset IZH

cloudfoundry · May 12, 2017 · 7db5e58 · 7db5e58
1 parent 3e88ce8
commit 7db5e58
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...test/java/org/cloudfoundry/identity/uaa/zone/event/IdentityProviderModifiedEventTest.java b/...test/java/org/cloudfoundry/identity/uaa/zone/event/IdentityProviderModifiedEventTest.java
@@ -19,8 +19,10 @@
 import org.cloudfoundry.identity.uaa.login.saml.SamlIdentityProviderDefinition;
 import org.cloudfoundry.identity.uaa.zone.IdentityProvider;
 import org.cloudfoundry.identity.uaa.zone.IdentityZone;
+import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.security.oauth2.common.util.RandomValueStringGenerator;
 
 import java.util.ArrayList;
@@ -53,6 +55,8 @@ public class IdentityProviderModifiedEventTest {
 
     @Before
     public void setup() {
+        IdentityZoneHolder.clear();
+        SecurityContextHolder.clearContext();
         String origin = "idp-mock-saml-"+new RandomValueStringGenerator().generate();
         String metadata = String.format(xmlWithoutID, "http://localhost:9999/metadata/"+origin);
         provider = new IdentityProvider<>();

diff --git a/...src/test/java/org/cloudfoundry/identity/uaa/zone/event/IdentityZoneModifiedEventTest.java b/...src/test/java/org/cloudfoundry/identity/uaa/zone/event/IdentityZoneModifiedEventTest.java
@@ -17,8 +17,10 @@
 
 import org.cloudfoundry.identity.uaa.config.IdentityZoneConfiguration;
 import org.cloudfoundry.identity.uaa.zone.IdentityZone;
+import org.cloudfoundry.identity.uaa.zone.IdentityZoneHolder;
 import org.junit.Before;
 import org.junit.Test;
+import org.springframework.security.core.context.SecurityContextHolder;
 
 import static org.junit.Assert.assertEquals;
 
@@ -29,6 +31,8 @@ public class IdentityZoneModifiedEventTest {
 
     @Before
     public void setup() {
+        IdentityZoneHolder.clear();
+        SecurityContextHolder.clearContext();
         zone = new IdentityZone();
         zone.setId("id");
         zone.setSubdomain("subdomain");