Renamed e2e tests for junit code export slightly. Also fixed a bug where multiple waitForWindow util methods were getting emitted.

Author: David Haeffner

packages/code-export-java-junit/__test__/src/__snapshots__/index.spec.js.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Code Export Java Selenium should export a suite to JUnit code 1`] = `
+exports[`Code Export Java JUnit Selenium should export a suite 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -56,7 +56,7 @@ public class LoginTest {
 "
 `;
 
-exports[`Code Export Java Selenium should export a suite to JUnit code that uses control flow commands 1`] = `
+exports[`Code Export Java JUnit Selenium should export a suite that uses control flow commands 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -155,7 +155,64 @@ public class ControlflowTest {
 "
 `;
 
-exports[`Code Export Java Selenium should export a suite to JUnit code with commands that open a new window inside of a reused test method 1`] = `
+exports[`Code Export Java JUnit Selenium should export a suite with a reused test method 1`] = `
+"// Generated by Selenium IDE
+import org.junit.Test;
+import org.junit.Before;
+import org.junit.After;
+import static org.junit.Assert.*;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.core.IsNot.not;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.Dimension;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.interactions.Actions;
+import org.openqa.selenium.support.ui.ExpectedConditions;
+import org.openqa.selenium.support.ui.WebDriverWait;
+import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.Alert;
+import org.openqa.selenium.Keys;
+import java.util.*;
+public class LoginTest {
+  private WebDriver driver;
+  private Map<String, Object> vars;
+  JavascriptExecutor js;
+  @Before
+  public void setUp() {
+    driver = new FirefoxDriver();
+    js = (JavascriptExecutor) driver;
+    vars = new HashMap<String, Object>();
+  }
+  @After
+  public void tearDown() {
+    driver.quit();
+  }
+  public void login() {
+    driver.get(\\"https://the-internet.herokuapp.com/\\");
+    driver.findElement(By.linkText(\\"Form Authentication\\")).click();
+    driver.findElement(By.id(\\"username\\")).sendKeys(vars.get(\\"username\\").toString());
+    driver.findElement(By.id(\\"password\\")).sendKeys(vars.get(\\"password\\").toString());
+    driver.findElement(By.cssSelector(\\".fa\\")).click();
+  }
+  @Test
+  public void invalidcredentials() {
+    vars.put(\\"username\\", \\"blah\\");
+    vars.put(\\"password\\", \\"blah\\");
+    login();
+  }
+  @Test
+  public void validcredentials() {
+    vars.put(\\"username\\", \\"tomsmith\\");
+    vars.put(\\"password\\", \\"SuperSecretPassword!\\");
+    login();
+  }
+}
+"
+`;
+
+exports[`Code Export Java JUnit Selenium should export a suite with commands that open a new window inside of a reused test method 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -218,7 +275,7 @@ public class DefaultSuiteTest {
 "
 `;
 
-exports[`Code Export Java Selenium should export a suite to JUnit code with reused test method 1`] = `
+exports[`Code Export Java JUnit Selenium should export a suite with just one new window util method when there are multiple commands that open a new window 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -238,7 +295,7 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Keys;
 import java.util.*;
-public class LoginTest {
+public class DefaultSuiteTest {
   private WebDriver driver;
   private Map<String, Object> vars;
   JavascriptExecutor js;
@@ -252,30 +309,45 @@ public class LoginTest {
   public void tearDown() {
     driver.quit();
   }
-  public void login() {
-    driver.get(\\"https://the-internet.herokuapp.com/\\");
-    driver.findElement(By.linkText(\\"Form Authentication\\")).click();
-    driver.findElement(By.id(\\"username\\")).sendKeys(vars.get(\\"username\\").toString());
-    driver.findElement(By.id(\\"password\\")).sendKeys(vars.get(\\"password\\").toString());
-    driver.findElement(By.cssSelector(\\".fa\\")).click();
+  public String waitForWindow(int timeout) {
+    try {
+      Thread.sleep(timeout);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+    Set<String> whNow = driver.getWindowHandles();
+    Set<String> whThen = (Set<String>) vars.get(\\"window_handles\\");
+    if (whNow.size() > whThen.size()) {
+      whNow.removeAll(whThen);
+    }
+    return whNow.iterator().next();
+  }
+  public void selectwindow() {
+    driver.get(\\"http://the-internet.herokuapp.com/windows\\");
+    vars.put(\\"window_handles\\", driver.getWindowHandles());
+    driver.findElement(By.linkText(\\"Click Here\\")).click();
+    vars.put(\\"win9425\\", waitForWindow(2000));
+    driver.switchTo().window(vars.get(\\"win9425\\").toString());
+    assertThat(driver.getTitle(), is(\\"New Window\\"));
   }
   @Test
-  public void invalidcredentials() {
-    vars.put(\\"username\\", \\"blah\\");
-    vars.put(\\"password\\", \\"blah\\");
-    login();
+  public void reuse() {
+    selectwindow();
   }
   @Test
-  public void validcredentials() {
-    vars.put(\\"username\\", \\"tomsmith\\");
-    vars.put(\\"password\\", \\"SuperSecretPassword!\\");
-    login();
+  public void selectwindow() {
+    driver.get(\\"http://the-internet.herokuapp.com/windows\\");
+    vars.put(\\"window_handles\\", driver.getWindowHandles());
+    driver.findElement(By.linkText(\\"Click Here\\")).click();
+    vars.put(\\"win9425\\", waitForWindow(2000));
+    driver.switchTo().window(vars.get(\\"win9425\\").toString());
+    assertThat(driver.getTitle(), is(\\"New Window\\"));
   }
 }
 "
 `;
 
-exports[`Code Export Java Selenium should export a test to JUnit code 1`] = `
+exports[`Code Export Java JUnit Selenium should export a test 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -322,7 +394,7 @@ public class LoginTest {
 "
 `;
 
-exports[`Code Export Java Selenium should export a test to JUnit code with commands that open a new window 1`] = `
+exports[`Code Export Java JUnit Selenium should export a test with a reused test method 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -342,7 +414,7 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Keys;
 import java.util.*;
-public class SelectwindowTest {
+public class ValidcredentialsTest {
   private WebDriver driver;
   private Map<String, Object> vars;
   JavascriptExecutor js;
@@ -356,38 +428,24 @@ public class SelectwindowTest {
   public void tearDown() {
     driver.quit();
   }
-  public String waitForWindow(int timeout) {
-    try {
-      Thread.sleep(timeout);
-    } catch (InterruptedException e) {
-      e.printStackTrace();
-    }
-    Set<String> whNow = driver.getWindowHandles();
-    Set<String> whThen = (Set<String>) vars.get(\\"window_handles\\");
-    if (whNow.size() > whThen.size()) {
-      whNow.removeAll(whThen);
-    }
-    return whNow.iterator().next();
+  public void login() {
+    driver.get(\\"https://the-internet.herokuapp.com/\\");
+    driver.findElement(By.linkText(\\"Form Authentication\\")).click();
+    driver.findElement(By.id(\\"username\\")).sendKeys(vars.get(\\"username\\").toString());
+    driver.findElement(By.id(\\"password\\")).sendKeys(vars.get(\\"password\\").toString());
+    driver.findElement(By.cssSelector(\\".fa\\")).click();
   }
   @Test
-  public void selectwindow() {
-    driver.get(\\"http://the-internet.herokuapp.com/\\");
-    driver.manage().window().setSize(new Dimension(1260, 1027));
-    driver.findElement(By.linkText(\\"Multiple Windows\\")).click();
-    vars.put(\\"window_handles\\", driver.getWindowHandles());
-    driver.findElement(By.linkText(\\"Click Here\\")).click();
-    vars.put(\\"win9625\\", waitForWindow(2000));
-    vars.put(\\"root\\", driver.getWindowHandle());
-    driver.switchTo().window(vars.get(\\"win9625\\").toString());
-    assertThat(driver.getTitle(), is(\\"New Window\\"));
-    driver.switchTo().window(vars.get(\\"root\\").toString());
-    assertThat(driver.getTitle(), is(\\"The Internet\\"));
+  public void validcredentials() {
+    vars.put(\\"username\\", \\"tomsmith\\");
+    vars.put(\\"password\\", \\"SuperSecretPassword!\\");
+    login();
   }
 }
 "
 `;
 
-exports[`Code Export Java Selenium should export a test to JUnit code with reused test method 1`] = `
+exports[`Code Export Java JUnit Selenium should export a test with commands that open a new window 1`] = `
 "// Generated by Selenium IDE
 import org.junit.Test;
 import org.junit.Before;
@@ -407,7 +465,7 @@ import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.Keys;
 import java.util.*;
-public class ValidcredentialsTest {
+public class SelectwindowTest {
   private WebDriver driver;
   private Map<String, Object> vars;
   JavascriptExecutor js;
@@ -421,18 +479,32 @@ public class ValidcredentialsTest {
   public void tearDown() {
     driver.quit();
   }
-  public void login() {
-    driver.get(\\"https://the-internet.herokuapp.com/\\");
-    driver.findElement(By.linkText(\\"Form Authentication\\")).click();
-    driver.findElement(By.id(\\"username\\")).sendKeys(vars.get(\\"username\\").toString());
-    driver.findElement(By.id(\\"password\\")).sendKeys(vars.get(\\"password\\").toString());
-    driver.findElement(By.cssSelector(\\".fa\\")).click();
+  public String waitForWindow(int timeout) {
+    try {
+      Thread.sleep(timeout);
+    } catch (InterruptedException e) {
+      e.printStackTrace();
+    }
+    Set<String> whNow = driver.getWindowHandles();
+    Set<String> whThen = (Set<String>) vars.get(\\"window_handles\\");
+    if (whNow.size() > whThen.size()) {
+      whNow.removeAll(whThen);
+    }
+    return whNow.iterator().next();
   }
   @Test
-  public void validcredentials() {
-    vars.put(\\"username\\", \\"tomsmith\\");
-    vars.put(\\"password\\", \\"SuperSecretPassword!\\");
-    login();
+  public void selectwindow() {
+    driver.get(\\"http://the-internet.herokuapp.com/\\");
+    driver.manage().window().setSize(new Dimension(1260, 1027));
+    driver.findElement(By.linkText(\\"Multiple Windows\\")).click();
+    vars.put(\\"window_handles\\", driver.getWindowHandles());
+    driver.findElement(By.linkText(\\"Click Here\\")).click();
+    vars.put(\\"win9625\\", waitForWindow(2000));
+    vars.put(\\"root\\", driver.getWindowHandle());
+    driver.switchTo().window(vars.get(\\"win9625\\").toString());
+    assertThat(driver.getTitle(), is(\\"New Window\\"));
+    driver.switchTo().window(vars.get(\\"root\\").toString());
+    assertThat(driver.getTitle(), is(\\"The Internet\\"));
   }
 }
 "

packages/code-export-java-junit/__test__/src/index.spec.js

@@ -26,8 +26,8 @@ function readFile(filename) {
   )
 }
 
-describe('Code Export Java Selenium', () => {
-  it('should export a test to JUnit code', async () => {
+describe('Code Export Java JUnit Selenium', () => {
+  it('should export a test', async () => {
     const project = readFile('single-test.side')
     const results = await emitTest({
       baseUrl: project.url,
@@ -37,7 +37,7 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
-  it('should export a suite to JUnit code', async () => {
+  it('should export a suite', async () => {
     const project = normalizeProject(readFile('single-suite.side'))
     const results = await emitSuite({
       baseUrl: project.url,
@@ -47,7 +47,7 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
-  it('should export a test to JUnit code with reused test method', async () => {
+  it('should export a test with a reused test method', async () => {
     const project = normalizeProject(readFile('test-case-reuse.side'))
     const results = await emitTest({
       baseUrl: project.url,
@@ -57,7 +57,7 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
-  it('should export a test to JUnit code with commands that open a new window', async () => {
+  it('should export a test with commands that open a new window', async () => {
     const project = normalizeProject(readFile('select-window.side'))
     const results = await emitTest({
       baseUrl: project.url,
@@ -67,7 +67,7 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
-  it('should export a suite to JUnit code with reused test method', async () => {
+  it('should export a suite with a reused test method', async () => {
     const project = normalizeProject(readFile('test-case-reuse.side'))
     const results = await emitSuite({
       baseUrl: project.url,
@@ -77,7 +77,7 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
-  it('should export a suite to JUnit code that uses control flow commands', async () => {
+  it('should export a suite that uses control flow commands', async () => {
     const project = normalizeProject(readFile('control-flow-suite.side'))
     const results = await emitSuite({
       baseUrl: project.url,
@@ -87,7 +87,7 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
-  it('should export a suite to JUnit code with commands that open a new window inside of a reused test method', async () => {
+  it('should export a suite with commands that open a new window inside of a reused test method', async () => {
     const project = normalizeProject(readFile('nested-select-window.side'))
     const results = await emitSuite({
       baseUrl: project.url,
@@ -97,6 +97,16 @@ describe('Code Export Java Selenium', () => {
     expect(results.body).toBeDefined()
     expect(results.body).toMatchSnapshot()
   })
+  it('should export a suite with just one new window util method when there are multiple commands that open a new window', async () => {
+    const project = normalizeProject(readFile('nested-select-window-v2.side'))
+    const results = await emitSuite({
+      baseUrl: project.url,
+      suite: project.suites[0],
+      tests: project.tests,
+    })
+    expect(results.body).toBeDefined()
+    expect(results.body).toMatchSnapshot()
+  })
 })
 
 function normalizeProject(project) {