Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorTim Buschtöns2011-01-26 12:33:54 +0000
committerTim Buschtöns2011-01-26 12:33:54 +0000
commited2e7eb9872bae44102da8960f3064846b811fe2 (patch)
tree769ace25615f4b689e4433048f00586b05437269 /tests
parentb1526499d5b6841e9034a99dcc139d6e37be91ce (diff)
downloadorg.eclipse.rap-ed2e7eb9872bae44102da8960f3064846b811fe2.tar.gz
org.eclipse.rap-ed2e7eb9872bae44102da8960f3064846b811fe2.tar.xz
org.eclipse.rap-ed2e7eb9872bae44102da8960f3064846b811fe2.zip
fixing BrowserTest for older IE
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js12
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js12
2 files changed, 18 insertions, 6 deletions
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
index 147a8b4fa4..dc0c86a74b 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
@@ -357,8 +357,9 @@ qx.Class.define( "org.eclipse.rwt.test.tests.BrowserTest", {
testUtil.store( browser );
},
function( browser ) {
- // TODO: check for native load event to prevent false positive
- assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ if( !qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
+ assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ }
assertNull( testUtil.getErrorPage() );
browser.destroy();
}
@@ -382,7 +383,12 @@ qx.Class.define( "org.eclipse.rwt.test.tests.BrowserTest", {
testUtil.store( browser );
},
function( browser ) {
- assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ // NOTE: Some IE dont fire a load event for this scenario,
+ // therefore can not check that side is loaded,
+ // could lead to false negative (red) test
+ if( !qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
+ assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ }
var error = null;
try{
browser.createFunction( "abc" );
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
index 147a8b4fa4..dc0c86a74b 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/BrowserTest.js
@@ -357,8 +357,9 @@ qx.Class.define( "org.eclipse.rwt.test.tests.BrowserTest", {
testUtil.store( browser );
},
function( browser ) {
- // TODO: check for native load event to prevent false positive
- assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ if( !qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
+ assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ }
assertNull( testUtil.getErrorPage() );
browser.destroy();
}
@@ -382,7 +383,12 @@ qx.Class.define( "org.eclipse.rwt.test.tests.BrowserTest", {
testUtil.store( browser );
},
function( browser ) {
- assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ // NOTE: Some IE dont fire a load event for this scenario,
+ // therefore can not check that side is loaded,
+ // could lead to false negative (red) test
+ if( !qx.core.Variant.isSet( "qx.client", "mshtml" ) ) {
+ assertTrue( "native loaded?", browser.getUserData( "nativeLoaded" ) );
+ }
var error = null;
try{
browser.createFunction( "abc" );

Back to the top