Till Westmann has submitted this change and it was merged. Change subject: ASTERIXDB-1711: Move test infra from test.aql ......................................................................
ASTERIXDB-1711: Move test infra from test.aql Change-Id: I5d631a2028fb80c823fbaafb7269f15d07685dc9 Reviewed-on: https://asterix-gerrit.ics.uci.edu/1512 Tested-by: Jenkins <[email protected]> Integration-Tests: Jenkins <[email protected]> Reviewed-by: abdullah alamoudi <[email protected]> --- M asterixdb/asterix-app/pom.xml M asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java R asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ComparisonException.java R asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java R asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java R asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/SingleLinePrettyPrinter.java R asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java M asterixdb/asterix-common/pom.xml M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixExternalLibraryIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixLifecycleIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixRestartIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/MetadataReplicationIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ReplicationIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/DmlRecoveryIT.java M asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java M asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java M asterixdb/asterix-yarn/pom.xml M asterixdb/asterix-yarn/src/test/java/org/apache/asterix/aoya/test/AsterixYARNLibraryTestIT.java 27 files changed, 38 insertions(+), 55 deletions(-) Approvals: abdullah alamoudi: Looks good to me, approved Jenkins: Verified; Verified Objections: Jenkins: Violations found diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml index 7ce71b7..74102a1 100644 --- a/asterixdb/asterix-app/pom.xml +++ b/asterixdb/asterix-app/pom.xml @@ -357,6 +357,10 @@ <artifactId>httpcore</artifactId> </dependency> <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + </dependency> + <dependency> <groupId>org.apache.asterix</groupId> <artifactId>asterix-lang-common</artifactId> <version>${project.version}</version> diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java index ba34024..e92b5e8 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java @@ -28,7 +28,7 @@ import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.common.library.ILibraryManager; import org.apache.asterix.event.service.AsterixEventServiceUtil; -import org.apache.asterix.test.aql.ITestLibrarian; +import org.apache.asterix.test.common.ITestLibrarian; import org.apache.commons.io.FileUtils; import org.apache.hyracks.algebricks.common.utils.Pair; import org.apache.hyracks.api.exceptions.HyracksDataException; diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/base/ComparisonException.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ComparisonException.java similarity index 95% rename from asterixdb/asterix-common/src/test/java/org/apache/asterix/test/base/ComparisonException.java rename to asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ComparisonException.java index 42e4362..da5c8f6 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/base/ComparisonException.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ComparisonException.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.test.base; +package org.apache.asterix.test.common; public class ComparisonException extends Exception { private static final long serialVersionUID = 1L; diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ITestLibrarian.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java similarity index 96% rename from asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ITestLibrarian.java rename to asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java index bbbd14e..d661710 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ITestLibrarian.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.test.aql; +package org.apache.asterix.test.common; import java.io.IOException; import java.rmi.RemoteException; diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java similarity index 96% rename from asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java rename to asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java index daea5cc..3531211 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.test.aql; +package org.apache.asterix.test.common; import java.io.InputStream; import java.io.StringWriter; @@ -24,16 +24,15 @@ import java.util.Iterator; import java.util.logging.Logger; -import com.fasterxml.jackson.core.JsonFactory; +import org.apache.asterix.common.exceptions.AsterixException; +import org.apache.commons.io.IOUtils; + import com.fasterxml.jackson.core.PrettyPrinter; -import com.fasterxml.jackson.core.util.DefaultPrettyPrinter; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Iterators; -import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.commons.io.IOUtils; /** * extracts results from the response of the QueryServiceServlet. diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/SingleLinePrettyPrinter.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/SingleLinePrettyPrinter.java similarity index 97% rename from asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/SingleLinePrettyPrinter.java rename to asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/SingleLinePrettyPrinter.java index 52f68a0..2932ca4 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/SingleLinePrettyPrinter.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/SingleLinePrettyPrinter.java @@ -17,13 +17,14 @@ * under the License. */ -package org.apache.asterix.test.aql; +package org.apache.asterix.test.common; -import java.io.*; +import java.io.IOException; -import com.fasterxml.jackson.core.*; +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.PrettyPrinter; +import com.fasterxml.jackson.core.SerializableString; import com.fasterxml.jackson.core.io.SerializedString; -import com.fasterxml.jackson.core.util.DefaultIndenter; import com.fasterxml.jackson.core.util.Instantiatable; /** diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java similarity index 99% rename from asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java rename to asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java index 8213213..f5d97ba 100644 --- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/TestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.test.aql; +package org.apache.asterix.test.common; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -52,7 +52,6 @@ import org.apache.asterix.common.config.GlobalConfig; import org.apache.asterix.common.utils.Servlets; -import org.apache.asterix.test.base.ComparisonException; import org.apache.asterix.test.server.ITestServer; import org.apache.asterix.test.server.TestServerProvider; import org.apache.asterix.testframework.context.TestCaseContext; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java index 1158611..4702b1d 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dml/DmlTest.java @@ -31,8 +31,8 @@ import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.compiler.provider.AqlCompilationProvider; import org.apache.asterix.file.StorageComponentProvider; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.AsterixTestHelper; +import org.apache.asterix.test.common.TestExecutor; import org.junit.Test; public class DmlTest { diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java index 6392410..f75942d 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTest.java @@ -24,7 +24,7 @@ import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil; import org.apache.asterix.common.config.GlobalConfig; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java index a20ecc5..4db00c8 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java @@ -26,7 +26,7 @@ import org.apache.asterix.app.external.TestLibrarian; import org.apache.asterix.common.library.ILibraryManager; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; import org.junit.runner.RunWith; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java index 2b9b357..0789fa0 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/ParserTestExecutor.java @@ -47,8 +47,8 @@ import org.apache.asterix.lang.sqlpp.util.SqlppRewriteUtil; import org.apache.asterix.metadata.declared.MetadataProvider; import org.apache.asterix.metadata.entities.Dataset; -import org.apache.asterix.test.aql.TestExecutor; -import org.apache.asterix.test.base.ComparisonException; +import org.apache.asterix.test.common.ComparisonException; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.asterix.testframework.context.TestFileContext; import org.apache.asterix.testframework.xml.TestCase.CompilationUnit; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java index 99fde7d..0cac0c5 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/sqlpp/RuntimeParserTest.java @@ -23,7 +23,7 @@ import java.util.Collection; import java.util.logging.Logger; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; diff --git a/asterixdb/asterix-common/pom.xml b/asterixdb/asterix-common/pom.xml index d642b57..65e82a2 100644 --- a/asterixdb/asterix-common/pom.xml +++ b/asterixdb/asterix-common/pom.xml @@ -180,14 +180,6 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> - <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>algebricks-common</artifactId> </dependency> @@ -240,20 +232,12 @@ <artifactId>hyracks-api</artifactId> </dependency> <dependency> - <groupId>org.apache.asterix</groupId> - <artifactId>asterix-test-framework</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-storage-am-lsm-btree</artifactId> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId> - hyracks-storage-am-lsm-invertedindex - </artifactId> + <artifactId>hyracks-storage-am-lsm-invertedindex</artifactId> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> @@ -279,10 +263,6 @@ <artifactId>mockito-all</artifactId> <version>2.0.2-beta</version> <scope>test</scope> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java index d9c902e..03e4f75 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AbstractExecutionIT.java @@ -23,8 +23,8 @@ import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.external.util.IdentitiyResolverFactory; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.test.runtime.HDFSCluster; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.asterix.testframework.context.TestFileContext; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java index 89fb70e..759baed 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixClusterLifeCycleIT.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.logging.Logger; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixExternalLibraryIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixExternalLibraryIT.java index 5dde951..b3a5dcc 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixExternalLibraryIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixExternalLibraryIT.java @@ -23,8 +23,8 @@ import java.util.logging.Logger; import org.apache.asterix.event.model.AsterixInstance.State; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; import org.junit.AfterClass; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixLifecycleIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixLifecycleIT.java index 4dfc5c5..3c65a83 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixLifecycleIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixLifecycleIT.java @@ -30,7 +30,7 @@ import org.apache.asterix.event.model.AsterixRuntimeState; import org.apache.asterix.event.service.ServiceProvider; import org.apache.asterix.installer.command.CommandHandler; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixRestartIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixRestartIT.java index 96b420b..7cca5cc 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixRestartIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/AsterixRestartIT.java @@ -25,8 +25,8 @@ import java.util.logging.Logger; import org.apache.asterix.event.model.AsterixInstance.State; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; import org.junit.After; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java index 8db985d..9fb1e01 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ClusterExecutionIT.java @@ -21,7 +21,7 @@ import org.apache.asterix.external.util.ExternalDataConstants; import org.apache.asterix.external.util.IdentitiyResolverFactory; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.test.runtime.HDFSCluster; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/MetadataReplicationIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/MetadataReplicationIT.java index 56ac759..2db6114 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/MetadataReplicationIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/MetadataReplicationIT.java @@ -25,7 +25,7 @@ import java.util.logging.Logger; import org.apache.asterix.event.model.AsterixInstance.State; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ReplicationIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ReplicationIT.java index 5c8a68a..bac93e4 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ReplicationIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/test/ReplicationIT.java @@ -25,8 +25,8 @@ import java.util.logging.Logger; import org.apache.asterix.event.model.AsterixInstance.State; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.lang3.StringUtils; import org.junit.After; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/DmlRecoveryIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/DmlRecoveryIT.java index b55510a..a2968a5 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/DmlRecoveryIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/DmlRecoveryIT.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.logging.Logger; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.io.FileUtils; import org.junit.AfterClass; diff --git a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java index 98c0853..804848e 100644 --- a/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java +++ b/asterixdb/asterix-installer/src/test/java/org/apache/asterix/installer/transaction/RecoveryIT.java @@ -25,8 +25,8 @@ import java.util.Map; import java.util.logging.Logger; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.RetainLogsRule; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.test.runtime.HDFSCluster; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.commons.io.FileUtils; diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java index 77effb6..6a619d3 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/NCServiceExecutionIT.java @@ -24,7 +24,7 @@ import java.util.List; import java.util.logging.Logger; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.test.runtime.HDFSCluster; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.asterix.testframework.xml.TestGroup; diff --git a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java index 7ac4669..7324a5c 100644 --- a/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java +++ b/asterixdb/asterix-server/src/test/java/org/apache/asterix/server/test/SampleLocalClusterIT.java @@ -29,8 +29,8 @@ import java.util.Collections; import org.apache.asterix.common.utils.Servlets; -import org.apache.asterix.test.aql.TestExecutor; import org.apache.asterix.test.base.TestMethodTracer; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.test.common.TestHelper; import org.apache.asterix.testframework.context.TestCaseContext.OutputFormat; import org.apache.commons.io.FileUtils; diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml index f301694..e8c1895 100644 --- a/asterixdb/asterix-yarn/pom.xml +++ b/asterixdb/asterix-yarn/pom.xml @@ -273,7 +273,7 @@ </dependency> <dependency> <groupId>org.apache.asterix</groupId> - <artifactId>asterix-common</artifactId> + <artifactId>asterix-app</artifactId> <version>${project.version}</version> <type>test-jar</type> <scope>test</scope> diff --git a/asterixdb/asterix-yarn/src/test/java/org/apache/asterix/aoya/test/AsterixYARNLibraryTestIT.java b/asterixdb/asterix-yarn/src/test/java/org/apache/asterix/aoya/test/AsterixYARNLibraryTestIT.java index 157cb12..20756e3 100644 --- a/asterixdb/asterix-yarn/src/test/java/org/apache/asterix/aoya/test/AsterixYARNLibraryTestIT.java +++ b/asterixdb/asterix-yarn/src/test/java/org/apache/asterix/aoya/test/AsterixYARNLibraryTestIT.java @@ -23,7 +23,7 @@ import java.util.logging.Logger; import org.apache.asterix.aoya.AsterixYARNClient; -import org.apache.asterix.test.aql.TestExecutor; +import org.apache.asterix.test.common.TestExecutor; import org.apache.asterix.testframework.context.TestCaseContext; import org.apache.hadoop.yarn.conf.YarnConfiguration; import org.junit.AfterClass; -- To view, visit https://asterix-gerrit.ics.uci.edu/1512 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5d631a2028fb80c823fbaafb7269f15d07685dc9 Gerrit-PatchSet: 8 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Till Westmann <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]> Gerrit-Reviewer: Till Westmann <[email protected]> Gerrit-Reviewer: abdullah alamoudi <[email protected]>
