From 264297563980dbe79e6a3877041ac6927d1acc6d Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Wed, 10 Feb 2016 10:44:50 +0530 Subject: [PATCH 1/5] testSparkInterpreterDependencyLoading does not check for endToEndTestEnabled --- .../java/org/apache/zeppelin/ZeppelinIT.java | 95 +++++++++++-------- 1 file changed, 54 insertions(+), 41 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java index e9a56cc108d..f9bf020784d 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java @@ -202,46 +202,59 @@ public void testAngularDisplay() throws InterruptedException{ @Test public void testSparkInterpreterDependencyLoading() { - // navigate to interpreter page - WebElement interpreterLink = driver.findElement(By.linkText("Interpreter")); - interpreterLink.click(); - - // add new dependency to spark interpreter - WebElement sparkEditBtn = pollingWait(By.xpath("//div[h3[text()[contains(.,'spark')]]]//button[contains(.,'edit')]"), - MAX_BROWSER_TIMEOUT_SEC); - sparkEditBtn.click(); - WebElement depArtifact = driver.findElement(By.xpath("//input[@ng-model='setting.depArtifact']")); - String artifact = "org.apache.commons:commons-csv:1.1"; - depArtifact.sendKeys(artifact); - driver.findElement(By.xpath("//button[contains(.,'Save')]")).submit(); - driver.switchTo().alert().accept(); - - driver.navigate().back(); - createNewNote(); - - // wait for first paragraph's " READY " status text - waitForParagraph(1, "READY"); - - WebElement paragraph1Editor = driver.findElement(By.xpath(getParagraphXPath(1) + "//textarea")); - - paragraph1Editor.sendKeys("import org.apache.commons.csv.CSVFormat"); - paragraph1Editor.sendKeys(Keys.chord(Keys.SHIFT, Keys.ENTER)); - waitForParagraph(1, "FINISHED"); - - // check expected text - assertTrue(waitForText("import org.apache.commons.csv.CSVFormat", - By.xpath(getParagraphXPath(1) + "//div[starts-with(@id, 'p') and contains(@id, 'text')]/div"))); - - // reset dependency - interpreterLink.click(); - sparkEditBtn = pollingWait(By.xpath("//div[h3[text()[contains(.,'spark')]]]//button[contains(.,'edit')]"), - MAX_BROWSER_TIMEOUT_SEC); - sparkEditBtn.click(); - WebElement testDepRemoveBtn = driver.findElement(By.xpath("//tr[descendant::text()[contains(.,'" + - artifact + "')]]/td[3]/div")); - sleep(5000, true); - testDepRemoveBtn.click(); - driver.findElement(By.xpath("//button[contains(.,'Save')]")).submit(); - driver.switchTo().alert().accept(); + if (!endToEndTestEnabled()) { + return; + } + try { + // navigate to interpreter page + WebElement interpreterLink = driver.findElement(By.linkText("Interpreter")); + interpreterLink.click(); + + // add new dependency to spark interpreter + WebElement sparkEditBtn = pollingWait(By.xpath("//div[h3[text()[contains(.,'spark')]]]//button[contains(.,'edit')]"), + MAX_BROWSER_TIMEOUT_SEC); + sparkEditBtn.click(); + WebElement depArtifact = driver.findElement(By.xpath("//input[@ng-model='setting.depArtifact']")); + String artifact = "org.apache.commons:commons-csv:1.1"; + depArtifact.sendKeys(artifact); + driver.findElement(By.xpath("//button[contains(.,'Save')]")).submit(); + driver.switchTo().alert().accept(); + + driver.navigate().back(); + createNewNote(); + + // wait for first paragraph's " READY " status text + waitForParagraph(1, "READY"); + + WebElement paragraph1Editor = driver.findElement(By.xpath(getParagraphXPath(1) + "//textarea")); + + paragraph1Editor.sendKeys("import org.apache.commons.csv.CSVFormat"); + paragraph1Editor.sendKeys(Keys.chord(Keys.SHIFT, Keys.ENTER)); + waitForParagraph(1, "FINISHED"); + + // check expected text + assertTrue(waitForText("import org.apache.commons.csv.CSVFormat", + By.xpath(getParagraphXPath(1) + "//div[starts-with(@id, 'p') and contains(@id, 'text')]/div"))); + + //delete created notebook for cleanup. + deleteTestNotebook(driver); + sleep(1000, true); + + // reset dependency + interpreterLink.click(); + sparkEditBtn = pollingWait(By.xpath("//div[h3[text()[contains(.,'spark')]]]//button[contains(.,'edit')]"), + MAX_BROWSER_TIMEOUT_SEC); + sparkEditBtn.click(); + WebElement testDepRemoveBtn = driver.findElement(By.xpath("//tr[descendant::text()[contains(.,'" + + artifact + "')]]/td[3]/div")); + sleep(5000, true); + testDepRemoveBtn.click(); + driver.findElement(By.xpath("//button[contains(.,'Save')]")).submit(); + driver.switchTo().alert().accept(); + } catch (ElementNotVisibleException e) { + LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); + File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); + + } } } From 271445a29b81dd29013d6a54f16560ca5ae3a70b Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Thu, 11 Feb 2016 09:27:17 +0530 Subject: [PATCH 2/5] instead of "ElementNotVisibleException" it should catch all "Exception" and log it. --- .../src/test/java/org/apache/zeppelin/ZeppelinIT.java | 6 +++--- .../org/apache/zeppelin/integration/ParagraphActionsIT.java | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java index f9bf020784d..57a9168ba4b 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java @@ -193,7 +193,7 @@ public void testAngularDisplay() throws InterruptedException{ sleep(100, true); System.out.println("testCreateNotebook Test executed"); - } catch (ElementNotVisibleException e) { + } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); @@ -251,8 +251,8 @@ public void testSparkInterpreterDependencyLoading() { testDepRemoveBtn.click(); driver.findElement(By.xpath("//button[contains(.,'Save')]")).submit(); driver.switchTo().alert().accept(); - } catch (ElementNotVisibleException e) { - LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); + } catch (Exception e) { + LOG.error("Exception in ZeppelinIT while testSparkInterpreterDependencyLoading ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); } diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 23aaf6fa65c..58a81820240 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -111,7 +111,8 @@ public void testMoveUpAndDown() throws InterruptedException { ZeppelinITUtils.sleep(1000,false); deleteTestNotebook(driver); - } catch (ElementNotVisibleException e) { + } catch (Exception e) { + LOG.error("Exception in ParagraphActionsIT while testMoveUpAndDown ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); } @@ -149,7 +150,8 @@ public void testDisableParagraphRunButton() throws InterruptedException { deleteTestNotebook(driver); - } catch (ElementNotVisibleException e) { + } catch (Exception e) { + LOG.error("Exception in ParagraphActionsIT while testDisableParagraphRunButton ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); } From 98e8d0bcb96ccf6a9eaae73941dc7a5d78c10e2a Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Thu, 11 Feb 2016 11:17:42 +0530 Subject: [PATCH 3/5] throw e on exception, marking test as a failure. --- .../src/test/java/org/apache/zeppelin/ZeppelinIT.java | 9 +++++---- .../apache/zeppelin/integration/ParagraphActionsIT.java | 6 ++++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java index 57a9168ba4b..311c4e407e8 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java @@ -23,6 +23,7 @@ import org.openqa.selenium.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import scala.reflect.internal.Trees; import java.io.File; @@ -62,7 +63,7 @@ public void tearDown() { } @Test - public void testAngularDisplay() throws InterruptedException{ + public void testAngularDisplay() throws Exception { if (!endToEndTestEnabled()) { return; } @@ -196,12 +197,12 @@ public void testAngularDisplay() throws InterruptedException{ } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); - + throw new Exception("Error while executing testAngularDisplay", e); } } @Test - public void testSparkInterpreterDependencyLoading() { + public void testSparkInterpreterDependencyLoading() throws Exception { if (!endToEndTestEnabled()) { return; } @@ -254,7 +255,7 @@ public void testSparkInterpreterDependencyLoading() { } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testSparkInterpreterDependencyLoading ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - + throw new Exception("Error while executing testSparkInterpreterDependencyLoading", e); } } } diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 58a81820240..7ec3e018d45 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -58,7 +58,7 @@ public void tearDown() { } @Test - public void testMoveUpAndDown() throws InterruptedException { + public void testMoveUpAndDown() throws Exception { if (!endToEndTestEnabled()) { return; } @@ -114,12 +114,13 @@ public void testMoveUpAndDown() throws InterruptedException { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testMoveUpAndDown ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); + throw new Exception("Error while executing testMoveUpAndDown", e); } } @Test - public void testDisableParagraphRunButton() throws InterruptedException { + public void testDisableParagraphRunButton() throws Exception { if (!endToEndTestEnabled()) { return; } @@ -153,6 +154,7 @@ public void testDisableParagraphRunButton() throws InterruptedException { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testDisableParagraphRunButton ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); + throw new Exception("Error while executing testDisableParagraphRunButton", e); } } From 2d9aa986242beee4768c135810348700d26293b9 Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Fri, 12 Feb 2016 08:50:37 +0530 Subject: [PATCH 4/5] "throw e" --- .../src/test/java/org/apache/zeppelin/ZeppelinIT.java | 4 ++-- .../org/apache/zeppelin/integration/ParagraphActionsIT.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java index 311c4e407e8..ae775b29c81 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java @@ -197,7 +197,7 @@ public void testAngularDisplay() throws Exception { } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); - throw new Exception("Error while executing testAngularDisplay", e); + throw new Exception(e); } } @@ -255,7 +255,7 @@ public void testSparkInterpreterDependencyLoading() throws Exception { } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testSparkInterpreterDependencyLoading ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - throw new Exception("Error while executing testSparkInterpreterDependencyLoading", e); + throw new Exception(e); } } } diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 7ec3e018d45..01ef4fe7f76 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -114,7 +114,7 @@ public void testMoveUpAndDown() throws Exception { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testMoveUpAndDown ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - throw new Exception("Error while executing testMoveUpAndDown", e); + throw new Exception(e); } } @@ -154,7 +154,7 @@ public void testDisableParagraphRunButton() throws Exception { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testDisableParagraphRunButton ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - throw new Exception("Error while executing testDisableParagraphRunButton", e); + throw new Exception(e); } } From e31a3d09a33d9c22e5383e3a0c2f7a63ca609e3f Mon Sep 17 00:00:00 2001 From: Prabhjyot Singh Date: Fri, 12 Feb 2016 19:42:25 +0530 Subject: [PATCH 5/5] throw e; --- .../src/test/java/org/apache/zeppelin/ZeppelinIT.java | 4 ++-- .../org/apache/zeppelin/integration/ParagraphActionsIT.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java index ae775b29c81..d876b177f8a 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/ZeppelinIT.java @@ -197,7 +197,7 @@ public void testAngularDisplay() throws Exception { } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testAngularDisplay ", e); File scrFile = ((TakesScreenshot)driver).getScreenshotAs(OutputType.FILE); - throw new Exception(e); + throw e; } } @@ -255,7 +255,7 @@ public void testSparkInterpreterDependencyLoading() throws Exception { } catch (Exception e) { LOG.error("Exception in ZeppelinIT while testSparkInterpreterDependencyLoading ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - throw new Exception(e); + throw e; } } } diff --git a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java index 01ef4fe7f76..ddc7a4d7e2d 100644 --- a/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java +++ b/zeppelin-server/src/test/java/org/apache/zeppelin/integration/ParagraphActionsIT.java @@ -114,7 +114,7 @@ public void testMoveUpAndDown() throws Exception { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testMoveUpAndDown ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - throw new Exception(e); + throw e; } } @@ -154,7 +154,7 @@ public void testDisableParagraphRunButton() throws Exception { } catch (Exception e) { LOG.error("Exception in ParagraphActionsIT while testDisableParagraphRunButton ", e); File scrFile = ((TakesScreenshot) driver).getScreenshotAs(OutputType.FILE); - throw new Exception(e); + throw e; } }