Skip to content

Migrate annotations tests to JUnit 5 #3997

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

Merged
apmoriarty merged 1 commit into from
Oct 13, 2026
+37 −44
Merged

Migrate annotations tests to JUnit 5 #3997

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions web-services/annotations/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-core</artifactId>
<groupId>org.jboss.arquillian.junit5</groupId>
<artifactId>arquillian-junit5-container</artifactId>
<version>1.10.2.Final</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
41 changes: 17 additions & 24 deletions ...es/annotations/src/test/java/datawave/webservice/annotation/AnnotationLookupUUIDTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package datawave.webservice.annotation;

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

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand All @@ -22,17 +24,16 @@
import org.apache.commons.collections4.iterators.TransformIterator;
import org.apache.log4j.Logger;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;

import com.google.common.collect.Sets;

Expand Down Expand Up @@ -62,7 +63,8 @@
* structure and should be addressed.
*/
@SuppressWarnings("SameParameterValue")
@RunWith(Arquillian.class)
@ExtendWith(ArquillianExtension.class)
@RunAsClient
public class AnnotationLookupUUIDTest {
private static final Logger log = Logger.getLogger(AnnotationLookupUUIDTest.class);

Expand Down Expand Up @@ -108,31 +110,22 @@ public static JavaArchive createDeployment() {
//@formatter:on
}

@BeforeClass
@BeforeAll
public static void beforeClass() {
TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
}

@AfterClass
@AfterAll
public static void afterClass() {
TypeRegistry.reset();
}

@Before
@BeforeEach
public void setup() {
this.logic.setFullTableScanEnabled(true);
this.deserializer = new KryoDocumentDeserializer();
}

@After
public void tearDown() {
this.logic = null;
this.query = null;
this.queryParameters.clear();
this.startDate = null;
this.endDate = null;
}

protected String getRange() {
return WiseGuysIngest.WhatKindaRange.DOCUMENT.name();
}
Expand Down Expand Up @@ -185,11 +178,11 @@ protected void runTestQuery(Set<Set<String>> expected) throws Exception {

BaseQueryResponse response = transformer.createResponse(eventList);

Assert.assertTrue(response instanceof DefaultEventQueryResponse);
assertTrue(response instanceof DefaultEventQueryResponse);
DefaultEventQueryResponse eventQueryResponse = (DefaultEventQueryResponse) response;

if (expected.isEmpty()) {
Assert.assertTrue(eventQueryResponse.getEvents() == null || eventQueryResponse.getEvents().isEmpty());
assertTrue(eventQueryResponse.getEvents() == null || eventQueryResponse.getEvents().isEmpty());
} else {
for (Iterator<Set<String>> it = expected.iterator(); it.hasNext();) {
Set<String> expectedSet = it.next();
Expand All @@ -207,7 +200,7 @@ protected void runTestQuery(Set<Set<String>> expected) throws Exception {
break;
}
}
Assert.assertTrue("field not found " + expectedSet, found);
assertTrue(found, "field not found " + expectedSet);
}
}
}
Expand Down
30 changes: 17 additions & 13 deletions ...ons/src/test/java/datawave/webservice/annotation/AnnotationManagerBeanFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,17 @@
import org.checkerframework.checker.nullness.qual.NonNull;
import org.easymock.EasyMock;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit5.ArquillianExtension;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.JavaArchive;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Mock;

import datawave.annotation.data.transform.DefaultTimestampTransformer;
Expand Down Expand Up @@ -87,7 +88,8 @@
import datawave.webservice.query.runner.QueryExecutorBean;

@SuppressWarnings({"unused", "unchecked", "SpellCheckingInspection"})
@RunWith(Arquillian.class)
@ExtendWith(ArquillianExtension.class)
@RunAsClient
public class AnnotationManagerBeanFunctionalTest {
protected static AccumuloClient client = null;

Expand Down Expand Up @@ -160,7 +162,7 @@ public static JavaArchive createDeployment() {
//@formatter:on
}

@BeforeClass
@BeforeAll
public static void setupTestData() throws Exception {

QueryTestTableHelper queryTestTableHelper = new QueryTestTableHelper(AnnotationManagerBeanFunctionalTest.class.toString(), log);
Expand Down Expand Up @@ -261,7 +263,7 @@ public static void setupTestData() throws Exception {
return truthmarkAnnotation;
}

@Before
@BeforeEach
public void setup() throws Exception {
TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
log.setLevel(Level.TRACE);
Expand Down Expand Up @@ -787,17 +789,19 @@ public void testGetAnnotationSegmentInternalIdMissingSegmentHash() {
assertContains("bbbbbbbb", errorResponse);
}

@Ignore
@Test
@Disabled("Not implemented")
public void testAddSegmentInternalId() {
fail("Not implemented");
}

@Ignore
@Test
@Disabled("Not implemented")
public void testUpdateSegmentInternalId() {
fail("Not implemented");
}

@AfterClass
@AfterAll
public static void teardown() {
if (federatedReadExecutor != null) {
federatedReadExecutor.shutdownNow();
Expand Down
Loading