Skip to content

Migrate KeywordQueryLogicFunctionalTest from Arquillian to JUnit5/Spring #3670

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
+32 −63
Merged

Migrate KeywordQueryLogicFunctionalTest from Arquillian to JUnit5/Spring #3670

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
95 changes: 32 additions & 63 deletions ...ery-core/src/test/java/datawave/query/tables/keyword/KeywordQueryLogicFunctionalTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,68 @@
package datawave.query.tables.keyword;

import static datawave.query.tables.keyword.TagCloudTestUtil.CAPONE_SOURCE;
import static org.junit.Assert.assertEquals;
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.assertNull;
import static org.junit.jupiter.api.Assertions.fail;

import java.text.ParseException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.TimeZone;
import java.util.UUID;

import javax.inject.Inject;

import org.apache.accumulo.core.client.AccumuloClient;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.security.Authorizations;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
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.AfterClass;
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.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.core.query.configuration.GenericQueryConfiguration;
import datawave.helpers.PrintUtility;
import datawave.ingest.data.TypeRegistry;
import datawave.microservice.query.QueryImpl;
import datawave.query.ExcerptTest;
import datawave.query.QueryTestTableHelper;
import datawave.query.tables.ResponseQueryDriver;
import datawave.query.tables.edge.DefaultEdgeEventQueryLogic;
import datawave.query.tables.keyword.transform.TagCloudPartitionTransformer;
import datawave.query.util.WiseGuysIngest;
import datawave.table.constants.TableName;
import datawave.util.keyword.TagCloudInput;
import datawave.util.keyword.TagCloudPartition;
import datawave.webservice.edgedictionary.RemoteEdgeDictionary;
import datawave.webservice.result.keyword.DefaultTagCloud;
import datawave.webservice.result.keyword.DefaultTagCloudEntry;
import datawave.webservice.result.keyword.DefaultTagCloudResponse;
import datawave.webservice.result.keyword.TagCloudBase;

@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 KeywordQueryLogicFunctionalTest {
protected static AccumuloClient connector = null;

private static final Logger log = Logger.getLogger(KeywordQueryLogicFunctionalTest.class);

protected static AccumuloClient connector;

protected Authorizations auths = new Authorizations("ALL");
protected Set<Authorizations> authSet = Set.of(auths);

@Inject
@SpringBean(name = "KeywordQuery")
@Autowired
@Qualifier("KeywordQuery")
protected KeywordQueryLogic logic;

private final TagCloudPartitionTransformer tagCloudPartitionTransformer = TagCloudPartitionTransformer.getInstance();
Expand All @@ -75,38 +73,15 @@ public class KeywordQueryLogicFunctionalTest {
private ResponseQueryDriver<Entry<Key,Value>> queryDriver;
private final TagCloudTestUtil tagCloudTestUtil = new TagCloudTestUtil();

@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
@BeforeAll
public static void setUp() throws Exception {
QueryTestTableHelper qtth = new QueryTestTableHelper(ExcerptTest.DocumentRangeTest.class.toString(), log);
QueryTestTableHelper qtth = new QueryTestTableHelper(KeywordQueryLogicFunctionalTest.class.toString(), log);
connector = qtth.client;

Logger.getLogger(PrintUtility.class).setLevel(Level.DEBUG);

WiseGuysIngest.writeItAll(connector, WiseGuysIngest.WhatKindaRange.DOCUMENT);
Authorizations auths = new Authorizations("ALL");
PrintUtility.printTable(connector, auths, TableName.SHARD);
PrintUtility.printTable(connector, auths, TableName.SHARD_INDEX);
PrintUtility.printTable(connector, auths, QueryTestTableHelper.MODEL_TABLE_NAME);
}

@Before
public void setup() throws ParseException {
TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
log.setLevel(Level.TRACE);

@BeforeEach
public void setup() {
queryDriver = new ResponseQueryDriver<>(logic);
}

Expand Down Expand Up @@ -313,10 +288,4 @@ private boolean isExpectedTagCloud(DefaultTagCloud tagCloud) {

return false;
}

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

}
Loading