Skip to content

Migrate ShardQueryLogicQueryValidationTest from Arquillian to JUnit5/Spring #3673

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
Jul 13, 2026
Merged

Migrate ShardQueryLogicQueryValidationTest from Arquillian to JUnit5/Spring #3673

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
97 changes: 39 additions & 58 deletions ...se/query-core/src/test/java/datawave/query/tables/ShardQueryLogicQueryValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package datawave.query.tables;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;

import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;
Expand All @@ -13,27 +17,21 @@
import java.util.TimeZone;
import java.util.UUID;

import javax.inject.Inject;

import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.log4j.Logger;
import org.assertj.core.api.Assertions;
import org.easymock.EasyMock;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
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 datawave.configuration.spring.SpringBean;
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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit.jupiter.SpringExtension;

import datawave.helpers.PrintUtility;
import datawave.ingest.data.TypeRegistry;
import datawave.microservice.query.Query;
Expand Down Expand Up @@ -61,14 +59,21 @@
import datawave.query.rules.UnescapedSpecialCharsRule;
import datawave.query.rules.UnescapedWildcardsInPhrasesRule;
import datawave.query.rules.UnfieldedTermsRule;
import datawave.query.tables.edge.DefaultEdgeEventQueryLogic;
import datawave.query.util.WiseGuysIngest;
import datawave.table.constants.TableName;
import datawave.webservice.edgedictionary.RemoteEdgeDictionary;
import datawave.webservice.query.exception.BadRequestQueryException;
import datawave.webservice.query.exception.QueryException;

@RunWith(Arquillian.class)
@ExtendWith(SpringExtension.class)
@ComponentScan(basePackages = "datawave.query")
// @formatter:off
@ContextConfiguration(locations = {
"classpath:datawave/query/QueryLogicFactory.xml",
"classpath:beanRefContext.xml",
"classpath:MarkingFunctionsContext.xml",
"classpath:MetadataHelperContext.xml",
"classpath:CacheContext.xml"})
// @formatter:on
public class ShardQueryLogicQueryValidationTest {

private static final Logger log = Logger.getLogger(ShardQueryLogicQueryValidationTest.class);
Expand All @@ -87,55 +92,31 @@ public class ShardQueryLogicQueryValidationTest {
private Class<? extends Throwable> expectedExceptionType;
private String expectedExceptionMessage;

@Inject
@SpringBean(name = "EventQuery")
@Autowired
@Qualifier("EventQuery")
protected ShardQueryLogic logic;
protected KryoDocumentDeserializer deserializer;

@Deployment
public static JavaArchive createDeployment() throws Exception {
return ShrinkWrap.create(JavaArchive.class)
.addPackages(true, "org.apache.deltaspike", "io.astefanutti.metrics.cdi", "datawave.query", "org.jboss.logging",
"datawave.webservice.query.result.event")
.deleteClass(DefaultEdgeEventQueryLogic.class).deleteClass(RemoteEdgeDictionary.class)
.deleteClass(datawave.query.metrics.QueryMetricQueryLogic.class)
.addAsManifestResource(new StringAsset(
"<alternatives>" + "<stereotype>datawave.query.tables.edge.MockAlternative</stereotype>" + "</alternatives>"),
"beans.xml");
}

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

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

@Before
@BeforeEach
public void setup() throws ParseException {
this.logic.setFullTableScanEnabled(true);
this.deserializer = new KryoDocumentDeserializer();
this.startDate = dateFormat.parse("20091231");
this.endDate = dateFormat.parse("20150101");
}

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

private AccumuloClient createClient() throws Exception {
AccumuloClient client = new QueryTestTableHelper(ShardQueryLogicTest.ShardRange.class.toString(), log,
AccumuloClient client = new QueryTestTableHelper(ShardQueryLogicQueryValidationTest.class.toString(), log,
RebuildingScannerTestHelper.TEARDOWN.EVERY_OTHER_SANS_CONSISTENCY, RebuildingScannerTestHelper.INTERRUPT.EVERY_OTHER).client;
WiseGuysIngest.writeItAll(client, WiseGuysIngest.WhatKindaRange.SHARD);
PrintUtility.printTable(client, auths, TableName.SHARD);
Expand Down Expand Up @@ -180,7 +161,7 @@ public void testBeanCreation() {
expectedRules.add(new TimeFunctionRule("Validate #TIME_FUNCTION has Date Fields"));

List<QueryRule> actual = logic.getValidationRules();
Assertions.assertThat(actual).containsExactlyElementsOf(expectedRules);
assertThat(actual).containsExactlyElementsOf(expectedRules);
}

/**
Expand All @@ -190,8 +171,8 @@ public void testBeanCreation() {
public void testNoRulesConfigured() {
logic.setValidationRules(null);

BadRequestQueryException exception = Assert.assertThrows(BadRequestQueryException.class, this::assertResult);
Assert.assertEquals("No query validation rules configured for the query logic.", exception.getMessage());
BadRequestQueryException exception = assertThrows(BadRequestQueryException.class, this::assertResult);
assertEquals("No query validation rules configured for the query logic.", exception.getMessage());
}

/**
Expand Down Expand Up @@ -376,11 +357,11 @@ private void assertResult() throws Exception {
Query settings = createSettings();
QueryValidationResult actualResult = (QueryValidationResult) logic.validateQuery(client, settings, authSet);

Assertions.assertThat(actualResult.getRuleResults()).isEqualTo(expectedRuleResults);
assertThat(actualResult.getRuleResults()).isEqualTo(expectedRuleResults);
if (expectedExceptionType == null) {
Assertions.assertThat(actualResult.getException()).isNull();
assertThat(actualResult.getException()).isNull();
} else {
Assertions.assertThat(actualResult.getException()).hasMessage(expectedExceptionMessage).isInstanceOf(expectedExceptionType);
assertThat(actualResult.getException()).hasMessage(expectedExceptionMessage).isInstanceOf(expectedExceptionType);
}
}

Expand Down
Loading