This is an automated email from the ASF dual-hosted git repository. mblow pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/asterixdb.git
commit 84edbf672e3a2596407feb087472b5c43392ab7c Author: Michael Blow <[email protected]> AuthorDate: Mon Oct 23 18:16:53 2023 -0400 [NO ISSUE][HYR][TEST] Refactor hyracks-server tests to avoid dependency issues Change-Id: I4f504f3137f843a2340e4b4558ec55e4f0fd9436 Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17874 Reviewed-by: Michael Blow <[email protected]> Reviewed-by: Hussain Towaileb <[email protected]> Tested-by: Michael Blow <[email protected]> Integration-Tests: Michael Blow <[email protected]> Integration-Tests: Jenkins <[email protected]> --- asterixdb/asterix-server/pom.xml | 6 +- asterixdb/pom.xml | 2 +- .../hyracks-examples/hyracks-shutdown-test/pom.xml | 10 +-- hyracks-fullstack/hyracks/hyracks-server/pom.xml | 63 +------------- .../hyracks-server-test}/pom.xml | 98 ++++++---------------- .../apache/hyracks/test/server/NCServiceIT.java | 2 +- .../test/server/process/HyracksCCProcess.java | 0 .../server/process/HyracksNCServiceProcess.java | 0 .../test/server/process/HyracksServerProcess.java | 0 .../test/server/process/HyracksVirtualCluster.java | 0 .../src/test/resources/NCServiceIT/cc.conf | 0 .../src/test/resources/NCServiceIT/nc-blue.conf | 0 .../src/test/resources/NCServiceIT/nc-red.conf | 0 .../src/test/resources/logging.properties | 0 hyracks-fullstack/hyracks/hyracks-tests/pom.xml | 1 + 15 files changed, 39 insertions(+), 143 deletions(-) diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml index 479ef8508b..a10b9693d9 100644 --- a/asterixdb/asterix-server/pom.xml +++ b/asterixdb/asterix-server/pom.xml @@ -544,8 +544,8 @@ <licenses> <license> <displayName>Various 3rd party</displayName> - <url>file://${basedir}}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</url> - <contentFile>${basedir}}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</contentFile> + <url>file://${basedir}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</url> + <contentFile>${basedir}/../asterix-dashboard/src/main/resources/dashboard/static/3rdpartylicenses.txt</contentFile> </license> <license> <displayName>a BSD 3-clause license</displayName> @@ -1147,7 +1147,7 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-server</artifactId> + <artifactId>hyracks-server-test</artifactId> <type>test-jar</type> <scope>test</scope> </dependency> diff --git a/asterixdb/pom.xml b/asterixdb/pom.xml index 398239d0cc..e54fea18c3 100644 --- a/asterixdb/pom.xml +++ b/asterixdb/pom.xml @@ -1312,7 +1312,7 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-server</artifactId> + <artifactId>hyracks-server-test</artifactId> <version>${hyracks.version}</version> <type>test-jar</type> </dependency> diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml index ab7c63c721..6c19207956 100644 --- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-shutdown-test/pom.xml @@ -43,6 +43,11 @@ <usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency> <usedDependency>org.apache.hyracks:hyracks-control-cc</usedDependency> </usedDependencies> + <ignoredNonTestScopedDependencies> + <ignoredNonTestScopedDependency>org.apache.hyracks:hyracks-ipc:*</ignoredNonTestScopedDependency> + <ignoredNonTestScopedDependency>org.apache.hyracks:hyracks-api:*</ignoredNonTestScopedDependency> + <ignoredNonTestScopedDependency>org.apache.logging.log4j:log4j-api:*</ignoredNonTestScopedDependency> + </ignoredNonTestScopedDependencies> </configuration> <executions> <execution> @@ -191,31 +196,26 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-ipc</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-api</artifactId> <version>${project.version}</version> <type>jar</type> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> - <scope>test</scope> </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-server/pom.xml index acf238e732..70db6a65ec 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-server/pom.xml @@ -42,23 +42,14 @@ <build> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <configuration> <usedDependencies combine.children="append"> <usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency> + <usedDependency>org.apache.hyracks:hyracks-control-cc</usedDependency> + <usedDependency>org.apache.hyracks:hyracks-nc-service</usedDependency> </usedDependencies> </configuration> <executions> @@ -70,23 +61,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <runOrder>alphabetical</runOrder> - <forkMode>pertest</forkMode> - </configuration> - <executions> - <execution> - <goals> - <goal>integration-test</goal> - <goal>verify</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>appassembler-maven-plugin</artifactId> @@ -148,49 +122,16 @@ <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-cc</artifactId> <version>${project.version}</version> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-nc-service</artifactId> <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-util</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> <artifactId>hyracks-control-nc</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - <scope>test</scope> - </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-server/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml similarity index 68% copy from hyracks-fullstack/hyracks/hyracks-server/pom.xml copy to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml index acf238e732..bd7bf759ff 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/pom.xml @@ -19,11 +19,11 @@ <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> - <artifactId>hyracks-server</artifactId> - <name>hyracks-server</name> + <artifactId>hyracks-server-test</artifactId> + <name>hyracks-server-test</name> <parent> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks</artifactId> + <artifactId>hyracks-tests</artifactId> <version>0.3.8.2-SNAPSHOT</version> </parent> @@ -37,7 +37,7 @@ </licenses> <properties> - <root.dir>${basedir}/../..</root.dir> + <root.dir>${basedir}/../../..</root.dir> </properties> <build> @@ -58,7 +58,7 @@ <artifactId>maven-dependency-plugin</artifactId> <configuration> <usedDependencies combine.children="append"> - <usedDependency>org.apache.hyracks:hyracks-control-nc</usedDependency> + <usedDependency>org.apache.hyracks:hyracks-server</usedDependency> </usedDependencies> </configuration> <executions> @@ -86,61 +86,6 @@ </execution> </executions> </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>appassembler-maven-plugin</artifactId> - <executions> - <execution> - <configuration> - <programs> - <program> - <mainClass>org.apache.hyracks.control.cc.CCDriver</mainClass> - <name>hyrackscc</name> - </program> - <program> - <mainClass>org.apache.hyracks.control.nc.NCDriver</mainClass> - <name>hyracksnc</name> - </program> - <program> - <mainClass>org.apache.hyracks.control.nc.service.NCService</mainClass> - <name>hyracksncservice</name> - </program> - </programs> - <repositoryLayout>flat</repositoryLayout> - <repositoryName>lib</repositoryName> - </configuration> - <phase>package</phase> - <goals> - <goal>assemble</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-deploy-plugin</artifactId> - <configuration> - <skip>true</skip> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>process-test-classes</id> - <phase>package</phase> - <configuration> - <target> - <chmod file="target/appassembler/bin/*" perm="755" /> - </target> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </plugin> </plugins> </build> <dependencies> @@ -158,33 +103,32 @@ </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-util</artifactId> + <artifactId>hyracks-server</artifactId> <version>${project.version}</version> <scope>test</scope> </dependency> +<!-- <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> + <groupId>org.apache.hyracks</groupId> + <artifactId>hyracks-control-nc</artifactId> + <version>${project.version}</version> <scope>test</scope> </dependency> +--> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> + <groupId>junit</groupId> + <artifactId>junit</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.hyracks</groupId> - <artifactId>hyracks-control-nc</artifactId> + <artifactId>hyracks-util</artifactId> <version>${project.version}</version> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.core</groupId> - <artifactId>jackson-databind</artifactId> <scope>test</scope> </dependency> <dependency> @@ -192,5 +136,15 @@ <artifactId>log4j-api</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpclient</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>com.fasterxml.jackson.core</groupId> + <artifactId>jackson-databind</artifactId> + <scope>test</scope> + </dependency> </dependencies> </project> diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java similarity index 97% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java index cd0359f9ae..5ae57cd44a 100644 --- a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java +++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/NCServiceIT.java @@ -47,7 +47,7 @@ public class NCServiceIT { private static final String TARGET_DIR = FileUtil.joinPath(".", "target"); private static final String LOG_DIR = FileUtil.joinPath(TARGET_DIR, "failsafe-reports"); private static final String RESOURCE_DIR = FileUtil.joinPath(TARGET_DIR, "test-classes", "NCServiceIT"); - private static final String APP_HOME = FileUtil.joinPath(TARGET_DIR, "appassembler"); + private static final String APP_HOME = FileUtil.joinPath("..", "..", "hyracks-server", "target", "appassembler"); private static final Logger LOGGER = LogManager.getLogger(); private static HyracksVirtualCluster cluster = null; diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksCCProcess.java diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksNCServiceProcess.java diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksServerProcess.java diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/java/org/apache/hyracks/test/server/process/HyracksVirtualCluster.java diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/cc.conf similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/cc.conf rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/cc.conf diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-blue.conf similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-blue.conf rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-blue.conf diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-red.conf similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/NCServiceIT/nc-red.conf rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/NCServiceIT/nc-red.conf diff --git a/hyracks-fullstack/hyracks/hyracks-server/src/test/resources/logging.properties b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/logging.properties similarity index 100% rename from hyracks-fullstack/hyracks/hyracks-server/src/test/resources/logging.properties rename to hyracks-fullstack/hyracks/hyracks-tests/hyracks-server-test/src/test/resources/logging.properties diff --git a/hyracks-fullstack/hyracks/hyracks-tests/pom.xml b/hyracks-fullstack/hyracks/hyracks-tests/pom.xml index a26adeaa53..71bb0e917b 100644 --- a/hyracks-fullstack/hyracks/hyracks-tests/pom.xml +++ b/hyracks-fullstack/hyracks/hyracks-tests/pom.xml @@ -52,5 +52,6 @@ <module>hyracks-storage-am-lsm-invertedindex-test</module> <module>hyracks-storage-am-bloomfilter-test</module> <module>hyracks-dataflow-common-test</module> + <module>hyracks-server-test</module> </modules> </project>
