You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by li...@apache.org on 2020/03/07 13:25:42 UTC
[submarine] branch master updated: SUBMARINE-407. Change module
name e2e to test-e2e
This is an automated email from the ASF dual-hosted git repository.
liuxun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 6988a50 SUBMARINE-407. Change module name e2e to test-e2e
6988a50 is described below
commit 6988a50894c1f7eba65a5ace6a4bd55ad2e8ca4f
Author: Xun Liu <li...@apache.org>
AuthorDate: Sat Mar 7 10:44:39 2020 +0800
SUBMARINE-407. Change module name e2e to test-e2e
### What is this PR for?
In order to unify the module naming, the e2e module needs to be renamed test-e2e
### What type of PR is it?
Refactoring
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/SUBMARINE-407
### How should this be tested?
* https://travis-ci.org/liuxunorg/submarine/builds/659422038
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? Yes
Author: Xun Liu <li...@apache.org>
Closes #205 from liuxunorg/SUBMARINE-407 and squashes the following commits:
6eb67f3 [Xun Liu] SUBMARINE-407. Change module name e2e to test-e2e
---
.travis.yml | 2 +-
docs/development/IntegrationTest.md | 12 ++++++------
submarine-test/pom.xml | 2 +-
submarine-test/{e2e => test-e2e}/pom.xml | 3 +--
.../test/java/org/apache/submarine/AbstractSubmarineIT.java | 0
.../java/org/apache/submarine/ChromeWebDriverProvider.java | 0
.../src/test/java/org/apache/submarine/CommandExecutor.java | 0
.../java/org/apache/submarine/FirefoxWebDriverProvider.java | 0
.../src/test/java/org/apache/submarine/ProcessData.java | 0
.../src/test/java/org/apache/submarine/SubmarineITUtils.java | 0
.../src/test/java/org/apache/submarine/WebDriverManager.java | 0
.../test/java/org/apache/submarine/WebDriverProvider.java | 0
.../org/apache/submarine/integration/SubmarineLogIT.java | 0
.../test/java/org/apache/submarine/integration/homeIT.java | 0
.../test/java/org/apache/submarine/integration/loginIT.java | 0
.../java/org/apache/submarine/integration/registerIT.java | 0
.../java/org/apache/submarine/integration/sidebarIT.java | 0
.../java/org/apache/submarine/integration/workspaceIT.java | 0
.../{e2e => test-e2e}/src/test/resources/log4j.properties | 0
submarine-test/test-k8s/pom.xml | 2 +-
20 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 698ce07..6e11546 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -166,7 +166,7 @@ matrix:
addons:
chrome: stable
firefox: latest
- env: PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests" TEST_FLAG="verify -DskipRat -am" TEST_MODULES="-pl submarine-test/e2e" TEST_PROJECTS=""
+ env: PROFILE="-Phadoop-2.9" BUILD_FLAG="clean package install -DskipTests" TEST_FLAG="verify -DskipRat -am" TEST_MODULES="-pl submarine-test/test-e2e" TEST_PROJECTS=""
- name: Test submarine-test-k8s
dist: xenial
diff --git a/docs/development/IntegrationTest.md b/docs/development/IntegrationTest.md
index 100dc5a..d3ca301 100644
--- a/docs/development/IntegrationTest.md
+++ b/docs/development/IntegrationTest.md
@@ -18,9 +18,9 @@ Submarine now supports two kinds of integration tests.
They are in the project's `submarine/submarine-test` directory, There are two modules, `e2e` and `test-k8s`.
-There are currently some differences between `e2e` and `test-k8s` in operation mode.
+There are currently some differences between `test-e2e` and `test-k8s` in operation mode.
-Among them, `e2e` needs to deploy submarine locally, while `test-k8s` uses k8s to deploy submarine.
+Among them, `test-e2e` needs to deploy submarine locally, while `test-k8s` uses k8s to deploy submarine.
These two different test methods can be applied to different test scenarios. (In the future, these two test methods may be combined or adjusted)
@@ -60,12 +60,12 @@ e2e tests can be ran both locally and in Travis
Local testing: When developers perform e2e testing locally, they need to manually start the submarine server by executing bin / submarine-daemon.sh.
-Then you can manually runs test cases in the `e2e/test` directory in IDEA.
+Then you can manually runs test cases in the `test-e2e/test` directory in IDEA.
### Run the existing tests.
##### Move to the working directroy.
```
-cd submarine/submarine-test/e2e
+cd submarine/submarine-test/test-e2e
```
##### Compile & Run.
@@ -99,7 +99,7 @@ BUILD FAILURE
```
### Add your own integration test
-1. Create new file ending with "IT" under "submarine/submarine-test/e2e/src/test/java/org/apache/submarine/integration/".
+1. Create new file ending with "IT" under "submarine/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/".
2. Your public class is recommended to extend AbstractSubmarineIT. The class AbstractSubmarineIT contains some commonly used functions.
```java
WebElement pollingWait(final By locator, final long timeWait); // Find element on the website.
@@ -111,7 +111,7 @@ BUILD FAILURE
// In WebDriverManager.java:
public static WebDriver getWebDriver(); // This return a firefox webdriver which has been set to your workbench website.
```
-4. Add [JUnit](https://junit.org/junit5/docs/current/user-guide/) annotation before your testing function, e.g., @Beforeclass, @Test, and @AfterClass. You can refer to [loginIT.java](https://github.com/apache/submarine/blob/master/submarine-test/e2e/src/test/java/org/apache/submarine/integration/loginIT.java).
+4. Add [JUnit](https://junit.org/junit5/docs/current/user-guide/) annotation before your testing function, e.g., @Beforeclass, @Test, and @AfterClass. You can refer to [loginIT.java](https://github.com/apache/submarine/blob/master/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/loginIT.java).
5. Use command mentioned above to compile and run to test whether it works as your anticipation.
diff --git a/submarine-test/pom.xml b/submarine-test/pom.xml
index 3cc7e42..6c0667e 100644
--- a/submarine-test/pom.xml
+++ b/submarine-test/pom.xml
@@ -33,7 +33,7 @@
<packaging>pom</packaging>
<modules>
- <module>e2e</module>
+ <module>test-e2e</module>
<module>test-k8s</module>
</modules>
diff --git a/submarine-test/e2e/pom.xml b/submarine-test/test-e2e/pom.xml
similarity index 99%
rename from submarine-test/e2e/pom.xml
rename to submarine-test/test-e2e/pom.xml
index bb37a99..8ce58df 100644
--- a/submarine-test/e2e/pom.xml
+++ b/submarine-test/test-e2e/pom.xml
@@ -28,11 +28,10 @@
<version>0.4.0-SNAPSHOT</version>
</parent>
- <artifactId>submarine-e2e</artifactId>
+ <artifactId>test-e2e</artifactId>
<version>0.4.0-SNAPSHOT</version>
<name>Submarine: E2E Test</name>
-
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/AbstractSubmarineIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/AbstractSubmarineIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/AbstractSubmarineIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/AbstractSubmarineIT.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/ChromeWebDriverProvider.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/ChromeWebDriverProvider.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/ChromeWebDriverProvider.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/ChromeWebDriverProvider.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/CommandExecutor.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/CommandExecutor.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/CommandExecutor.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/CommandExecutor.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/FirefoxWebDriverProvider.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/FirefoxWebDriverProvider.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/FirefoxWebDriverProvider.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/FirefoxWebDriverProvider.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/ProcessData.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/ProcessData.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/ProcessData.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/ProcessData.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/SubmarineITUtils.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/SubmarineITUtils.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/SubmarineITUtils.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/SubmarineITUtils.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/WebDriverManager.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/WebDriverManager.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/WebDriverManager.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/WebDriverManager.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/WebDriverProvider.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/WebDriverProvider.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/WebDriverProvider.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/WebDriverProvider.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/integration/SubmarineLogIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/SubmarineLogIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/integration/SubmarineLogIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/SubmarineLogIT.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/integration/homeIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/homeIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/integration/homeIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/homeIT.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/integration/loginIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/loginIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/integration/loginIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/loginIT.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/integration/registerIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/registerIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/integration/registerIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/registerIT.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/integration/sidebarIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/sidebarIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/integration/sidebarIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/sidebarIT.java
diff --git a/submarine-test/e2e/src/test/java/org/apache/submarine/integration/workspaceIT.java b/submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/workspaceIT.java
similarity index 100%
rename from submarine-test/e2e/src/test/java/org/apache/submarine/integration/workspaceIT.java
rename to submarine-test/test-e2e/src/test/java/org/apache/submarine/integration/workspaceIT.java
diff --git a/submarine-test/e2e/src/test/resources/log4j.properties b/submarine-test/test-e2e/src/test/resources/log4j.properties
similarity index 100%
rename from submarine-test/e2e/src/test/resources/log4j.properties
rename to submarine-test/test-e2e/src/test/resources/log4j.properties
diff --git a/submarine-test/test-k8s/pom.xml b/submarine-test/test-k8s/pom.xml
index f7a4159..0966012 100644
--- a/submarine-test/test-k8s/pom.xml
+++ b/submarine-test/test-k8s/pom.xml
@@ -28,7 +28,7 @@
<version>0.4.0-SNAPSHOT</version>
</parent>
- <artifactId>submarine-test-k8s</artifactId>
+ <artifactId>test-k8s</artifactId>
<version>0.4.0-SNAPSHOT</version>
<name>Submarine: Kubernetes Test</name>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org