http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java index c793fa4..030ddeb 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/AbstractZeppelinIT.java @@ -17,12 +17,14 @@ package org.apache.zeppelin; + import com.google.common.base.Function; -import java.io.File; -import java.util.concurrent.TimeUnit; import org.apache.commons.codec.binary.Base64; import org.apache.commons.io.FileUtils; import org.openqa.selenium.*; +import org.openqa.selenium.logging.LogEntries; +import org.openqa.selenium.logging.LogEntry; +import org.openqa.selenium.logging.LogType; import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.FluentWait; import org.openqa.selenium.support.ui.Wait; @@ -30,36 +32,33 @@ import org.openqa.selenium.support.ui.WebDriverWait; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public abstract class AbstractZeppelinIT { +import java.io.File; +import java.util.Date; +import java.util.concurrent.TimeUnit; + +abstract public class AbstractZeppelinIT { protected static WebDriver driver; - protected static final Logger LOG = LoggerFactory.getLogger(AbstractZeppelinIT.class); + protected final static Logger LOG = LoggerFactory.getLogger(AbstractZeppelinIT.class); protected static final long MIN_IMPLICIT_WAIT = 5; protected static final long MAX_IMPLICIT_WAIT = 30; protected static final long MAX_BROWSER_TIMEOUT_SEC = 30; protected static final long MAX_PARAGRAPH_TIMEOUT_SEC = 120; protected void setTextOfParagraph(int paragraphNo, String text) { - String editorId = - driver - .findElement( - By.xpath(getParagraphXPath(paragraphNo) + "//div[contains(@class, 'editor')]")) - .getAttribute("id"); + String editorId = driver.findElement(By.xpath(getParagraphXPath(paragraphNo) + "//div[contains(@class, 'editor')]")).getAttribute("id"); if (driver instanceof JavascriptExecutor) { - ((JavascriptExecutor) driver) - .executeScript("ace.edit('" + editorId + "'). setValue('" + text + "')"); + ((JavascriptExecutor) driver).executeScript("ace.edit('" + editorId + "'). setValue('" + text + "')"); } else { throw new IllegalStateException("This driver does not support JavaScript!"); } } protected void runParagraph(int paragraphNo) { - driver - .findElement( - By.xpath(getParagraphXPath(paragraphNo) + "//span[@class='icon-control-play']")) - .click(); + driver.findElement(By.xpath(getParagraphXPath(paragraphNo) + "//span[@class='icon-control-play']")).click(); } + protected String getParagraphXPath(int paragraphNo) { return "(//div[@ng-controller=\"ParagraphCtrl\"])[" + paragraphNo + "]"; } @@ -69,19 +68,15 @@ public abstract class AbstractZeppelinIT { } protected boolean waitForParagraph(final int paragraphNo, final String state) { - By locator = - By.xpath( - getParagraphXPath(paragraphNo) - + "//div[contains(@class, 'control')]//span[2][contains(.,'" - + state - + "')]"); + By locator = By.xpath(getParagraphXPath(paragraphNo) + + "//div[contains(@class, 'control')]//span[2][contains(.,'" + state + "')]"); WebElement element = pollingWait(locator, MAX_PARAGRAPH_TIMEOUT_SEC); return element.isDisplayed(); } protected String getParagraphStatus(final int paragraphNo) { - By locator = - By.xpath(getParagraphXPath(paragraphNo) + "//div[contains(@class, 'control')]/span[2]"); + By locator = By.xpath(getParagraphXPath(paragraphNo) + + "//div[contains(@class, 'control')]/span[2]"); return driver.findElement(locator).getText(); } @@ -96,24 +91,21 @@ public abstract class AbstractZeppelinIT { } protected WebElement pollingWait(final By locator, final long timeWait) { - Wait<WebDriver> wait = - new FluentWait<>(driver) - .withTimeout(timeWait, TimeUnit.SECONDS) - .pollingEvery(1, TimeUnit.SECONDS) - .ignoring(NoSuchElementException.class); - - return wait.until( - new Function<WebDriver, WebElement>() { - public WebElement apply(WebDriver driver) { - return driver.findElement(locator); - } - }); + Wait<WebDriver> wait = new FluentWait<>(driver) + .withTimeout(timeWait, TimeUnit.SECONDS) + .pollingEvery(1, TimeUnit.SECONDS) + .ignoring(NoSuchElementException.class); + + return wait.until(new Function<WebDriver, WebElement>() { + public WebElement apply(WebDriver driver) { + return driver.findElement(locator); + } + }); } protected void createNewNote() { - clickAndWait( - By.xpath( - "//div[contains(@class, \"col-md-4\")]/div/h5/a[contains(.,'Create new" + " note')]")); + clickAndWait(By.xpath("//div[contains(@class, \"col-md-4\")]/div/h5/a[contains(.,'Create new" + + " note')]")); WebDriverWait block = new WebDriverWait(driver, MAX_BROWSER_TIMEOUT_SEC); block.until(ExpectedConditions.visibilityOfElementLocated(By.id("noteCreateModal"))); @@ -123,18 +115,11 @@ public abstract class AbstractZeppelinIT { protected void deleteTestNotebook(final WebDriver driver) { WebDriverWait block = new WebDriverWait(driver, MAX_BROWSER_TIMEOUT_SEC); - driver - .findElement(By.xpath(".//*[@id='main']//button[@ng-click='moveNoteToTrash(note.id)']")) + driver.findElement(By.xpath(".//*[@id='main']//button[@ng-click='moveNoteToTrash(note.id)']")) .sendKeys(Keys.ENTER); - block.until( - ExpectedConditions.visibilityOfElementLocated( - By.xpath(".//*[@id='main']//button[@ng-click='moveNoteToTrash(note.id)']"))); - driver - .findElement( - By.xpath( - "//div[@class='modal-dialog'][contains(.,'This note will be moved to trash')]" - + "//div[@class='modal-footer']//button[contains(.,'OK')]")) - .click(); + block.until(ExpectedConditions.visibilityOfElementLocated(By.xpath(".//*[@id='main']//button[@ng-click='moveNoteToTrash(note.id)']"))); + driver.findElement(By.xpath("//div[@class='modal-dialog'][contains(.,'This note will be moved to trash')]" + + "//div[@class='modal-footer']//button[contains(.,'OK')]")).click(); ZeppelinITUtils.sleep(100, false); } @@ -146,9 +131,8 @@ public abstract class AbstractZeppelinIT { protected void handleException(String message, Exception e) throws Exception { LOG.error(message, e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - LOG.error( - "ScreenShot::\ndata:image/png;base64," - + new String(Base64.encodeBase64(FileUtils.readFileToByteArray(scrFile)))); + LOG.error("ScreenShot::\ndata:image/png;base64," + new String(Base64.encodeBase64(FileUtils.readFileToByteArray(scrFile)))); throw e; } + }
http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/CommandExecutor.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/CommandExecutor.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/CommandExecutor.java index 3f5275e..6a55f3e 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/CommandExecutor.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/CommandExecutor.java @@ -17,17 +17,18 @@ package org.apache.zeppelin; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class CommandExecutor { - public static final Logger LOG = LoggerFactory.getLogger(CommandExecutor.class); + public final static Logger LOG = LoggerFactory.getLogger(CommandExecutor.class); public enum IGNORE_ERRORS { TRUE, @@ -38,11 +39,7 @@ public class CommandExecutor { private static IGNORE_ERRORS DEFAULT_BEHAVIOUR_ON_ERRORS = IGNORE_ERRORS.TRUE; - public static Object executeCommandLocalHost( - String[] command, - boolean printToConsole, - ProcessData.Types_Of_Data type, - IGNORE_ERRORS ignore_errors) { + public static Object executeCommandLocalHost(String[] command, boolean printToConsole, ProcessData.Types_Of_Data type, IGNORE_ERRORS ignore_errors) { List<String> subCommandsAsList = new ArrayList<>(Arrays.asList(command)); String mergedCommand = StringUtils.join(subCommandsAsList, " "); @@ -60,20 +57,18 @@ public class CommandExecutor { Object output_of_process = data_of_process.getData(type); int exit_code = data_of_process.getExitCodeValue(); - if (!printToConsole) LOG.trace(output_of_process.toString()); - else LOG.debug(output_of_process.toString()); + if (!printToConsole) + LOG.trace(output_of_process.toString()); + else + LOG.debug(output_of_process.toString()); if (ignore_errors == IGNORE_ERRORS.FALSE && exit_code != NORMAL_EXIT) { - LOG.error( - String.format( - "*********************Command '%s' failed with exitcode %s *********************", - mergedCommand, exit_code)); + LOG.error(String.format("*********************Command '%s' failed with exitcode %s *********************", mergedCommand, exit_code)); } return output_of_process; } - public static Object executeCommandLocalHost( - String command, boolean printToConsole, ProcessData.Types_Of_Data type) { - return executeCommandLocalHost( - new String[] {"bash", "-c", command}, printToConsole, type, DEFAULT_BEHAVIOUR_ON_ERRORS); + public static Object executeCommandLocalHost(String command, boolean printToConsole, ProcessData.Types_Of_Data type) { + return executeCommandLocalHost(new String[]{"bash", "-c", command}, printToConsole, type, DEFAULT_BEHAVIOUR_ON_ERRORS); } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/ProcessData.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/ProcessData.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/ProcessData.java index 325298e..2a05b1f 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/ProcessData.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/ProcessData.java @@ -17,6 +17,7 @@ package org.apache.zeppelin; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -36,14 +37,13 @@ public class ProcessData { PROCESS_DATA_OBJECT } - public static final Logger LOG = LoggerFactory.getLogger(ProcessData.class); + public final static Logger LOG = LoggerFactory.getLogger(ProcessData.class); private Process checked_process; private boolean printToConsole = false; private boolean removeRedundantOutput = true; - public ProcessData( - Process connected_process, boolean printToConsole, int silenceTimeout, TimeUnit timeUnit) { + public ProcessData(Process connected_process, boolean printToConsole, int silenceTimeout, TimeUnit timeUnit) { this.checked_process = connected_process; this.printToConsole = printToConsole; this.silenceTimeout = TimeUnit.MILLISECONDS.convert(silenceTimeout, timeUnit); @@ -65,6 +65,7 @@ public class ProcessData { this.printToConsole = true; } + boolean returnCodeRetrieved = false; private String outPutStream = null; @@ -83,33 +84,27 @@ public class ProcessData { } public Object getData(Types_Of_Data type) { - // TODO get rid of Pseudo-terminal will not be allocated because stdin is not a terminal. + //TODO get rid of Pseudo-terminal will not be allocated because stdin is not a terminal. switch (type) { - case OUTPUT: - { - return this.getOutPutStream(); - } - case ERROR: - { - return this.getErrorStream(); - } - case EXIT_CODE: - { - return this.getExitCodeValue(); - } - case STREAMS_MERGED: - { - return this.getOutPutStream() + "\n" + this.getErrorStream(); - } - case PROCESS_DATA_OBJECT: - { - this.getErrorStream(); - return this; - } - default: - { - throw new IllegalArgumentException("Data Type " + type + " not supported yet!"); - } + case OUTPUT: { + return this.getOutPutStream(); + } + case ERROR: { + return this.getErrorStream(); + } + case EXIT_CODE: { + return this.getExitCodeValue(); + } + case STREAMS_MERGED: { + return this.getOutPutStream() + "\n" + this.getErrorStream(); + } + case PROCESS_DATA_OBJECT: { + this.getErrorStream(); + return this; + } + default: { + throw new IllegalArgumentException("Data Type " + type + " not supported yet!"); + } } } @@ -122,8 +117,7 @@ public class ProcessData { this.checked_process.destroy(); } } catch (Exception inter) { - throw new RuntimeException( - "Couldn't finish waiting for process " + this.checked_process + " termination", inter); + throw new RuntimeException("Couldn't finish waiting for process " + this.checked_process + " termination", inter); } return this.returnCode; } @@ -133,17 +127,12 @@ public class ProcessData { try { buildOutputAndErrorStreamData(); } catch (Exception e) { - throw new RuntimeException( - "Couldn't retrieve Output Stream data from process: " + this.checked_process.toString(), - e); + throw new RuntimeException("Couldn't retrieve Output Stream data from process: " + this.checked_process.toString(), e); + } } - this.outPutStream = - this.outPutStream.replace( - "Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); - this.errorStream = - this.errorStream.replace( - "Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); + this.outPutStream = this.outPutStream.replace("Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); + this.errorStream = this.errorStream.replace("Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); return this.outPutStream; } @@ -152,17 +141,12 @@ public class ProcessData { try { buildOutputAndErrorStreamData(); } catch (Exception e) { - throw new RuntimeException( - "Couldn't retrieve Error Stream data from process: " + this.checked_process.toString(), - e); + throw new RuntimeException("Couldn't retrieve Error Stream data from process: " + this.checked_process.toString(), e); + } } - this.outPutStream = - this.outPutStream.replace( - "Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); - this.errorStream = - this.errorStream.replace( - "Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); + this.outPutStream = this.outPutStream.replace("Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); + this.errorStream = this.errorStream.replace("Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); return this.errorStream; } @@ -183,58 +167,35 @@ public class ProcessData { InputStream inErrors = this.checked_process.getErrorStream(); BufferedReader inReader = new BufferedReader(new InputStreamReader(in)); BufferedReader inReaderErrors = new BufferedReader(new InputStreamReader(inErrors)); - LOG.trace( - "Started retrieving data from streams of attached process: " + this.checked_process); + LOG.trace("Started retrieving data from streams of attached process: " + this.checked_process); - long lastStreamDataTime = - System - .currentTimeMillis(); // Store start time to be able to finish method if command hangs - long unconditionalExitTime = - System.currentTimeMillis() - + TimeUnit.MILLISECONDS.convert( - unconditionalExitDelayMinutes, - TimeUnit - .MINUTES); // Stop after 'unconditionalExitDelayMinutes' even if process is - // alive and sending output + long lastStreamDataTime = System.currentTimeMillis(); //Store start time to be able to finish method if command hangs + long unconditionalExitTime = System.currentTimeMillis() + TimeUnit.MILLISECONDS.convert(unconditionalExitDelayMinutes, TimeUnit.MINUTES); // Stop after 'unconditionalExitDelayMinutes' even if process is alive and sending output final int BUFFER_LEN = 300; - char charBuffer[] = - new char[BUFFER_LEN]; // Use char buffer to read output, size can be tuned. - boolean outputProduced = true; // Flag to check if previous iteration produced any output - while (isRunning(this.checked_process) - || outputProduced) { // Continue if process is alive or some output was produced on - // previous iteration and there may be still some data to read. + char charBuffer[] = new char[BUFFER_LEN]; //Use char buffer to read output, size can be tuned. + boolean outputProduced = true; //Flag to check if previous iteration produced any output + while (isRunning(this.checked_process) || outputProduced) { //Continue if process is alive or some output was produced on previous iteration and there may be still some data to read. outputProduced = false; - ZeppelinITUtils.sleep( - 100, - false); // Some local commands can exit fast, but immediate stream reading will give no - // output and after iteration, 'while' condition will be false so we will not - // read out any output while it is still there, just need to wait for some time - // for it to appear in streams. + ZeppelinITUtils.sleep(100, false); //Some local commands can exit fast, but immediate stream reading will give no output and after iteration, 'while' condition will be false so we will not read out any output while it is still there, just need to wait for some time for it to appear in streams. StringBuilder tempSB = new StringBuilder(); while (inReader.ready()) { - tempSB.setLength(0); // clean temporary StringBuilder - int readCount = - inReader.read(charBuffer, 0, BUFFER_LEN); // read up to 'BUFFER_LEN' chars to buffer - if (readCount < 1) { // if nothing read or error occurred + tempSB.setLength(0); // clean temporary StringBuilder + int readCount = inReader.read(charBuffer, 0, BUFFER_LEN); //read up to 'BUFFER_LEN' chars to buffer + if (readCount < 1) { // if nothing read or error occurred break; } tempSB.append(charBuffer, 0, readCount); sbInStream.append(tempSB); if (tempSB.length() > 0) { - outputProduced = - true; // set flag to know that we read something and there may be moire data, even - // if process already exited + outputProduced = true; //set flag to know that we read something and there may be moire data, even if process already exited } - lastStreamDataTime = - System - .currentTimeMillis(); // remember last time data was read from streams to be sure - // we are not looping infinitely + lastStreamDataTime = System.currentTimeMillis(); //remember last time data was read from streams to be sure we are not looping infinitely } - tempSB = new StringBuilder(); // Same, but for error stream + tempSB = new StringBuilder(); //Same, but for error stream while (inReaderErrors.ready()) { tempSB.setLength(0); int readCount = inReaderErrors.read(charBuffer, 0, BUFFER_LEN); @@ -246,11 +207,8 @@ public class ProcessData { if (tempSB.length() > 0) { outputProduced = true; String temp = new String(tempSB); - temp = - temp.replaceAll( - "Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); - // TODO : error stream output need to be improved, because it outputs downloading - // information. + temp = temp.replaceAll("Pseudo-terminal will not be allocated because stdin is not a terminal.", ""); + //TODO : error stream output need to be improved, because it outputs downloading information. if (printToConsole) { if (!temp.trim().equals("")) { if (temp.toLowerCase().contains("error") || temp.toLowerCase().contains("failed")) { @@ -264,29 +222,22 @@ public class ProcessData { lastStreamDataTime = System.currentTimeMillis(); } - if ((System.currentTimeMillis() - lastStreamDataTime > silenceTimeout) - || // Exit if silenceTimeout ms has passed from last stream read. Means process is alive - // but not sending any data. - (System.currentTimeMillis() - > unconditionalExitTime)) { // Exit unconditionally - guards against alive process - // continuously sending data. - LOG.info( - "Conditions: " - + (System.currentTimeMillis() - lastStreamDataTime > silenceTimeout) - + " " - + (System.currentTimeMillis() > unconditionalExitTime)); + + if ((System.currentTimeMillis() - lastStreamDataTime > silenceTimeout) || //Exit if silenceTimeout ms has passed from last stream read. Means process is alive but not sending any data. + (System.currentTimeMillis() > unconditionalExitTime)) { //Exit unconditionally - guards against alive process continuously sending data. + LOG.info("Conditions: " + (System.currentTimeMillis() - lastStreamDataTime > silenceTimeout) + " " + + (System.currentTimeMillis() > unconditionalExitTime)); this.checked_process.destroy(); try { if ((System.currentTimeMillis() > unconditionalExitTime)) { LOG.error( "!@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@Unconditional exit occured@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@!\nsome process hag up for more than " - + unconditionalExitDelayMinutes - + " minutes."); + + unconditionalExitDelayMinutes + " minutes."); } LOG.error("!##################################!"); StringWriter sw = new StringWriter(); Exception e = new Exception("Exited from buildOutputAndErrorStreamData by timeout"); - e.printStackTrace(new PrintWriter(sw)); // Get stack trace + e.printStackTrace(new PrintWriter(sw)); //Get stack trace LOG.error(String.valueOf(e), e); } catch (Exception ignore) { LOG.info("Exception in ProcessData while buildOutputAndErrorStreamData ", ignore); http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/WebDriverManager.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/WebDriverManager.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/WebDriverManager.java index 969cb06..768113f 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/WebDriverManager.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/WebDriverManager.java @@ -43,9 +43,10 @@ import org.rauschig.jarchivelib.ArchiverFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public class WebDriverManager { - public static final Logger LOG = LoggerFactory.getLogger(WebDriverManager.class); + public final static Logger LOG = LoggerFactory.getLogger(WebDriverManager.class); private static String downLoadsDir = ""; @@ -81,8 +82,7 @@ public class WebDriverManager { profile.setPreference("app.update.enabled", false); profile.setPreference("dom.max_script_run_time", 0); profile.setPreference("dom.max_chrome_script_run_time", 0); - profile.setPreference( - "browser.helperApps.neverAsk.saveToDisk", + profile.setPreference("browser.helperApps.neverAsk.saveToDisk", "application/x-ustar,application/octet-stream,application/zip,text/csv,text/plain"); profile.setPreference("network.proxy.type", 0); @@ -123,24 +123,20 @@ public class WebDriverManager { long start = System.currentTimeMillis(); boolean loaded = false; - driver - .manage() - .timeouts() - .implicitlyWait(AbstractZeppelinIT.MAX_IMPLICIT_WAIT, TimeUnit.SECONDS); + driver.manage().timeouts().implicitlyWait(AbstractZeppelinIT.MAX_IMPLICIT_WAIT, + TimeUnit.SECONDS); driver.get(url); while (System.currentTimeMillis() - start < 60 * 1000) { // wait for page load try { - (new WebDriverWait(driver, 30)) - .until( - new ExpectedCondition<Boolean>() { - @Override - public Boolean apply(WebDriver d) { - return d.findElement(By.xpath("//i[@uib-tooltip='WebSocket Connected']")) - .isDisplayed(); - } - }); + (new WebDriverWait(driver, 30)).until(new ExpectedCondition<Boolean>() { + @Override + public Boolean apply(WebDriver d) { + return d.findElement(By.xpath("//i[@uib-tooltip='WebSocket Connected']")) + .isDisplayed(); + } + }); loaded = true; break; } catch (TimeoutException e) { @@ -159,11 +155,8 @@ public class WebDriverManager { public static void downloadGeekoDriver(int firefoxVersion, String tempPath) { String geekoDriverUrlString = - "https://github.com/mozilla/geckodriver/releases/download/v"; - + GECKODRIVER_VERSION - + "/geckodriver-v" - + GECKODRIVER_VERSION - + "-"; + "https://github.com/mozilla/geckodriver/releases/download/v"; + GECKODRIVER_VERSION + + "/geckodriver-v" + GECKODRIVER_VERSION + "-"; LOG.info("Geeko version: " + firefoxVersion + ", will be downloaded to " + tempPath); try { @@ -210,12 +203,10 @@ public class WebDriverManager { if (System.getProperty("os.name").startsWith("Mac OS")) { firefoxVersionCmd = "/Applications/Firefox.app/Contents/MacOS/" + firefoxVersionCmd; } - String versionString = - (String) - CommandExecutor.executeCommandLocalHost( - firefoxVersionCmd, false, ProcessData.Types_Of_Data.OUTPUT); - return Integer.valueOf( - versionString.replaceAll("Mozilla Firefox", "").trim().substring(0, 2)); + String versionString = (String) CommandExecutor + .executeCommandLocalHost(firefoxVersionCmd, false, ProcessData.Types_Of_Data.OUTPUT); + return Integer + .valueOf(versionString.replaceAll("Mozilla Firefox", "").trim().substring(0, 2)); } catch (Exception e) { LOG.error("Exception in WebDriverManager while getWebDriver ", e); return -1; http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/ZeppelinITUtils.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/ZeppelinITUtils.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/ZeppelinITUtils.java index 5af44f1..402a18d 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/ZeppelinITUtils.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/ZeppelinITUtils.java @@ -17,14 +17,15 @@ package org.apache.zeppelin; -import java.util.concurrent.TimeUnit; -import org.openqa.selenium.WebDriver; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.openqa.selenium.WebDriver; +import java.util.concurrent.TimeUnit; public class ZeppelinITUtils { - public static final Logger LOG = LoggerFactory.getLogger(ZeppelinITUtils.class); + public final static Logger LOG = LoggerFactory.getLogger(ZeppelinITUtils.class); public static void sleep(long millis, boolean logOutput) { if (logOutput) { @@ -42,9 +43,9 @@ public class ZeppelinITUtils { } public static void restartZeppelin() { - CommandExecutor.executeCommandLocalHost( - "../bin/zeppelin-daemon.sh restart", false, ProcessData.Types_Of_Data.OUTPUT); - // wait for server to start. + CommandExecutor.executeCommandLocalHost("../bin/zeppelin-daemon.sh restart", + false, ProcessData.Types_Of_Data.OUTPUT); + //wait for server to start. sleep(5000, false); } @@ -53,9 +54,7 @@ public class ZeppelinITUtils { } public static void turnOnImplicitWaits(WebDriver driver) { - driver - .manage() - .timeouts() - .implicitlyWait(AbstractZeppelinIT.MAX_IMPLICIT_WAIT, TimeUnit.SECONDS); + driver.manage().timeouts().implicitlyWait(AbstractZeppelinIT.MAX_IMPLICIT_WAIT, + TimeUnit.SECONDS); } } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java index 0d748d3..ea6ad69 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/AuthenticationIT.java @@ -42,42 +42,44 @@ import org.openqa.selenium.WebElement; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -/** Created for org.apache.zeppelin.integration on 13/06/16. */ + +/** + * Created for org.apache.zeppelin.integration on 13/06/16. + */ public class AuthenticationIT extends AbstractZeppelinIT { private static final Logger LOG = LoggerFactory.getLogger(AuthenticationIT.class); - @Rule public ErrorCollector collector = new ErrorCollector(); + @Rule + public ErrorCollector collector = new ErrorCollector(); static String shiroPath; - static String authShiro = - "[users]\n" - + "admin = password1, admin\n" - + "finance1 = finance1, finance\n" - + "finance2 = finance2, finance\n" - + "hr1 = hr1, hr\n" - + "hr2 = hr2, hr\n" - + "[main]\n" - + "sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager\n" - + "securityManager.sessionManager = $sessionManager\n" - + "securityManager.sessionManager.globalSessionTimeout = 86400000\n" - + "shiro.loginUrl = /api/login\n" - + "anyofrolesuser = org.apache.zeppelin.utils.AnyOfRolesUserAuthorizationFilter\n" - + "[roles]\n" - + "admin = *\n" - + "hr = *\n" - + "finance = *\n" - + "[urls]\n" - + "/api/version = anon\n" - + "/api/interpreter/** = authc, anyofrolesuser[admin, finance]\n" - + "/** = authc"; + static String authShiro = "[users]\n" + + "admin = password1, admin\n" + + "finance1 = finance1, finance\n" + + "finance2 = finance2, finance\n" + + "hr1 = hr1, hr\n" + + "hr2 = hr2, hr\n" + + "[main]\n" + + "sessionManager = org.apache.shiro.web.session.mgt.DefaultWebSessionManager\n" + + "securityManager.sessionManager = $sessionManager\n" + + "securityManager.sessionManager.globalSessionTimeout = 86400000\n" + + "shiro.loginUrl = /api/login\n" + + "anyofrolesuser = org.apache.zeppelin.utils.AnyOfRolesUserAuthorizationFilter\n" + + "[roles]\n" + + "admin = *\n" + + "hr = *\n" + + "finance = *\n" + + "[urls]\n" + + "/api/version = anon\n" + + "/api/interpreter/** = authc, anyofrolesuser[admin, finance]\n" + + "/** = authc"; static String originalShiro = ""; + @BeforeClass public static void startUp() { try { - System.setProperty( - ZeppelinConfiguration.ConfVars.ZEPPELIN_HOME.getVarName(), - new File("../").getAbsolutePath()); + System.setProperty(ZeppelinConfiguration.ConfVars.ZEPPELIN_HOME.getVarName(), new File("../").getAbsolutePath()); ZeppelinConfiguration conf = ZeppelinConfiguration.create(); shiroPath = conf.getRelativeDir(String.format("%s/shiro.ini", conf.getConfDir())); File file = new File(shiroPath); @@ -92,6 +94,7 @@ public class AuthenticationIT extends AbstractZeppelinIT { driver = WebDriverManager.getWebDriver(); } + @AfterClass public static void tearDown() { try { @@ -111,33 +114,26 @@ public class AuthenticationIT extends AbstractZeppelinIT { } public void authenticationUser(String userName, String password) { - pollingWait( - By.xpath("//div[contains(@class, 'navbar-collapse')]//li//button[contains(.,'Login')]"), - MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath( + "//div[contains(@class, 'navbar-collapse')]//li//button[contains(.,'Login')]"), + MAX_BROWSER_TIMEOUT_SEC).click(); ZeppelinITUtils.sleep(1000, false); pollingWait(By.xpath("//*[@id='userName']"), MAX_BROWSER_TIMEOUT_SEC).sendKeys(userName); pollingWait(By.xpath("//*[@id='password']"), MAX_BROWSER_TIMEOUT_SEC).sendKeys(password); - pollingWait( - By.xpath("//*[@id='loginModalContent']//button[contains(.,'Login')]"), - MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath("//*[@id='loginModalContent']//button[contains(.,'Login')]"), + MAX_BROWSER_TIMEOUT_SEC).click(); ZeppelinITUtils.sleep(1000, false); } private void testShowNotebookListOnNavbar() throws Exception { try { - pollingWait( - By.xpath("//li[@class='dropdown notebook-list-dropdown']"), MAX_BROWSER_TIMEOUT_SEC) - .click(); - assertTrue( - driver.findElements(By.xpath("//a[@class=\"notebook-list-item ng-scope\"]")).size() > 0); - pollingWait( - By.xpath("//li[@class='dropdown notebook-list-dropdown']"), MAX_BROWSER_TIMEOUT_SEC) - .click(); - pollingWait( - By.xpath("//li[@class='dropdown notebook-list-dropdown']"), MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath("//li[@class='dropdown notebook-list-dropdown']"), + MAX_BROWSER_TIMEOUT_SEC).click(); + assertTrue(driver.findElements(By.xpath("//a[@class=\"notebook-list-item ng-scope\"]")).size() > 0); + pollingWait(By.xpath("//li[@class='dropdown notebook-list-dropdown']"), + MAX_BROWSER_TIMEOUT_SEC).click(); + pollingWait(By.xpath("//li[@class='dropdown notebook-list-dropdown']"), + MAX_BROWSER_TIMEOUT_SEC).click(); } catch (Exception e) { handleException("Exception in ParagraphActionsIT while testShowNotebookListOnNavbar ", e); } @@ -145,28 +141,15 @@ public class AuthenticationIT extends AbstractZeppelinIT { public void logoutUser(String userName) throws URISyntaxException { ZeppelinITUtils.sleep(500, false); - driver - .findElement( - By.xpath( - "//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + userName + "')]")) - .click(); + driver.findElement(By.xpath("//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + + userName + "')]")).click(); ZeppelinITUtils.sleep(500, false); - driver - .findElement( - By.xpath( - "//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" - + userName - + "')]//a[@ng-click='navbar.logout()']")) - .click(); + driver.findElement(By.xpath("//div[contains(@class, 'navbar-collapse')]//li[contains(.,'" + + userName + "')]//a[@ng-click='navbar.logout()']")).click(); ZeppelinITUtils.sleep(2000, false); - if (driver - .findElement( - By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")) + if (driver.findElement(By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")) .isDisplayed()) { - driver - .findElement( - By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")) - .click(); + driver.findElement(By.xpath("//*[@id='loginModal']//div[contains(@class, 'modal-header')]/button")).click(); } driver.get(new URI(driver.getCurrentUrl()).resolve("/#/").toString()); ZeppelinITUtils.sleep(500, false); @@ -178,11 +161,9 @@ public class AuthenticationIT extends AbstractZeppelinIT { AuthenticationIT authenticationIT = new AuthenticationIT(); authenticationIT.authenticationUser("admin", "password1"); - collector.checkThat( - "Check is user logged in", - true, - CoreMatchers.equalTo( - driver.findElement(By.partialLinkText("Create new note")).isDisplayed())); + collector.checkThat("Check is user logged in", true, + CoreMatchers.equalTo(driver.findElement(By.partialLinkText("Create new note")) + .isDisplayed())); authenticationIT.logoutUser("admin"); } catch (Exception e) { @@ -196,55 +177,43 @@ public class AuthenticationIT extends AbstractZeppelinIT { AuthenticationIT authenticationIT = new AuthenticationIT(); authenticationIT.authenticationUser("admin", "password1"); - pollingWait( - By.xpath("//div/button[contains(@class, 'nav-btn dropdown-toggle ng-scope')]"), - MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath("//div/button[contains(@class, 'nav-btn dropdown-toggle ng-scope')]"), + MAX_BROWSER_TIMEOUT_SEC).click(); clickAndWait(By.xpath("//li/a[contains(@href, '#/interpreter')]")); - collector.checkThat( - "Check is user has permission to view this page", - true, - CoreMatchers.equalTo( - pollingWait(By.xpath("//div[@id='main']/div/div[2]"), MIN_IMPLICIT_WAIT) - .isDisplayed())); + collector.checkThat("Check is user has permission to view this page", true, + CoreMatchers.equalTo(pollingWait(By.xpath( + "//div[@id='main']/div/div[2]"), + MIN_IMPLICIT_WAIT).isDisplayed()) + ); authenticationIT.logoutUser("admin"); authenticationIT.authenticationUser("finance1", "finance1"); - pollingWait( - By.xpath("//div/button[contains(@class, 'nav-btn dropdown-toggle ng-scope')]"), - MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath("//div/button[contains(@class, 'nav-btn dropdown-toggle ng-scope')]"), + MAX_BROWSER_TIMEOUT_SEC).click(); clickAndWait(By.xpath("//li/a[contains(@href, '#/interpreter')]")); - collector.checkThat( - "Check is user has permission to view this page", - true, - CoreMatchers.equalTo( - pollingWait(By.xpath("//div[@id='main']/div/div[2]"), MIN_IMPLICIT_WAIT) - .isDisplayed())); - + collector.checkThat("Check is user has permission to view this page", true, + CoreMatchers.equalTo(pollingWait(By.xpath( + "//div[@id='main']/div/div[2]"), + MIN_IMPLICIT_WAIT).isDisplayed()) + ); + authenticationIT.logoutUser("finance1"); authenticationIT.authenticationUser("hr1", "hr1"); - pollingWait( - By.xpath("//div/button[contains(@class, 'nav-btn dropdown-toggle ng-scope')]"), - MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath("//div/button[contains(@class, 'nav-btn dropdown-toggle ng-scope')]"), + MAX_BROWSER_TIMEOUT_SEC).click(); clickAndWait(By.xpath("//li/a[contains(@href, '#/interpreter')]")); try { - collector.checkThat( - "Check is user has permission to view this page", - true, - CoreMatchers.equalTo( - pollingWait( - By.xpath("//li[contains(@class, 'ng-toast__message')]//span/span"), - MIN_IMPLICIT_WAIT) - .isDisplayed())); + collector.checkThat("Check is user has permission to view this page", + true, CoreMatchers.equalTo( + pollingWait(By.xpath("//li[contains(@class, 'ng-toast__message')]//span/span"), + MIN_IMPLICIT_WAIT).isDisplayed())); } catch (TimeoutException e) { throw new Exception("Expected ngToast not found", e); } @@ -264,94 +233,70 @@ public class AuthenticationIT extends AbstractZeppelinIT { String noteId = driver.getCurrentUrl().substring(driver.getCurrentUrl().lastIndexOf("/") + 1); - pollingWait(By.xpath("//span[@uib-tooltip='Note permissions']"), MAX_BROWSER_TIMEOUT_SEC) - .click(); - pollingWait( - By.xpath(".//*[@id='selectOwners']/following::span//input"), MAX_BROWSER_TIMEOUT_SEC) - .sendKeys("finance "); - pollingWait( - By.xpath(".//*[@id='selectReaders']/following::span//input"), MAX_BROWSER_TIMEOUT_SEC) - .sendKeys("finance "); - pollingWait( - By.xpath(".//*[@id='selectRunners']/following::span//input"), MAX_BROWSER_TIMEOUT_SEC) - .sendKeys("finance "); - pollingWait( - By.xpath(".//*[@id='selectWriters']/following::span//input"), MAX_BROWSER_TIMEOUT_SEC) - .sendKeys("finance "); + pollingWait(By.xpath("//span[@uib-tooltip='Note permissions']"), + MAX_BROWSER_TIMEOUT_SEC).click(); + pollingWait(By.xpath(".//*[@id='selectOwners']/following::span//input"), + MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance "); + pollingWait(By.xpath(".//*[@id='selectReaders']/following::span//input"), + MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance "); + pollingWait(By.xpath(".//*[@id='selectRunners']/following::span//input"), + MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance "); + pollingWait(By.xpath(".//*[@id='selectWriters']/following::span//input"), + MAX_BROWSER_TIMEOUT_SEC).sendKeys("finance "); pollingWait(By.xpath("//button[@ng-click='savePermissions()']"), MAX_BROWSER_TIMEOUT_SEC) .sendKeys(Keys.ENTER); - pollingWait( - By.xpath( - "//div[@class='modal-dialog'][contains(.,'Permissions Saved ')]" - + "//div[@class='modal-footer']//button[contains(.,'OK')]"), - MAX_BROWSER_TIMEOUT_SEC) - .click(); + pollingWait(By.xpath("//div[@class='modal-dialog'][contains(.,'Permissions Saved ')]" + + "//div[@class='modal-footer']//button[contains(.,'OK')]"), + MAX_BROWSER_TIMEOUT_SEC).click(); authenticationIT.logoutUser("finance1"); authenticationIT.authenticationUser("hr1", "hr1"); try { - WebElement element = - pollingWait( - By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), - MAX_BROWSER_TIMEOUT_SEC); - collector.checkThat( - "Check is user has permission to view this note link", - false, + WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), + MAX_BROWSER_TIMEOUT_SEC); + collector.checkThat("Check is user has permission to view this note link", false, CoreMatchers.equalTo(element.isDisplayed())); } catch (Exception e) { - // This should have failed, nothing to worry. + //This should have failed, nothing to worry. } driver.get(new URI(driver.getCurrentUrl()).resolve("/#/notebook/" + noteId).toString()); - List<WebElement> privilegesModal = - driver.findElements( - By.xpath( - "//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" - + "//div[contains(.,'Insufficient privileges')]")); - collector.checkThat( - "Check is user has permission to view this note", - 1, + List<WebElement> privilegesModal = driver.findElements( + By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" + + "//div[contains(.,'Insufficient privileges')]")); + collector.checkThat("Check is user has permission to view this note", 1, CoreMatchers.equalTo(privilegesModal.size())); - driver - .findElement( - By.xpath( - "//div[@class='modal-content'][contains(.,'Insufficient privileges')]" - + "//div[@class='modal-footer']//button[2]")) - .click(); + driver.findElement( + By.xpath("//div[@class='modal-content'][contains(.,'Insufficient privileges')]" + + "//div[@class='modal-footer']//button[2]")).click(); authenticationIT.logoutUser("hr1"); authenticationIT.authenticationUser("finance2", "finance2"); try { - WebElement element = - pollingWait( - By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), - MAX_BROWSER_TIMEOUT_SEC); - collector.checkThat( - "Check is user has permission to view this note link", - true, + WebElement element = pollingWait(By.xpath("//*[@id='notebook-names']//a[contains(@href, '" + noteId + "')]"), + MAX_BROWSER_TIMEOUT_SEC); + collector.checkThat("Check is user has permission to view this note link", true, CoreMatchers.equalTo(element.isDisplayed())); } catch (Exception e) { - // This should have failed, nothing to worry. + //This should have failed, nothing to worry. } driver.get(new URI(driver.getCurrentUrl()).resolve("/#/notebook/" + noteId).toString()); - privilegesModal = - driver.findElements( - By.xpath( - "//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" - + "//div[contains(.,'Insufficient privileges')]")); - collector.checkThat( - "Check is user has permission to view this note", - 0, + privilegesModal = driver.findElements( + By.xpath("//div[@class='modal-content']//div[@class='bootstrap-dialog-header']" + + "//div[contains(.,'Insufficient privileges')]")); + collector.checkThat("Check is user has permission to view this note", 0, CoreMatchers.equalTo(privilegesModal.size())); deleteTestNotebook(driver); authenticationIT.logoutUser("finance2"); + } catch (Exception e) { handleException("Exception in AuthenticationIT while testGroupPermission ", e); } } + } http://git-wip-us.apache.org/repos/asf/zeppelin/blob/0d746fa2/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterIT.java ---------------------------------------------------------------------- diff --git a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterIT.java b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterIT.java index 1561560..d2e31a0 100644 --- a/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterIT.java +++ b/zeppelin-integration/src/test/java/org/apache/zeppelin/integration/InterpreterIT.java @@ -34,7 +34,8 @@ import org.slf4j.LoggerFactory; public class InterpreterIT extends AbstractZeppelinIT { private static final Logger LOG = LoggerFactory.getLogger(InterpreterIT.class); - @Rule public ErrorCollector collector = new ErrorCollector(); + @Rule + public ErrorCollector collector = new ErrorCollector(); @Before public void startUp() { @@ -50,8 +51,7 @@ public class InterpreterIT extends AbstractZeppelinIT { public void testShowDescriptionOnInterpreterCreate() throws Exception { try { // navigate to interpreter page - WebElement settingButton = - driver.findElement(By.xpath("//button[@class='nav-btn dropdown-toggle ng-scope']")); + WebElement settingButton = driver.findElement(By.xpath("//button[@class='nav-btn dropdown-toggle ng-scope']")); settingButton.click(); WebElement interpreterLink = driver.findElement(By.xpath("//a[@href='#/interpreter']")); interpreterLink.click(); @@ -59,22 +59,15 @@ public class InterpreterIT extends AbstractZeppelinIT { WebElement createButton = driver.findElement(By.xpath("//button[contains(., 'Create')]")); createButton.click(); - Select select = - new Select( - driver.findElement(By.xpath("//select[@ng-change='newInterpreterGroupChange()']"))); + Select select = new Select(driver.findElement(By.xpath("//select[@ng-change='newInterpreterGroupChange()']"))); select.selectByVisibleText("spark"); - collector.checkThat( - "description of interpreter property is displayed", - driver - .findElement( - By.xpath("//tr/td[contains(text(), 'spark.app.name')]/following-sibling::td[3]")) - .getText(), + collector.checkThat("description of interpreter property is displayed", + driver.findElement(By.xpath("//tr/td[contains(text(), 'spark.app.name')]/following-sibling::td[3]")).getText(), CoreMatchers.equalTo("The name of spark application.")); } catch (Exception e) { - handleException( - "Exception in InterpreterIT while testShowDescriptionOnInterpreterCreate ", e); + handleException("Exception in InterpreterIT while testShowDescriptionOnInterpreterCreate ", e); } } }
