Unverified Commit 5edc2af3 authored by xingchun-chen's avatar xingchun-chen Committed by GitHub
Browse files

e2e add project and workflow case (#2309) 



* 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

Co-authored-by: default avatarchenxingchun <438044805@qq.com>
parent 0d70e065

e2e/src/main/java/org/apache/dolphinscheduler/constant/TestConstant.java

+3 −5
Original line number Diff line number Diff line
@@ -20,18 +20,16 @@ public class TestConstant { 
    /**

     * 1000

     */

    public static final int ONE_THOUSANG = 1000;





    public static final int ONE_THOUSAND = 1000;



    /**

     * 3000

     */

    public static final int THREE_THOUSANG = 3000;

    public static final int THREE_THOUSAND = 3000;



    /**

     * 10000

     */

    public static final int TEN_THOUSANG = 10000;

    public static final int TEN_THOUSAND = 10000;



}

e2e/src/main/java/org/apache/dolphinscheduler/util/RedisUtil.java

+2 −2
Original line number Diff line number Diff line
@@ -115,9 +115,9 @@ public class RedisUtil { 
        try {

            System.out.println("redis init");

            if (redisPwd.isEmpty())

                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.THREE_THOUSANG);

                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.THREE_THOUSAND);

            else {

                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.TEN_THOUSANG, redisPwd);

                jedisPool = new JedisPool(jedisPoolConfig, redisIp, redisPort, TestConstant.TEN_THOUSAND, redisPwd);

            }

        } catch (Exception e) {

            e.printStackTrace();

e2e/src/test/java/org/apache/dolphinscheduler/base/BaseDriver.java

+6 −10
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ package org.apache.dolphinscheduler.base; 


import org.apache.dolphinscheduler.constant.TestConstant;

import org.apache.dolphinscheduler.util.PropertiesReader;

import org.openqa.selenium.Cookie;

import org.openqa.selenium.JavascriptExecutor;

import org.openqa.selenium.PageLoadStrategy;

import org.openqa.selenium.WebDriver;

import org.openqa.selenium.chrome.ChromeDriver;

import org.openqa.selenium.chrome.ChromeOptions;

import org.openqa.selenium.remote.CapabilityType;



import java.io.IOException;

import java.util.concurrent.TimeUnit;

import org.openqa.selenium.PageLoadStrategy;





/**
@@ -83,6 +83,7 @@ public class BaseDriver { 
     * start chrome browser

     */

    public void startBrowser() throws Exception {

        System.out.println("===================test start===================");

        // set chrome driver

        System.setProperty("webdriver.chrome.driver", chromeDriverPath);

        ChromeOptions chromeOptions = new ChromeOptions();
@@ -104,9 +105,6 @@ public class BaseDriver { 
        // page load timeout

        driver.manage().timeouts().pageLoadTimeout(pageLoadTimeout, TimeUnit.SECONDS);



        // page load timeout

        driver.manage().timeouts().pageLoadTimeout(pageLoadTimeout, TimeUnit.SECONDS);



        // script timeout

        driver.manage().timeouts().setScriptTimeout(setScriptTimeout, TimeUnit.SECONDS);
@@ -141,12 +139,10 @@ public class BaseDriver { 
     * close browser

     */

    public void closeBrowser() throws InterruptedException {

        // JS Show a pop-up box to indicate the end of the test

        Thread.sleep(TestConstant.ONE_THOUSANG);

//        ((JavascriptExecutor) driver).executeScript("alert('Test completed, browser closes after 3s')");

        Thread.sleep(TestConstant.THREE_THOUSANG);

        Thread.sleep(TestConstant.THREE_THOUSAND);

        if (driver != null) {

            driver.quit();

            System.out.println("===================test end===================");

        }

    }

}

e2e/src/test/java/org/apache/dolphinscheduler/common/BrowserCommon.java

+25 −9
Original line number Diff line number Diff line
@@ -126,6 +126,18 @@ public class BrowserCommon { 
        return buttonElement;

    }



    /**

     * Click Navigation Bar element

     * @param locator By

     * @return clickButton

     */

    public void clickTopElement(By locator) {

        WebElement element = driver.findElement(locator);

        JavascriptExecutor executor = (JavascriptExecutor)driver;

        executor.executeScript("arguments[0].click();", element);

    }





    /**

     * Click element

     *
@@ -138,6 +150,7 @@ public class BrowserCommon { 
        return clickElement;

    }





    /**

     * input element

     *
@@ -236,6 +249,10 @@ public class BrowserCommon { 
        return driver;

    }











        /**

         * Multi-window switch handle, according to the handle number passed in

         *
@@ -314,9 +331,8 @@ public class BrowserCommon { 
        executeScript("window.scrollTo(0, document.body.scrollHeight)");

    }



    public void scrollToElementBottom() {



        WebElement webElement = driver.findElement(By.xpath("/html/body/div[4]/div/div[2]/div/div[2]/div/div[7]/div[3]"));

    public void scrollToElementBottom(By locator) {

        WebElement webElement = locateElement(locator);

        ((JavascriptExecutor) driver).executeScript("arguments[0].scrollIntoView(true);", webElement);

    }

e2e/src/test/java/org/apache/dolphinscheduler/data/project/CreateProjectData.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package org.apache.dolphinscheduler.data.project; 


public class CreateProjectData {

    // create project name

    public static final String PROJECT_NAME = "selenium_project_3";

    public static final String PROJECT_NAME = "selenium_project_1";

    // create project description

    public static final String DESCRIPTION = "test create project description";

    // project page title