Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Furnadjiev2016-04-07 07:15:07 -0400
committerIvan Furnadjiev2016-04-07 07:15:07 -0400
commitf5328369f57449744c9f15018ba4d79a4c3ede25 (patch)
tree1de944a84bd5a6eda1c0d5c6246ba0c324dc6af3
parenta328acd1afcd4f281a5b06962b22089c6e83683e (diff)
downloadorg.eclipse.rap-f5328369f57449744c9f15018ba4d79a4c3ede25.tar.gz
org.eclipse.rap-f5328369f57449744c9f15018ba4d79a4c3ede25.tar.xz
org.eclipse.rap-f5328369f57449744c9f15018ba4d79a4c3ede25.zip
Fix failing JS tests due to recent error handling changes
With commit 832dedddd923821e470d82e58e967d1e69863751 all client/server errors are now using ErrorHandler.js#showErrorBox function instead of ErrorHandler.js#showErrorPage. Adjust TestUtil and its test accordingly. Change-Id: I766d13b76199792e543006a5cf1f19b36e07f865
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js2
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
index f5d87a2a6f..8ed4fad41c 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
@@ -764,7 +764,7 @@ org.eclipse.rwt.test.fixture.TestUtil = {
initErrorPageLog : function() {
org.eclipse.rwt.test.fixture.TestUtil.clearErrorPage();
- rwt.runtime.ErrorHandler.showErrorPage = function( content ) {
+ rwt.runtime.ErrorHandler.showErrorBox = function( errorType, freeze, content ) {
org.eclipse.rwt.test.fixture.TestUtil._errorPage = content;
};
},
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
index 3d534b7a62..3c94162407 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2015 EclipseSource and others.
+ * Copyright (c) 2010, 2016 EclipseSource and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -701,7 +701,7 @@ rwt.qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
testCatchErrorPage : function() {
TestUtil.clearErrorPage();
- rwt.runtime.ErrorHandler.showErrorPage( "foobar" );
+ rwt.runtime.ErrorHandler.showErrorBox( "client error", true, "foobar" );
assertEquals( "foobar", TestUtil.getErrorPage() );
TestUtil.clearErrorPage();
assertNull( TestUtil.getErrorPage() );

Back to the top