diff --git a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java index 04aba36c8be..f9fd531c4c2 100644 --- a/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java +++ b/plugins/ca/root-ca/src/test/java/org/apache/cloudstack/ca/provider/RootCAProviderTest.java @@ -41,7 +41,10 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; + import org.mockito.junit.MockitoJUnitRunner; +import org.mockito.Mockito; + @RunWith(MockitoJUnitRunner.class) public class RootCAProviderTest { @@ -57,12 +60,6 @@ public class RootCAProviderTest { f.set(provider, o); } - private void overrideDefaultConfigValue(final ConfigKey configKey, final String name, final Object o) throws IllegalAccessException, NoSuchFieldException { - Field f = ConfigKey.class.getDeclaredField(name); - f.setAccessible(true); - f.set(configKey, o); - } - @Before public void setUp() throws Exception { caKeyPair = CertUtils.generateRandomKeyPair(1024); @@ -133,14 +130,16 @@ public class RootCAProviderTest { @Test public void testCreateSSLEngineWithoutAuthStrictness() throws Exception { - overrideDefaultConfigValue(RootCAProvider.rootCAAuthStrictness, "_defaultValue", "false"); + provider.rootCAAuthStrictness = Mockito.mock(ConfigKey.class); + Mockito.when(provider.rootCAAuthStrictness.value()).thenReturn(Boolean.FALSE); final SSLEngine e = provider.createSSLEngine(SSLUtils.getSSLContext(), "/1.2.3.4:5678", null); Assert.assertFalse(e.getNeedClientAuth()); } @Test public void testCreateSSLEngineWithAuthStrictness() throws Exception { - overrideDefaultConfigValue(RootCAProvider.rootCAAuthStrictness, "_defaultValue", "true"); + provider.rootCAAuthStrictness = Mockito.mock(ConfigKey.class); + Mockito.when(provider.rootCAAuthStrictness.value()).thenReturn(Boolean.TRUE); final SSLEngine e = provider.createSSLEngine(SSLUtils.getSSLContext(), "/1.2.3.4:5678", null); Assert.assertTrue(e.getNeedClientAuth()); }