Developing selenium JUnit test runner

This commit is contained in:
Alexey Andreev 2015-10-07 19:16:11 +03:00
parent a4e41fc6be
commit 6f173003b3
10 changed files with 314 additions and 11 deletions

View File

@ -0,0 +1,46 @@
/*
* Copyright 2015 Alexey Andreev.
*
* Licensed 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.teavm.tooling;
import java.io.File;
/**
*
* @author Alexey Andreev
*/
public class TeaVMTestCase {
private File runtimeScript;
private File testScript;
private File debugTable;
public TeaVMTestCase(File runtimeScript, File testScript, File debugTable) {
this.runtimeScript = runtimeScript;
this.testScript = testScript;
this.debugTable = debugTable;
}
public File getRuntimeScript() {
return runtimeScript;
}
public File getTestScript() {
return testScript;
}
public File getDebugTable() {
return debugTable;
}
}

View File

@ -61,6 +61,7 @@ public class TeaVMTestTool {
private MethodNodeCache astCache; private MethodNodeCache astCache;
private ProgramCache programCache; private ProgramCache programCache;
private SourceFilesCopier sourceFilesCopier; private SourceFilesCopier sourceFilesCopier;
private List<TeaVMTestToolListener> listeners = new ArrayList<>();
public File getOutputDir() { public File getOutputDir() {
return outputDir; return outputDir;
@ -347,6 +348,7 @@ public class TeaVMTestTool {
for (ClassHolderTransformer transformer : transformers) { for (ClassHolderTransformer transformer : transformers) {
vm.add(transformer); vm.add(transformer);
} }
File file = new File(outputDir, targetName); File file = new File(outputDir, targetName);
DebugInformationBuilder debugInfoBuilder = sourceMapsGenerated || debugInformationGenerated DebugInformationBuilder debugInfoBuilder = sourceMapsGenerated || debugInformationGenerated
? new DebugInformationBuilder() : null; ? new DebugInformationBuilder() : null;
@ -376,12 +378,16 @@ public class TeaVMTestTool {
} }
} }
} }
if (sourceMapsGenerated) {
File debugTableFile = null;
if (debugInformationGenerated) {
DebugInformation debugInfo = debugInfoBuilder.getDebugInformation(); DebugInformation debugInfo = debugInfoBuilder.getDebugInformation();
try (OutputStream debugInfoOut = new FileOutputStream(new File(outputDir, targetName + ".teavmdbg"))) { debugTableFile = new File(outputDir, targetName + ".teavmdbg");
try (OutputStream debugInfoOut = new FileOutputStream(debugTableFile)) {
debugInfo.write(debugInfoOut); debugInfo.write(debugInfoOut);
} }
} }
if (sourceMapsGenerated) { if (sourceMapsGenerated) {
DebugInformation debugInfo = debugInfoBuilder.getDebugInformation(); DebugInformation debugInfo = debugInfoBuilder.getDebugInformation();
String sourceMapsFileName = targetName + ".map"; String sourceMapsFileName = targetName + ".map";
@ -393,6 +399,11 @@ public class TeaVMTestTool {
if (sourceFilesCopied && vm.getWrittenClasses() != null) { if (sourceFilesCopied && vm.getWrittenClasses() != null) {
sourceFilesCopier.addClasses(vm.getWrittenClasses()); sourceFilesCopier.addClasses(vm.getWrittenClasses());
} }
TeaVMTestCase testCase = new TeaVMTestCase(new File(outputDir, "res/runtime.js"), file, debugTableFile);
for (TeaVMTestToolListener listener : listeners) {
listener.testGenerated(testCase);
}
} }
private void escapeString(String string, Writer writer) throws IOException { private void escapeString(String string, Writer writer) throws IOException {
@ -422,4 +433,12 @@ public class TeaVMTestTool {
} }
writer.append('\"'); writer.append('\"');
} }
public void addListener(TeaVMTestToolListener listener) {
listeners.add(listener);
}
public void removeListener(TeaVMTestToolListener listener) {
listeners.remove(listener);
}
} }

View File

@ -0,0 +1,24 @@
/*
* Copyright 2015 Alexey Andreev.
*
* Licensed 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.teavm.tooling;
/**
*
* @author Alexey Andreev
*/
public interface TeaVMTestToolListener {
void testGenerated(TeaVMTestCase testCase);
}

15
pom.xml
View File

@ -69,7 +69,7 @@
<html4j.version>1.2</html4j.version> <html4j.version>1.2</html4j.version>
<jetty.version>9.2.1.v20140609</jetty.version> <jetty.version>9.2.1.v20140609</jetty.version>
<slf4j.version>1.7.7</slf4j.version> <slf4j.version>1.7.7</slf4j.version>
<checker.version>1.9.3</checker.version> <selenium.version>2.47.2</selenium.version>
</properties> </properties>
<modules> <modules>
@ -166,13 +166,16 @@
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version> <version>${slf4j.version}</version>
</dependency> </dependency>
<!--
<dependency> <dependency>
<groupId>org.checkerframework</groupId> <groupId>org.seleniumhq.selenium</groupId>
<artifactId>checker</artifactId> <artifactId>selenium-java</artifactId>
<version>${checker.version}</version> <version>${selenium.version}</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
<version>${selenium.version}</version>
</dependency> </dependency>
-->
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>

View File

@ -87,6 +87,7 @@
<java.util.Locale.available>en, en_US, en_GB, ru, ru_RU</java.util.Locale.available> <java.util.Locale.available>en, en_US, en_GB, ru, ru_RU</java.util.Locale.available>
</properties> </properties>
<incremental>${teavm.test.incremental}</incremental> <incremental>${teavm.test.incremental}</incremental>
<seleniumURL>http://127.0.0.1:4444/wd/hub</seleniumURL>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>

View File

@ -57,6 +57,16 @@
<groupId>commons-io</groupId> <groupId>commons-io</groupId>
<artifactId>commons-io</artifactId> <artifactId>commons-io</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-java</artifactId>
<version>2.47.2</version>
</dependency>
<dependency>
<groupId>org.seleniumhq.selenium</groupId>
<artifactId>selenium-remote-driver</artifactId>
<version>2.47.2</version>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

View File

@ -21,7 +21,12 @@ import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.MavenArtifactRepository; import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
@ -34,7 +39,12 @@ import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.RepositorySystem;
import org.teavm.model.ClassHolderTransformer; import org.teavm.model.ClassHolderTransformer;
import org.teavm.tooling.*; import org.teavm.tooling.ClassAlias;
import org.teavm.tooling.MethodAlias;
import org.teavm.tooling.RuntimeCopyOperation;
import org.teavm.tooling.SourceFileProvider;
import org.teavm.tooling.TeaVMTool;
import org.teavm.tooling.TeaVMToolException;
/** /**
* *
@ -149,6 +159,14 @@ public class BuildJavascriptMojo extends AbstractMojo {
this.mainPageIncluded = mainPageIncluded; this.mainPageIncluded = mainPageIncluded;
} }
public void setCompileScopes(List<String> compileScopes) {
this.compileScopes = compileScopes;
}
public void setMainClass(String mainClass) {
this.mainClass = mainClass;
}
public String[] getTransformers() { public String[] getTransformers() {
return transformers; return transformers;
} }

View File

@ -16,16 +16,28 @@
package org.teavm.maven; package org.teavm.maven;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Constructor; import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.net.URLClassLoader; import java.net.URLClassLoader;
import java.util.*; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.List;
import java.util.Properties;
import java.util.Set;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
import java.util.jar.JarEntry; import java.util.jar.JarEntry;
import java.util.jar.JarFile; import java.util.jar.JarFile;
import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.MavenArtifactRepository; import org.apache.maven.artifact.repository.MavenArtifactRepository;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
@ -38,10 +50,16 @@ import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope; import org.apache.maven.plugins.annotations.ResolutionScope;
import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem; import org.apache.maven.repository.RepositorySystem;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.remote.RemoteWebDriver;
import org.teavm.model.ClassHolderTransformer; import org.teavm.model.ClassHolderTransformer;
import org.teavm.testing.JUnitTestAdapter; import org.teavm.testing.JUnitTestAdapter;
import org.teavm.testing.TestAdapter; import org.teavm.testing.TestAdapter;
import org.teavm.tooling.SourceFileProvider; import org.teavm.tooling.SourceFileProvider;
import org.teavm.tooling.TeaVMTestCase;
import org.teavm.tooling.TeaVMTestTool; import org.teavm.tooling.TeaVMTestTool;
import org.teavm.tooling.TeaVMToolException; import org.teavm.tooling.TeaVMToolException;
@ -119,7 +137,13 @@ public class BuildJavascriptTestMojo extends AbstractMojo {
@Parameter @Parameter
private boolean sourceFilesCopied; private boolean sourceFilesCopied;
@Parameter
private URL seleniumURL;
private WebDriver webDriver;
private TeaVMTestTool tool = new TeaVMTestTool(); private TeaVMTestTool tool = new TeaVMTestTool();
private BlockingQueue<Runnable> seleniumTaskQueue = new LinkedBlockingQueue<>();
private volatile boolean seleniumStopped = false;
public void setProject(MavenProject project) { public void setProject(MavenProject project) {
this.project = project; this.project = project;
@ -197,6 +221,10 @@ public class BuildJavascriptTestMojo extends AbstractMojo {
this.sourceFilesCopied = sourceFilesCopied; this.sourceFilesCopied = sourceFilesCopied;
} }
public void setSeleniumURL(URL seleniumURL) {
this.seleniumURL = seleniumURL;
}
@Override @Override
public void execute() throws MojoExecutionException, MojoFailureException { public void execute() throws MojoExecutionException, MojoFailureException {
if (System.getProperty("maven.test.skip", "false").equals("true") || if (System.getProperty("maven.test.skip", "false").equals("true") ||
@ -204,6 +232,8 @@ public class BuildJavascriptTestMojo extends AbstractMojo {
getLog().info("Tests build skipped as specified by system property"); getLog().info("Tests build skipped as specified by system property");
return; return;
} }
detectSelenium();
try { try {
final ClassLoader classLoader = prepareClassLoader(); final ClassLoader classLoader = prepareClassLoader();
getLog().info("Searching for tests in the directory `" + testFiles.getAbsolutePath() + "'"); getLog().info("Searching for tests in the directory `" + testFiles.getAbsolutePath() + "'");
@ -239,9 +269,13 @@ public class BuildJavascriptTestMojo extends AbstractMojo {
if (additionalScripts != null) { if (additionalScripts != null) {
tool.getAdditionalScripts().addAll(Arrays.asList(additionalScripts)); tool.getAdditionalScripts().addAll(Arrays.asList(additionalScripts));
} }
tool.addListener(testCase -> runSelenium(testCase));
tool.generate(); tool.generate();
} catch (TeaVMToolException e) { } catch (TeaVMToolException e) {
throw new MojoFailureException("Error occured generating JavaScript files", e); throw new MojoFailureException("Error occured generating JavaScript files", e);
} finally {
webDriver.close();
stopSelenium();
} }
} }
@ -419,4 +453,64 @@ public class BuildJavascriptTestMojo extends AbstractMojo {
} }
return transformerInstances; return transformerInstances;
} }
private void detectSelenium() {
if (seleniumURL == null) {
return;
}
ChromeDriver driver = new ChromeDriver();
webDriver = driver;
new Thread(() -> {
while (!seleniumStopped) {
Runnable task;
try {
task = seleniumTaskQueue.poll(1, TimeUnit.SECONDS);
} catch (InterruptedException e) {
break;
}
task.run();
}
}).start();
}
private void addSeleniumTask(Runnable runnable) {
if (seleniumURL != null) {
seleniumTaskQueue.add(runnable);
}
}
private void stopSelenium() {
addSeleniumTask(() -> seleniumStopped = true);
}
private void runSelenium(TeaVMTestCase testCase) {
if (webDriver == null) {
return;
}
try {
JavascriptExecutor js = (JavascriptExecutor) webDriver;
js.executeAsyncScript(
readResource("teavm-selenium.js"),
readFile(testCase.getRuntimeScript()),
readFile(testCase.getTestScript()),
readResource("teavm-selenium-adapter.js"));
} catch (IOException e) {
getLog().error(e);
}
}
private String readFile(File file) throws IOException {
try (InputStream input = new FileInputStream(file)) {
return IOUtils.toString(input, "UTF-8");
}
}
private String readResource(String resourceName) throws IOException {
try (InputStream input = BuildJavascriptTestMojo.class.getClassLoader().getResourceAsStream(resourceName)) {
if (input == null) {
return "";
}
return IOUtils.toString(input, "UTF-8");
}
}
} }

View File

@ -0,0 +1,48 @@
JUnitClient.run = function() {
var handler = window.addEventListener("message", $rt_threadStarter(function() {
var thread = $rt_nativeThread();
var instance;
var ptr = 0;
var message;
if (thread.isResuming()) {
ptr = thread.pop();
instance = thread.pop();
}
loop: while (true) { switch (ptr) {
case 0:
instance = new TestClass();
ptr = 1;
case 1:
try {
initInstance(instance);
} catch (e) {
message = {};
JUnitClient.makeErrorMessage(message, e);
break loop;
}
if (thread.isSuspending()) {
thread.push(instance);
thread.push(ptr);
return;
}
ptr = 2;
case 2:
try {
runTest(instance);
} catch (e) {
message = {};
JUnitClient.makeErrorMessage(message, e);
break loop;
}
if (thread.isSuspending()) {
thread.push(instance);
thread.push(ptr);
return;
}
message = {};
message.status = "ok";
break loop;
}}
window.parent.postMessage(JSON.stringify(message), "*");
}));
}

View File

@ -0,0 +1,40 @@
var runtimeSource = arguments[0]
var testSource = arguments[1]
var adapterSource = arguments[2]
var iframe = document.createElement("iframe")
document.appendChild(iframe)
var doc = iframe.contentDocument
loadScripts([ runtimeSource, adapterSource, testSource ], runTest)
window.addEventListener("message", handleMessage)
function handleMessage(event) {
window.removeEventListener("message", handleMessage)
callback(JSON.stringify(message.data))
}
var handler = window.addEventListener("message", function(event) {
window.removeEventListener
})
function loadScript(script, callback) {
var elem = doc.createElement("script")
elem.setAttribute("type", "text/javascript")
elem.appendChild(doc.createTextNode(runtimeSource))
elem.onload = function() {
callback()
}
doc.body.appendChild(script)
}
function loadScripts(scripts, callback, index) {
index = index || 0
loadScript(scripts[i], function() {
if (++index == scripts.length) {
callback()
} else {
loadScripts(scripts, callback, index)
}
})
}