From b479089cdbc934a38c0cd1e4d54d7bee44765b39 Mon Sep 17 00:00:00 2001 From: Dennis Leon Date: Tue, 5 Feb 2019 16:26:10 -0800 Subject: [PATCH] Fix Test Pollution - Some (non-Spring) tests had a real live JDBC connection!!! [#163036760] https://www.pivotaltracker.com/story/show/163036760 Signed-off-by: Joshua Casey Co-authored-by: Joshua Casey --- .../identity/uaa/login/AutologinAuthenticationManagerTest.java | 1 + .../identity/uaa/login/UaaResetPasswordServiceTests.java | 1 + .../uaa/mfa/UserGoogleMfaCredentialsProvisioningTest.java | 1 + .../uaa/provider/saml/SamlSessionStorageFactoryTests.java | 3 ++- 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/AutologinAuthenticationManagerTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/AutologinAuthenticationManagerTest.java index 4bfdb5e36c2..23f8d37b4d9 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/AutologinAuthenticationManagerTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/AutologinAuthenticationManagerTest.java @@ -60,6 +60,7 @@ public class AutologinAuthenticationManagerTest { @Before public void setUp() { IdentityZoneHolder.clear(); + IdentityZoneHolder.setProvisioning(null); clientId = new RandomValueStringGenerator().generate(); manager = new AutologinAuthenticationManager(); codeStore = mock(ExpiringCodeStore.class); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaResetPasswordServiceTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaResetPasswordServiceTests.java index 245abb76b2f..4599ae3769a 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaResetPasswordServiceTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/login/UaaResetPasswordServiceTests.java @@ -77,6 +77,7 @@ public class UaaResetPasswordServiceTests { public void setUp() throws Exception { SecurityContextHolder.clearContext(); IdentityZoneHolder.clear(); + IdentityZoneHolder.setProvisioning(null); scimUserProvisioning = mock(ScimUserProvisioning.class); codeStore = mock(ExpiringCodeStore.class); passwordValidator = mock(PasswordValidator.class); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/mfa/UserGoogleMfaCredentialsProvisioningTest.java b/server/src/test/java/org/cloudfoundry/identity/uaa/mfa/UserGoogleMfaCredentialsProvisioningTest.java index e848052b004..fa133d315c9 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/mfa/UserGoogleMfaCredentialsProvisioningTest.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/mfa/UserGoogleMfaCredentialsProvisioningTest.java @@ -33,6 +33,7 @@ public class UserGoogleMfaCredentialsProvisioningTest { @Before public void setup() { + IdentityZoneHolder.setProvisioning(null); provisioner = new UserGoogleMfaCredentialsProvisioning(); mfaProvider = new MfaProvider().setName("abc").setId("abc"); otherMfaProvider = new MfaProvider().setName("abcd").setId("abcd"); diff --git a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactoryTests.java b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactoryTests.java index c8623cdb081..6205fd07e6d 100644 --- a/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactoryTests.java +++ b/server/src/test/java/org/cloudfoundry/identity/uaa/provider/saml/SamlSessionStorageFactoryTests.java @@ -28,7 +28,6 @@ public class SamlSessionStorageFactoryTests { - private SamlSessionStorageFactory factory; private MockHttpServletRequest request; @@ -36,6 +35,8 @@ public class SamlSessionStorageFactoryTests { public void setUp() throws Exception { request = new MockHttpServletRequest(); factory = new SamlSessionStorageFactory(); + IdentityZoneHolder.clear(); + IdentityZoneHolder.setProvisioning(null); } @After