Skip to content

Migrate connection pool tests to JUnit 5 #3987

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
apmoriarty wants to merge 2 commits into
base: integration
Choose a base branch
from
Open

Migrate connection pool tests to JUnit 5 #3987

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91deaa
Migrate connection pool tests to JUnit 5
apmoriarty Oct 5, 2026
531af5b
Recognize short integration test tag
apmoriarty Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 23 additions & 25 deletions .../connection-pool/src/test/java/datawave/core/common/cache/SharedCacheCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package datawave.core.common.cache;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;

import java.lang.reflect.Field;

Expand All @@ -16,12 +16,10 @@
import org.apache.curator.test.InstanceSpec;
import org.apache.curator.test.QuorumConfigBuilder;
import org.apache.curator.test.TestingZooKeeperServer;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.experimental.categories.Category;

import datawave.common.test.integration.IntegrationTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

/**
* Tests functionality in the {@link SharedCacheCoordinator}.
Expand All @@ -31,7 +29,7 @@ public class SharedCacheCoordinatorTest {
private SharedCacheCoordinator cacheCoordinator;
private CuratorFramework curatorClient;

@Before
@BeforeEach
public void setUp() throws Exception {
InstanceSpec spec = new InstanceSpec(null, -1, -1, -1, true, -1);
testingZooKeeperServer = new TestingZooKeeperServer(new QuorumConfigBuilder(spec));
Expand All @@ -49,7 +47,7 @@ public void setUp() throws Exception {
cacheCoordinator.start();
}

@After
@AfterEach
public void tearDown() throws Exception {
cacheCoordinator.stop();
testingZooKeeperServer.close();
Expand All @@ -59,7 +57,7 @@ public void tearDown() throws Exception {
public void testEphemeralNodeReconnect() throws Exception {
String ephemeralNodePath = getField(cacheCoordinator, "serverIdentifierPath");
boolean exists = curatorClient.checkExists().forPath(ephemeralNodePath) != null;
assertTrue("Ephemeral server node " + ephemeralNodePath + " doesn't exist before a zookeeper restart", exists);
assertTrue(exists, "Ephemeral server node " + ephemeralNodePath + " doesn't exist before a zookeeper restart");

final ConnectionState[] state = new ConnectionState[] {ConnectionState.CONNECTED};
curatorClient.getConnectionStateListenable().addListener((client, newState) -> state[0] = newState);
Expand All @@ -71,15 +69,15 @@ public void testEphemeralNodeReconnect() throws Exception {
break;
Thread.sleep(200L);
}
assertEquals("Client never reconnected.", ConnectionState.RECONNECTED, state[0]);
assertEquals(ConnectionState.RECONNECTED, state[0], "Client never reconnected.");

for (int i = 0; i < 50; ++i) {
exists = curatorClient.checkExists().forPath(ephemeralNodePath) != null;
if (exists)
break;
Thread.sleep(200L);
}
assertTrue("Ephemeral node " + ephemeralNodePath + " was not recreated.", exists);
assertTrue(exists, "Ephemeral node " + ephemeralNodePath + " was not recreated.");
}

@Test
Expand Down Expand Up @@ -115,8 +113,8 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {
break;
Thread.sleep(1000L);
}
assertEquals("Counter never updated.", newCount, count[0]);
assertTrue("Counter never updated.", cacheCoordinator.checkCounter(COUNTER, newCount));
assertEquals(newCount, count[0], "Counter never updated.");
assertTrue(cacheCoordinator.checkCounter(COUNTER, newCount), "Counter never updated.");

testingZooKeeperServer.restart();

Expand All @@ -127,7 +125,7 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {
}

// unfortunately curator does not always propogate the RECONNECTED state to the listener
// assertEquals("Client never reconnected.", ConnectionState.RECONNECTED, state[0]);
// assertEquals(ConnectionState.RECONNECTED, state[0], "Client never reconnected.");
newCount = 42;
oldCount = counter.getVersionedValue();
counter.trySetCount(oldCount, newCount);
Expand All @@ -137,15 +135,15 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {
break;
Thread.sleep(200L);
}
assertEquals("Counter never updated after restart.", newCount, count[0]);
assertTrue("Counter never updated.", cacheCoordinator.checkCounter(COUNTER, newCount));
assertEquals(newCount, count[0], "Counter never updated after restart.");
assertTrue(cacheCoordinator.checkCounter(COUNTER, newCount), "Counter never updated.");
} finally {
counter.close();
}
}

@Test
@Category(IntegrationTest.class)
@Tag("datawave.common.test.integration.IntegrationTest")
Comment thread
apmoriarty marked this conversation as resolved.
Outdated
public void testSharedCounterUpdateAfterConnectionLost() throws Exception {
final String COUNTER = "testCounter";
final ConnectionState[] state = new ConnectionState[] {ConnectionState.CONNECTED};
Expand Down Expand Up @@ -178,8 +176,8 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {}
break;
Thread.sleep(200L);
}
assertEquals("Counter never updated.", newCount, count[0]);
assertTrue("Counter never updated.", cacheCoordinator.checkCounter(COUNTER, newCount));
assertEquals(newCount, count[0], "Counter never updated.");
assertTrue(cacheCoordinator.checkCounter(COUNTER, newCount), "Counter never updated.");

testingZooKeeperServer.kill();

Expand All @@ -188,7 +186,7 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {}
break;
Thread.sleep(3000L);
}
assertEquals("Client never lost connection.", ConnectionState.LOST, state[0]);
assertEquals(ConnectionState.LOST, state[0], "Client never lost connection.");

testingZooKeeperServer.restart();

Expand All @@ -197,7 +195,7 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {}
break;
Thread.sleep(3000L);
}
assertEquals("Client never reconnected.", ConnectionState.RECONNECTED, state[0]);
assertEquals(ConnectionState.RECONNECTED, state[0], "Client never reconnected.");

newCount = 42;
oldCount = counter.getVersionedValue();
Expand All @@ -208,8 +206,8 @@ public void stateChanged(CuratorFramework client, ConnectionState newState) {}
break;
Thread.sleep(200L);
}
assertEquals("Counter never updated after restart.", newCount, count[0]);
assertTrue("Counter never updated.", cacheCoordinator.checkCounter(COUNTER, newCount));
assertEquals(newCount, count[0], "Counter never updated after restart.");
assertTrue(cacheCoordinator.checkCounter(COUNTER, newCount), "Counter never updated.");
} finally {
counter.close();
}
Expand Down
26 changes: 13 additions & 13 deletions ...ion-pool/src/test/java/datawave/core/common/connection/AccumuloConnectionFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package datawave.core.common.connection;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.fail;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.fail;

import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
Expand All @@ -16,15 +16,15 @@
import org.apache.commons.pool2.PooledObject;
import org.apache.commons.pool2.impl.DefaultPooledObject;
import org.easymock.EasyMock;
import org.easymock.EasyMockRunner;
import org.easymock.EasyMockExtension;
import org.easymock.EasyMockSupport;
import org.easymock.Mock;
import org.easymock.MockType;
import org.easymock.TestSubject;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.slf4j.LoggerFactory;

import datawave.accumulo.inmemory.InMemoryInstance;
Expand All @@ -33,7 +33,7 @@
import datawave.core.common.result.ConnectionPoolsProperties;
import datawave.webservice.common.connection.WrappedAccumuloClient;

@RunWith(EasyMockRunner.class)
@ExtendWith(EasyMockExtension.class)
public class AccumuloConnectionFactoryTest extends EasyMockSupport {

@Mock(type = MockType.STRICT)
Expand All @@ -50,7 +50,7 @@ public class AccumuloConnectionFactoryTest extends EasyMockSupport {
@Mock(type = MockType.STRICT)
private WrappedAccumuloClient metricsClient;

@Before
@BeforeEach
public void setup() throws Exception {

MyAccumuloClientPoolFactory warehouseFactory = newInstance(MyAccumuloClientPoolFactory.class);
Expand Down Expand Up @@ -98,7 +98,7 @@ public void setup() throws Exception {
setField(factory, "cache", cache);
}

@After
@AfterEach
public void cleanup() {
System.clearProperty("dw.accumulo.classLoader.context");
}
Expand All @@ -112,7 +112,7 @@ public void testGetConnection() throws Exception {
verifyAll();
assertNotNull(con);
assertEquals(warehouseClient, ((WrappedAccumuloClient) con).getReal());
assertNull("scannerClassLoaderContext was set when it shouldn't have been", getField(con, "scannerClassLoaderContext"));
assertNull(getField(con, "scannerClassLoaderContext"), "scannerClassLoaderContext was set when it shouldn't have been");
}

@Test
Expand Down
41 changes: 21 additions & 20 deletions core/connection-pool/src/test/java/datawave/core/common/result/ConnectionPoolTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package datawave.core.common.result;

import static org.junit.jupiter.api.Assertions.assertEquals;

import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.TreeSet;

import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

import datawave.core.common.result.ConnectionPool.Priority;

Expand All @@ -25,7 +26,7 @@ private ConnectionPool createPool(String poolName, String priority) {
return p;
}

@Before
@BeforeEach
public void setup() {
connectionPools = new LinkedList<>();
connectionPools.add(createPool("WAREHOUSE", Priority.NORMAL.toString()));
Expand All @@ -47,28 +48,28 @@ public void testOrdering() {
ConnectionPool p = null;

p = itr.next();
Assert.assertEquals("INGEST", p.getPoolName());
Assert.assertEquals("ADMIN", p.getPriority());
assertEquals("INGEST", p.getPoolName());
assertEquals("ADMIN", p.getPriority());
p = itr.next();
Assert.assertEquals("INGEST", p.getPoolName());
Assert.assertEquals("HIGH", p.getPriority());
assertEquals("INGEST", p.getPoolName());
assertEquals("HIGH", p.getPriority());
p = itr.next();
Assert.assertEquals("INGEST", p.getPoolName());
Assert.assertEquals("NORMAL", p.getPriority());
assertEquals("INGEST", p.getPoolName());
assertEquals("NORMAL", p.getPriority());
p = itr.next();
Assert.assertEquals("INGEST", p.getPoolName());
Assert.assertEquals("LOW", p.getPriority());
assertEquals("INGEST", p.getPoolName());
assertEquals("LOW", p.getPriority());
p = itr.next();
Assert.assertEquals("WAREHOUSE", p.getPoolName());
Assert.assertEquals("ADMIN", p.getPriority());
assertEquals("WAREHOUSE", p.getPoolName());
assertEquals("ADMIN", p.getPriority());
p = itr.next();
Assert.assertEquals("WAREHOUSE", p.getPoolName());
Assert.assertEquals("HIGH", p.getPriority());
assertEquals("WAREHOUSE", p.getPoolName());
assertEquals("HIGH", p.getPriority());
p = itr.next();
Assert.assertEquals("WAREHOUSE", p.getPoolName());
Assert.assertEquals("NORMAL", p.getPriority());
assertEquals("WAREHOUSE", p.getPoolName());
assertEquals("NORMAL", p.getPriority());
p = itr.next();
Assert.assertEquals("WAREHOUSE", p.getPoolName());
Assert.assertEquals("LOW", p.getPriority());
assertEquals("WAREHOUSE", p.getPoolName());
assertEquals("LOW", p.getPriority());
}
}
Loading