This is an automated email from the ASF dual-hosted git repository.
lgcareer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2749c7e add alert manage testCase and optimize test case execution
order (#2941)
2749c7e is described below
commit 2749c7e5369459c1a410508cc4769db37f4a0043
Author: xingchun-chen <[email protected]>
AuthorDate: Wed Jun 10 10:22:27 2020 +0800
add alert manage testCase and optimize test case execution order (#2941)
* add LoginTest license
* Delete useless packages
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* e2e add project and workflow case
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group in init.sql
* Update worker_group_id to worker_group
* Increase dataX environment variable, sslTrust default value
* modify dataX environment variable
* update e2e chrome version
* add alert manage testcase and Optimize test case execution order
Co-authored-by: chenxingchun <[email protected]>
---
.../security/AlertManageData.java} | 30 ++++-----
.../locator/security/AlertManageLocator.java | 35 ++++++++++
.../page/security/AlertManagePage.java | 77 ++++++++++++++++++++++
.../testcase/{LoginTest.java => TestLogin.java} | 4 +-
.../TestDeleteAlert.java} | 22 ++++---
.../TestDeleteProject.java} | 6 +-
.../TestDeleteTenant.java} | 6 +-
.../TestDeleteUser.java} | 6 +-
.../TestDeleteWorkflow.java} | 6 +-
.../TestCreateProject.java} | 6 +-
.../TestCreateWorkflow.java} | 6 +-
.../TestAlertManage.java} | 24 +++----
.../TestTenantManage.java} | 6 +-
.../TestUserManage.java} | 6 +-
e2e/testng.xml | 25 +++----
15 files changed, 192 insertions(+), 73 deletions(-)
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/UserManageTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/data/security/AlertManageData.java
similarity index 51%
copy from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/UserManageTest.java
copy to
e2e/src/test/java/org/apache/dolphinscheduler/data/security/AlertManageData.java
index fdcec1a..aa47016 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/UserManageTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/data/security/AlertManageData.java
@@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.security;
+package org.apache.dolphinscheduler.data.security;
-import org.apache.dolphinscheduler.base.BaseTest;
-import org.apache.dolphinscheduler.page.security.UserManagePage;
-import org.testng.annotations.Test;
+public class AlertManageData {
+ /**
+ * Alert Name
+ */
+ public static final String ALERT_NAME = "selenium_alert_Name";
+ /**
+ * Alert Type
+ */
+ public static final String ALERT_TYPE = "邮件";
-public class UserManageTest extends BaseTest {
- private UserManagePage userManagePage;
+ /**
+ * Alert Description
+ */
+ public static final String DESCRIPTION = "create alert test";
- @Test(groups={"functionTests","user"},dependsOnGroups = { "login"
},description = "UserManageTest",priority=3)
- public void testUserManage() throws InterruptedException {
- userManagePage = new UserManagePage(driver);
- //assert user manage page
- System.out.println("start create user");
- assert userManagePage.createUser();
- System.out.println("end create user");
- System.out.println("===================================");
+ public static final String ALERT_MANAGE = "告警组管理 - DolphinScheduler";
- }
}
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/AlertManageLocator.java
b/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/AlertManageLocator.java
new file mode 100644
index 0000000..e4dbe73
--- /dev/null
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/locator/security/AlertManageLocator.java
@@ -0,0 +1,35 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.locator.security;
+
+import org.openqa.selenium.By;
+
+public class AlertManageLocator {
+ //create alert locator
+ public static final By CLICK_ALERT_MANAGE =
By.xpath("//div[4]/div/a/div/a/span");
+ public static final By CLICK_CREATE_ALERT =
By.xpath("//div[1]/div[2]/div/div[2]/div[2]/div/div[1]/button/span");
+ public static final By INPUT_ALERT_NAME =
By.xpath("//div[2]/div/div[1]/div[2]/div/input");
+ public static final By CLICK_ALERT_TYPE =
By.xpath("//div[2]/div/div[2]/div/div[2]/div[2]/div/div[1]/div/input");
+ public static final By SELECT_ALERT_EMAIL =
By.xpath("//div[2]/div/div[2]/div/div[2]/div[2]/div/div[2]/div/div/div/ul/li[1]/span");
+ public static final By INPUT_ALERT_DESCRIPTION = By.xpath("//textarea");
+ public static final By SUBMIT_ALERT = By.xpath("//div[3]/button[2]/span");
+
+ //delete alert locator
+ public static final By DELETE_ALERT_BUTTON = By.xpath("//span/button");
+ public static final By CONFIRM_DELETE_ALERT_BUTTON =
By.xpath("//div[2]/div/button[2]/span");
+}
+
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
b/e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
new file mode 100644
index 0000000..eb3fa34
--- /dev/null
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/page/security/AlertManagePage.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.dolphinscheduler.page.security;
+
+import org.apache.dolphinscheduler.common.PageCommon;
+import org.apache.dolphinscheduler.data.security.AlertManageData;
+import org.apache.dolphinscheduler.locator.security.AlertManageLocator;
+import org.openqa.selenium.WebDriver;
+
+public class AlertManagePage extends PageCommon {
+ /**
+ * Unique constructor
+ * @param driver driver
+ */
+ public AlertManagePage(WebDriver driver) {
+ super(driver);
+ }
+
+ /**
+ * createTenant
+ *
+ * @return Whether to enter the specified page after create tenant
+ */
+ public boolean createAlert() throws InterruptedException {
+ // click alert manage
+ clickElement(AlertManageLocator.CLICK_ALERT_MANAGE);
+ Thread.sleep(2000);
+
+ // click create alert button
+ clickElement(AlertManageLocator.CLICK_CREATE_ALERT);
+ Thread.sleep(2000);
+
+ // input alert data
+ sendInput(AlertManageLocator.INPUT_ALERT_NAME,
AlertManageData.ALERT_NAME);
+
+ clickElement(AlertManageLocator.CLICK_ALERT_TYPE);
+
+ clickElement(AlertManageLocator.SELECT_ALERT_EMAIL);
+
+ sendInput(AlertManageLocator.INPUT_ALERT_DESCRIPTION,
AlertManageData.DESCRIPTION);
+
+ // click button
+ clickButton(AlertManageLocator.SUBMIT_ALERT);
+
+ // Whether to enter the specified page after submit
+ return ifTitleContains(AlertManageData.ALERT_MANAGE);
+ }
+
+ public boolean deleteAlert() throws InterruptedException {
+
+ // click user manage
+ clickElement(AlertManageLocator.CLICK_ALERT_MANAGE);
+
+ // click delete user button
+ clickButton(AlertManageLocator.DELETE_ALERT_BUTTON);
+
+ // click confirm delete button
+ clickButton(AlertManageLocator.CONFIRM_DELETE_ALERT_BUTTON);
+
+ // Whether to enter the specified page after submit
+ return ifTitleContains(AlertManageData.ALERT_MANAGE);
+ }
+}
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/LoginTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/TestLogin.java
similarity index 95%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/LoginTest.java
rename to e2e/src/test/java/org/apache/dolphinscheduler/testcase/TestLogin.java
index d1af921..5c491f3 100644
--- a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/LoginTest.java
+++ b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/TestLogin.java
@@ -22,10 +22,10 @@ import org.testng.annotations.Test;
import static org.apache.dolphinscheduler.base.BaseTest.driver;
@Test(groups={"functionTests","login"})
-public class LoginTest {
+public class TestLogin {
private LoginPage loginPage;
- @Test(description = "LoginTest", priority = 1)
+ @Test(description = "TestLogin")
public void testLogin() throws InterruptedException {
loginPage = new LoginPage(driver);
System.out.println("===================================");
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteAlert.java
similarity index 66%
copy from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
copy to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteAlert.java
index 067bc4a..5db107b 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteAlert.java
@@ -14,25 +14,29 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.deleteData;
+package org.apache.dolphinscheduler.testcase.testDeleteData;
import org.apache.dolphinscheduler.base.BaseTest;
+import org.apache.dolphinscheduler.page.security.AlertManagePage;
import org.apache.dolphinscheduler.page.security.TenantManagePage;
import org.testng.annotations.Test;
-public class DeleteTenantTest extends BaseTest {
+public class TestDeleteAlert extends BaseTest {
+ private AlertManagePage alertManagePage;
private TenantManagePage tenantManagePage;
- @Test(groups={"functionTests"},dependsOnGroups = {
"login","createTenant"},description = "DeleteTenantTest",priority=9)
- public void testDeleteTenant() throws InterruptedException {
+ @Test(groups={"functionTests"},dependsOnGroups = { "login","alert"
},description = "TestDeleteAlert",priority=8)
+ public void testDeleteAlert() throws InterruptedException {
tenantManagePage = new TenantManagePage(driver);
- //assert tenant manage page
- System.out.println("jump to security to delete tenant");
+ System.out.println("jump to testSecurity to delete alert");
tenantManagePage.jumpSecurity();
- System.out.println("start delete tenant");
- assert tenantManagePage.deleteTenant();
- System.out.println("end delete tenant");
+ alertManagePage = new AlertManagePage(driver);
+
+ //assert alert manage page
+ System.out.println("start delete alert");
+ assert alertManagePage.deleteAlert();
+ System.out.println("end delete alert");
System.out.println("===================================");
}
}
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteProject.java
similarity index 90%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteProject.java
index dc45b6e..bcd4291 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteProject.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.deleteData;
+package org.apache.dolphinscheduler.testcase.testDeleteData;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.project.CreateProjectPage;
import org.testng.annotations.Test;
-public class DeleteProjectTest extends BaseTest {
+public class TestDeleteProject extends BaseTest {
private CreateProjectPage createProjectPage;
- @Test(groups={"functionTests"},dependsOnGroups = {
"login","project"},description = "DeleteProjectTest",priority=7)
+ @Test(groups={"functionTests"},dependsOnGroups = {
"login","project"},description = "TestDeleteProject")
public void testDeleteProject() throws InterruptedException {
createProjectPage = new CreateProjectPage(driver);
//jump to project manage page
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteTenant.java
similarity index 90%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteTenant.java
index 067bc4a..9b162a4 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteTenant.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.deleteData;
+package org.apache.dolphinscheduler.testcase.testDeleteData;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.security.TenantManagePage;
import org.testng.annotations.Test;
-public class DeleteTenantTest extends BaseTest {
+public class TestDeleteTenant extends BaseTest {
private TenantManagePage tenantManagePage;
- @Test(groups={"functionTests"},dependsOnGroups = {
"login","createTenant"},description = "DeleteTenantTest",priority=9)
+ @Test(groups={"functionTests"},dependsOnGroups = {
"login","createTenant"},description = "TestDeleteTenant")
public void testDeleteTenant() throws InterruptedException {
tenantManagePage = new TenantManagePage(driver);
//assert tenant manage page
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteUser.java
similarity index 91%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteUser.java
index 4507192..cdd226f 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteUser.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.deleteData;
+package org.apache.dolphinscheduler.testcase.testDeleteData;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.security.TenantManagePage;
import org.apache.dolphinscheduler.page.security.UserManagePage;
import org.testng.annotations.Test;
-public class DeleteUserTest extends BaseTest {
+public class TestDeleteUser extends BaseTest {
private UserManagePage userManagePage;
private TenantManagePage tenantManagePage;
- @Test(groups={"functionTests"},dependsOnGroups = { "login","user"
},description = "DeleteUserTest",priority=8)
+ @Test(groups={"functionTests"},dependsOnGroups = { "login","user"
},description = "TestDeleteUser")
public void testDeleteUser() throws InterruptedException {
tenantManagePage = new TenantManagePage(driver);
System.out.println("jump to security to delete user");
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteWorkflow.java
similarity index 91%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteWorkflow.java
index 48eb091..d84f34a 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testDeleteData/TestDeleteWorkflow.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.deleteData;
+package org.apache.dolphinscheduler.testcase.testDeleteData;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.project.CreateProjectPage;
import org.apache.dolphinscheduler.page.project.CreateWorkflowPage;
import org.testng.annotations.Test;
-public class DeleteWorkflowTest extends BaseTest {
+public class TestDeleteWorkflow extends BaseTest {
private CreateWorkflowPage createWorkflowPage;
private CreateProjectPage createProjectPage;
- @Test(groups={"functionTests"},dependsOnGroups = {
"login","workflow"},description = "DeleteWorkflowTest",priority=6)
+ @Test(groups={"functionTests"},dependsOnGroups = {
"login","workflow"},description = "TestDeleteWorkflow")
public void testDeleteWorkflow() throws InterruptedException {
createProjectPage = new CreateProjectPage(driver);
//jump to project manage page
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/project/CreateProjectTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testProject/TestCreateProject.java
similarity index 90%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/project/CreateProjectTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testProject/TestCreateProject.java
index 8f7594b..925cf02 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/project/CreateProjectTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testProject/TestCreateProject.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.project;
+package org.apache.dolphinscheduler.testcase.testProject;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.project.CreateProjectPage;
import org.testng.annotations.Test;
-public class CreateProjectTest extends BaseTest {
+public class TestCreateProject extends BaseTest {
private CreateProjectPage createProjectPage;
- @Test(groups={"functionTests","project"},dependsOnGroups = { "login"
},description = "CreateProjectTest",priority=4)
+ @Test(groups={"functionTests","project"},dependsOnGroups = { "login"
},description = "CreateProjectTest")
public void testCreateProject() throws InterruptedException {
createProjectPage = new CreateProjectPage(driver);
// enter user manage page
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/project/CreateWorkflowTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testProject/TestCreateWorkflow.java
similarity index 92%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/project/CreateWorkflowTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testProject/TestCreateWorkflow.java
index 61aadf7..2b7d2b6 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/project/CreateWorkflowTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testProject/TestCreateWorkflow.java
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.project;
+package org.apache.dolphinscheduler.testcase.testProject;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.project.CreateProjectPage;
import org.apache.dolphinscheduler.page.project.CreateWorkflowPage;
import org.testng.annotations.Test;
-public class CreateWorkflowTest extends BaseTest {
+public class TestCreateWorkflow extends BaseTest {
private CreateWorkflowPage createWorkflowPage;
private CreateProjectPage createProjectPage;
- @Test(groups={"functionTests","workflow"},dependsOnGroups = { "login"
},description = "CreateWorkflowTest",priority=5)
+ @Test(groups={"functionTests","workflow"},dependsOnGroups = { "login"
},description = "TestCreateWorkflow")
public void testCreateWorkflow() throws InterruptedException {
createProjectPage = new CreateProjectPage(driver);
System.out.println("jump to the projectManage page to create
workflow");
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/TenantManageTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestAlertManage.java
similarity index 62%
copy from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/TenantManageTest.java
copy to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestAlertManage.java
index 721af36..259faf1 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/TenantManageTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestAlertManage.java
@@ -14,23 +14,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.security;
+package org.apache.dolphinscheduler.testcase.testSecurity;
import org.apache.dolphinscheduler.base.BaseTest;
-import org.apache.dolphinscheduler.page.security.TenantManagePage;
+import org.apache.dolphinscheduler.page.security.AlertManagePage;
import org.testng.annotations.Test;
+public class TestAlertManage extends BaseTest {
+ private AlertManagePage alertManagePage;
-public class TenantManageTest extends BaseTest {
- private TenantManagePage tenantManagePage;
-
- @Test(groups={"functionTests","createTenant"},dependsOnGroups = { "login"
},description = "TenantManageTest",priority=2)
- public void testTenantManage() throws InterruptedException {
- tenantManagePage = new TenantManagePage(driver);
- //assert tenant manage page
- System.out.println("start create tenant");
- assert tenantManagePage.createTenant();
- System.out.println("end create tenant");
+ @Test(groups={"functionTests","alert"},dependsOnGroups = { "login"
},description = "AlertManagePage")
+ public void testAlertManage() throws InterruptedException {
+ alertManagePage = new AlertManagePage(driver);
+ //assert alert manage page
+ System.out.println("start create alert");
+ assert alertManagePage.createAlert();
+ System.out.println("end create alert");
System.out.println("===================================");
+
}
}
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/TenantManageTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestTenantManage.java
similarity index 89%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/TenantManageTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestTenantManage.java
index 721af36..109b817 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/TenantManageTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestTenantManage.java
@@ -14,17 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.security;
+package org.apache.dolphinscheduler.testcase.testSecurity;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.security.TenantManagePage;
import org.testng.annotations.Test;
-public class TenantManageTest extends BaseTest {
+public class TestTenantManage extends BaseTest {
private TenantManagePage tenantManagePage;
- @Test(groups={"functionTests","createTenant"},dependsOnGroups = { "login"
},description = "TenantManageTest",priority=2)
+ @Test(groups={"functionTests","createTenant"},dependsOnGroups = { "login"
},description = "TestTenantManage")
public void testTenantManage() throws InterruptedException {
tenantManagePage = new TenantManagePage(driver);
//assert tenant manage page
diff --git
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/UserManageTest.java
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestUserManage.java
similarity index 90%
rename from
e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/UserManageTest.java
rename to
e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestUserManage.java
index fdcec1a..20537de 100644
---
a/e2e/src/test/java/org/apache/dolphinscheduler/testcase/security/UserManageTest.java
+++
b/e2e/src/test/java/org/apache/dolphinscheduler/testcase/testSecurity/TestUserManage.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.dolphinscheduler.testcase.security;
+package org.apache.dolphinscheduler.testcase.testSecurity;
import org.apache.dolphinscheduler.base.BaseTest;
import org.apache.dolphinscheduler.page.security.UserManagePage;
import org.testng.annotations.Test;
-public class UserManageTest extends BaseTest {
+public class TestUserManage extends BaseTest {
private UserManagePage userManagePage;
- @Test(groups={"functionTests","user"},dependsOnGroups = { "login"
},description = "UserManageTest",priority=3)
+ @Test(groups={"functionTests","user"},dependsOnGroups = { "login"
},description = "TestUserManage")
public void testUserManage() throws InterruptedException {
userManagePage = new UserManagePage(driver);
//assert user manage page
diff --git a/e2e/testng.xml b/e2e/testng.xml
index eb4f21e..5bd35bd 100644
--- a/e2e/testng.xml
+++ b/e2e/testng.xml
@@ -16,24 +16,27 @@
~ limitations under the License.
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd"; >
-<suite name="dolphinscheduler_e2e" parallel="true">
+<suite name="dolphinscheduler_e2e" verbose="1">
<test name="dolphinscheduler_test" preserve-order="true">
<groups>
<run>
<include name="functionTests"/>
</run>
</groups>
-
<classes>
- <class
name="org.apache.dolphinscheduler.testcase.LoginTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.security.TenantManageTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.security.UserManageTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.project.CreateProjectTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.project.CreateWorkflowTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.deleteData.DeleteWorkflowTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.deleteData.DeleteProjectTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.deleteData.DeleteUserTest"></class>
- <class
name="org.apache.dolphinscheduler.testcase.deleteData.DeleteTenantTest"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.TestLogin"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testSecurity.TestTenantManage"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testSecurity.TestUserManage"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testSecurity.TestAlertManage"></class>
+
+ <class
name="org.apache.dolphinscheduler.testcase.testProject.TestCreateProject"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testProject.TestCreateWorkflow"></class>
+
+ <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteWorkflow"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteProject"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteAlert"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteUser"></class>
+ <class
name="org.apache.dolphinscheduler.testcase.testDeleteData.TestDeleteTenant"></class>
</classes>
</test>
