-
-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[java] Restore Closure Java classes required for JavaScript build (#1…
…0785) PR #10778 deleted by mistake a Java package required by the JavaScript build, and as a result, the JavaScript build started to fail. This PR restores these files
- Loading branch information
1 parent
9de853d
commit a268142
Showing
6 changed files
with
510 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
load("@rules_jvm_external//:defs.bzl", "artifact") | ||
load("//java:defs.bzl", "java_library") | ||
|
||
java_library( | ||
name = "javascript", | ||
testonly = 1, | ||
srcs = glob(["*.java"]), | ||
visibility = ["//javascript:__subpackages__"], | ||
deps = [ | ||
"//java/src/org/openqa/selenium:core", | ||
"//java/test/org/openqa/selenium/build", | ||
"//java/test/org/openqa/selenium/environment", | ||
"//java/test/org/openqa/selenium/testing:test-base", | ||
"//java/test/org/openqa/selenium/testing/drivers", | ||
artifact("com.google.guava:guava"), | ||
artifact("junit:junit"), | ||
artifact("org.assertj:assertj-core"), | ||
], | ||
) |
122 changes: 122 additions & 0 deletions
122
java/test/org/openqa/selenium/javascript/ClosureTestStatement.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,122 @@ | ||
// Licensed to the Software Freedom Conservancy (SFC) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The SFC licenses this file | ||
// to you 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.openqa.selenium.javascript; | ||
|
||
import static org.junit.Assert.fail; | ||
import static org.openqa.selenium.testing.TestUtilities.isOnTravis; | ||
|
||
import com.google.common.base.Stopwatch; | ||
|
||
import org.junit.runners.model.Statement; | ||
import org.openqa.selenium.JavascriptExecutor; | ||
import org.openqa.selenium.OutputType; | ||
import org.openqa.selenium.TakesScreenshot; | ||
import org.openqa.selenium.WebDriver; | ||
import org.openqa.selenium.WebDriverException; | ||
|
||
import java.net.URL; | ||
import java.util.concurrent.TimeUnit; | ||
import java.util.function.Function; | ||
import java.util.function.Supplier; | ||
import java.util.logging.Logger; | ||
|
||
public class ClosureTestStatement extends Statement { | ||
|
||
private static final Logger LOG = Logger.getLogger(ClosureTestStatement.class.getName()); | ||
|
||
private final Supplier<WebDriver> driverSupplier; | ||
private final String testPath; | ||
private final Function<String, URL> filePathToUrlFn; | ||
private final long timeoutSeconds; | ||
|
||
public ClosureTestStatement( | ||
Supplier<WebDriver> driverSupplier, | ||
String testPath, | ||
Function<String, URL> filePathToUrlFn, | ||
long timeoutSeconds) { | ||
this.driverSupplier = driverSupplier; | ||
this.testPath = testPath; | ||
this.filePathToUrlFn = filePathToUrlFn; | ||
this.timeoutSeconds = Math.max(0, timeoutSeconds); | ||
} | ||
|
||
@Override | ||
public void evaluate() throws Throwable { | ||
URL testUrl = filePathToUrlFn.apply(testPath); | ||
LOG.info("Running: " + testUrl); | ||
|
||
Stopwatch stopwatch = Stopwatch.createStarted(); | ||
|
||
WebDriver driver = driverSupplier.get(); | ||
|
||
if (!isOnTravis()) { | ||
// Attempt to make the window as big as possible. | ||
try { | ||
driver.manage().window().maximize(); | ||
} catch (RuntimeException ignored) { | ||
// We tried. | ||
} | ||
} | ||
|
||
JavascriptExecutor executor = (JavascriptExecutor) driver; | ||
// Avoid Safari JS leak between tests. | ||
executor.executeScript("if (window && window.top) window.top.G_testRunner = null"); | ||
|
||
try { | ||
driver.get(testUrl.toString()); | ||
} catch (WebDriverException e) { | ||
fail("Test failed to load: " + e.getMessage()); | ||
} | ||
|
||
while (!getBoolean(executor, Query.IS_FINISHED)) { | ||
long elapsedTime = stopwatch.elapsed(TimeUnit.SECONDS); | ||
if (timeoutSeconds > 0 && elapsedTime > timeoutSeconds) { | ||
throw new JavaScriptAssertionError("Tests timed out after " + elapsedTime + " s. \nCaptured Errors: " + | ||
((JavascriptExecutor) driver).executeScript("return window.errors;") | ||
+ "\nPageSource: " + driver.getPageSource() + "\nScreenshot: " + | ||
((TakesScreenshot)driver).getScreenshotAs(OutputType.BASE64)); | ||
} | ||
TimeUnit.MILLISECONDS.sleep(100); | ||
} | ||
|
||
if (!getBoolean(executor, Query.IS_SUCCESS)) { | ||
String report = getString(executor, Query.GET_REPORT); | ||
throw new JavaScriptAssertionError(report); | ||
} | ||
} | ||
|
||
private boolean getBoolean(JavascriptExecutor executor, Query query) { | ||
return (Boolean) executor.executeScript(query.script); | ||
} | ||
|
||
private String getString(JavascriptExecutor executor, Query query) { | ||
return (String) executor.executeScript(query.script); | ||
} | ||
|
||
private enum Query { | ||
IS_FINISHED("return !!tr && tr.isFinished();"), | ||
IS_SUCCESS("return !!tr && tr.isSuccess();"), | ||
GET_REPORT("return tr.getReport(true);"); | ||
|
||
private final String script; | ||
|
||
Query(String script) { | ||
this.script = "var tr = window.top.G_testRunner;" + script; | ||
} | ||
} | ||
} |
34 changes: 34 additions & 0 deletions
34
java/test/org/openqa/selenium/javascript/ClosureTestSuite.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
// Licensed to the Software Freedom Conservancy (SFC) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The SFC licenses this file | ||
// to you 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.openqa.selenium.javascript; | ||
|
||
import org.junit.BeforeClass; | ||
import org.junit.runner.RunWith; | ||
|
||
import static org.assertj.core.api.Assumptions.assumeThat; | ||
|
||
|
||
@RunWith(JavaScriptTestSuite.class) | ||
public class ClosureTestSuite { | ||
|
||
@BeforeClass | ||
public static void checkShouldRun() { | ||
assumeThat(Boolean.getBoolean("selenium.skiptest")).isFalse(); | ||
} | ||
|
||
} |
35 changes: 35 additions & 0 deletions
35
java/test/org/openqa/selenium/javascript/JavaScriptAssertionError.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
// Licensed to the Software Freedom Conservancy (SFC) under one | ||
// or more contributor license agreements. See the NOTICE file | ||
// distributed with this work for additional information | ||
// regarding copyright ownership. The SFC licenses this file | ||
// to you 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.openqa.selenium.javascript; | ||
|
||
class JavaScriptAssertionError extends AssertionError { | ||
|
||
public JavaScriptAssertionError(String message) { | ||
super(message); | ||
} | ||
|
||
@Override | ||
public Throwable fillInStackTrace() { | ||
return this; // No java stack traces. | ||
} | ||
|
||
@Override | ||
public void setStackTrace(StackTraceElement[] stackTraceElements) { | ||
// No java stack traces. | ||
} | ||
} |
Oops, something went wrong.