ConfigurationTest#testGetDefaultSharedDirectory: Don't override mocks
Use the mocked PluginConfigFactory and Config instances defined at class
scope and initialized in the setUp method, rather than defining method
scope instances which override the class scope instances.
Using local instances has no side-effect on stable-2.13, but when this
change is applied on stable-2.14 the test fails due to the fact that
there are other settings mocked in the class scope instances that are
not in the local instance.
Change-Id: Ifb54d7096c51a699531cd954ee8302a31fb8b095
diff --git a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
index add6d44..ffab6a4 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/highavailability/ConfigurationTest.java
@@ -53,7 +53,6 @@
import static java.net.InetAddress.getLocalHost;
import static java.util.concurrent.TimeUnit.SECONDS;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
@@ -462,9 +461,6 @@
@Test
public void testGetDefaultSharedDirectory() throws Exception {
- PluginConfigFactory cfgFactoryMock = mock(PluginConfigFactory.class);
- Config configMock = mock(Config.class);
-
when(cfgFactoryMock.getGlobalPluginConfig(pluginName)).thenReturn(configMock);
when(configMock.getString(MAIN_SECTION, null, SHARED_DIRECTORY_KEY)).thenReturn(null);
when(configMock.getEnum(PEER_INFO_SECTION, null, STRATEGY_KEY, DEFAULT_PEER_INFO_STRATEGY))
@@ -472,7 +468,7 @@
when(configMock.getStringList(JGROUPS_SECTION, null, SKIP_INTERFACE_KEY))
.thenReturn(new String[] {});
- Configuration configuration = new Configuration(cfgFactoryMock, pluginName, site);
+ initializeConfiguration();
assertEquals(configuration.main().sharedDirectory(), site.resolve(DEFAULT_SHARED_DIRECTORY));
}
