azkaban-aplcache

Simplify the azkaban-test subprojet name to test (#1206) The

6/12/2017 6:41:01 PM

Changes

azkaban-test/build.gradle 0(+0 -0)

settings.gradle 2(+1 -1)

Details

diff --git a/azkaban-common/build.gradle b/azkaban-common/build.gradle
index 2bb93bb..b58111d 100644
--- a/azkaban-common/build.gradle
+++ b/azkaban-common/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     compile('io.dropwizard.metrics:metrics-core:3.1.0')
     compile('io.dropwizard.metrics:metrics-jvm:3.1.0')
 
-    testCompile(project(':azkaban-test').sourceSets.test.output)
+    testCompile(project(':test').sourceSets.test.output)
 
     testRuntime('com.h2database:h2:1.4.193')
     testRuntime('org.slf4j:slf4j-log4j12:1.7.18')
diff --git a/azkaban-common/src/test/java/azkaban/executor/JdbcExecutorLoaderTest.java b/azkaban-common/src/test/java/azkaban/executor/JdbcExecutorLoaderTest.java
index 2a498f7..e9874a1 100644
--- a/azkaban-common/src/test/java/azkaban/executor/JdbcExecutorLoaderTest.java
+++ b/azkaban-common/src/test/java/azkaban/executor/JdbcExecutorLoaderTest.java
@@ -55,7 +55,7 @@ public class JdbcExecutorLoaderTest {
   private static boolean testDBExists;
   /* Directory with serialized description of test flows */
   private static final String UNIT_BASE_DIR =
-    "../azkaban-test/src/test/resources/azkaban/test/executions";
+    "../test/src/test/resources/azkaban/test/executions";
   // @TODO remove this and turn into local host.
   private static final String host = "localhost";
   private static final int port = 3306;
diff --git a/azkaban-common/src/test/java/azkaban/utils/TestUtils.java b/azkaban-common/src/test/java/azkaban/utils/TestUtils.java
index 1f1cb46..ecea38d 100644
--- a/azkaban-common/src/test/java/azkaban/utils/TestUtils.java
+++ b/azkaban-common/src/test/java/azkaban/utils/TestUtils.java
@@ -33,7 +33,7 @@ public class TestUtils {
 
   /* Base  resource direcotyr for unit tests */
   private static final String UNIT_RESOURCE_DIR =
-      "../azkaban-test/src/test/resources/azkaban/test";
+      "../test/src/test/resources/azkaban/test";
   /* Directory with serialized description of test flows */
   private static final String UNIT_EXECUTION_DIR =
       UNIT_RESOURCE_DIR + "/executions";
diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
index 9265a39..2041e78 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest.java
@@ -53,7 +53,7 @@ import org.mockito.MockitoAnnotations;
 public class FlowRunnerTest extends FlowRunnerTestBase {
 
   private static final File TEST_DIR = new File(
-      "../azkaban-test/src/test/resources/azkaban/test/executions/exectest1");
+      "../test/src/test/resources/azkaban/test/executions/exectest1");
   private File workingDir;
   private JobTypeManager jobtypeManager;
   private ProjectLoader fakeProjectLoader;
diff --git a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java
index 6210b03..3dc55ad 100644
--- a/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java
+++ b/azkaban-exec-server/src/test/java/azkaban/execapp/FlowRunnerTest2.java
@@ -96,7 +96,7 @@ import org.junit.Test;
 public class FlowRunnerTest2 extends FlowRunnerTestBase {
 
   private static final File TEST_DIR = new File(
-      "../azkaban-test/src/test/resources/azkaban/test/executions/embedded2");
+      "../test/src/test/resources/azkaban/test/executions/embedded2");
   private static int id = 101;
   private final Logger logger = Logger.getLogger(FlowRunnerTest2.class);
   private File workingDir;

settings.gradle 2(+1 -1)

diff --git a/settings.gradle b/settings.gradle
index 24c7ff0..ef08dd5 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -22,4 +22,4 @@ include 'azkaban-exec-server'
 include 'azkaban-hadoop-security-plugin'
 include 'azkaban-solo-server'
 include 'azkaban-web-server'
-include 'azkaban-test'
+include 'test'
diff --git a/test/build.gradle b/test/build.gradle
new file mode 100644
index 0000000..305985c
--- /dev/null
+++ b/test/build.gradle
@@ -0,0 +1,3 @@
+jar {
+    baseName = 'azkaban-test'
+}