Reviewers: skybrian,

Description:
Make ScriptInjectorTest less flaky by referencing locally-served test
data.


Please review this at http://gwt-code-reviews.appspot.com/1800803/

Affected files:
  M user/test/com/google/gwt/core/client/ScriptInjectorTest.java
  A user/test/com/google/gwt/core/public/script_injector_test_absolute.js
A user/test/com/google/gwt/core/public/script_injector_test_absolute_top.js


Index: user/test/com/google/gwt/core/client/ScriptInjectorTest.java
===================================================================
--- user/test/com/google/gwt/core/client/ScriptInjectorTest.java (revision 11184) +++ user/test/com/google/gwt/core/client/ScriptInjectorTest.java (working copy)
@@ -118,7 +118,7 @@
    */
   public void testInjectUrlAbsolute() {
     delayTestFinish(TEST_DELAY);
-    final String scriptUrl = "http://www.google.com/jsapi?key=GWTUNITEST";;
+ final String scriptUrl = GWT.getModuleBaseForStaticFiles() + "script_injector_test_absolute.js";
     assertFalse(nativeInjectUrlAbsoluteWorked());
ScriptInjector.fromUrl(scriptUrl).setCallback(new Callback<Void, Exception>() {

@@ -142,7 +142,7 @@
    */
   public void testInjectUrlAbsoluteTop() {
     delayTestFinish(TEST_DELAY);
- final String scriptUrl = "http://www.google.com/jsapi?key=GWTUNITEST_ABSOLUTE";; + final String scriptUrl = GWT.getModuleBaseForStaticFiles() + "script_injector_test_absolute_top.js";
     assertFalse(nativeAbsoluteTopUrlIsLoaded());
ScriptInjector.fromUrl(scriptUrl).setWindow(ScriptInjector.TOP_WINDOW).setCallback(
         new Callback<Void, Exception>() {
@@ -368,7 +368,7 @@
   }

   private native boolean nativeAbsoluteTopUrlIsLoaded() /*-{
-    return !!$wnd.google && !!$wnd.google.load;
+ return !!$wnd["__tiabsolutetop_var__"] && $wnd["__tiabsolutetop_var__"] == 102;
   }-*/;

private native JavaScriptObject nativeFindScriptText(JavaScriptObject wnd, String text) /*-{
@@ -395,7 +395,7 @@
   }-*/;

   private native boolean nativeInjectUrlAbsoluteWorked() /*-{
-    return !!window.google && !!window.google.load;
+ return !!window["__tiabsolute_var__"] && window["__tiabsolute_var__"] == 101;
   }-*/;

   private native boolean nativeTest1Worked() /*-{
Index: user/test/com/google/gwt/core/public/script_injector_test_absolute.js
===================================================================
--- user/test/com/google/gwt/core/public/script_injector_test_absolute.js (revision 0) +++ user/test/com/google/gwt/core/public/script_injector_test_absolute.js (revision 0)
@@ -0,0 +1 @@
+__tiabsolute_var__ = 101;
\ No newline at end of file
Index: user/test/com/google/gwt/core/public/script_injector_test_absolute_top.js
===================================================================
--- user/test/com/google/gwt/core/public/script_injector_test_absolute_top.js (revision 0) +++ user/test/com/google/gwt/core/public/script_injector_test_absolute_top.js (revision 0)
@@ -0,0 +1 @@
+__tiabsolutetop_var__ = 102;
\ No newline at end of file


--
http://groups.google.com/group/Google-Web-Toolkit-Contributors

Reply via email to