Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/Application.js5
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/TestRunner.js43
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js3
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js8
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js1
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js8
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js9
-rw-r--r--tests/org.eclipse.rap.rwt.jstest/js/resource/Includes.js10
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/Application.js5
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/TestRunner.js43
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js3
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js8
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js1
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js8
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js9
-rw-r--r--tests/org.eclipse.rap.rwt.q07.jstest/js/resource/Includes.js10
16 files changed, 30 insertions, 144 deletions
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/Application.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/Application.js
index 542396886e..84dd3296e8 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/Application.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/Application.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
+ * Copyright (c) 2009, 2011 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 http://www.eclipse.org/legal/epl-v10.html
@@ -18,13 +18,10 @@ qx.Class.define("org.eclipse.rwt.test.Application", {
members : {
main : function( evt ) {
this.base( arguments );
- this.info( "Starting RAP AppSimulator" );
org.eclipse.rwt.test.fixture.TestUtil.initRequestLog();
org.eclipse.rwt.test.fixture.AppSimulator.start();
- this.info( "Creating testrunner" );
this.runner = org.eclipse.rwt.test.TestRunner.getInstance();
org.eclipse.rwt.test.Asserts.createShortcuts();
- this.info( "DONE" );
},
// after the application is completely loaded:
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/TestRunner.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/TestRunner.js
index 7d72c54871..b81e418fe2 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/TestRunner.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/TestRunner.js
@@ -14,7 +14,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
construct : function() {
this.base( arguments );
- qx.log.Logger.ROOT_LOGGER.setMinLevel( qx.log.Logger.LEVEL_ERROR );
this._FREEZEONFAIL = true;
this._NOTRYCATCH = this._getURLParam( "notry" ) !== null;
this._FULLSCREEN = true;
@@ -57,11 +56,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
getLog = function() {
return org.eclipse.rwt.test.TestRunner.getInstance().getLog();
}
- // also stop on "this.error":
- qx.core.Object.prototype.error = function( msg, exc ) {
- this.getLogger().error(msg, this.toHashCode(), exc);
- throw msg;
- };
},
members : {
@@ -214,8 +208,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
// called by Asserts.js
processAssert : function( assertType, expected, value, isFailed, message ) {
if( isFailed ) {
- var trace = qx.dev.StackTrace.getStackTrace();
- qx.lang.Array.removeAt( trace, 0 );
var errorMessage = 'Assert "'
+ ( message ? message : this._asserts + 1 )
+ '", type "'
@@ -229,7 +221,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
"assert" : true,
"testClass" : this._testClasses[ this._currentClass ].classname,
"testFunction" : this._currentFunction,
- "trace" : trace,
"expected" : expected,
"actual" : value,
"msg" : errorMessage,
@@ -273,19 +264,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
this._log.asserts = this._asserts;
this._log.obj = testInstance;
this._log.currentFunction = this._currentFunction;
- try {
- var trace = this._getStackTrace( e );
- this._log.trace = trace;
- this.getLogger().log(
- qx.log.Logger.LEVEL_INFO,
- "Stack trace:",
- "",
- null,
- trace
- );
- } catch( e ) {
- this._log.trace = e;
- }
},
_checkFlushState : function() {
@@ -338,26 +316,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
qx.ui.core.Widget.__allowFlushs = true;
},
- _getStackTrace : function( e ) {
- var trace = null;
- if( e.trace ) {
- trace = e.trace;
- } else {
- var fromErr = [];
- if( !qx.core.Variant.isSet( "qx.client", "webkit" ) ) {
- // this somehow crashes webkit
- fromErr = qx.dev.StackTrace.getStackTraceFromError( e );
- }
- if( fromErr.length > 0 ) {
- trace = fromErr;
- } else {
- trace = qx.dev.StackTrace.getStackTrace();
- }
- }
- return trace;
- },
-
-
getLog : function(){
return this._log;
},
@@ -463,7 +421,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
},
info : function( text, indent ) {
- this.base( arguments, text );
this._presenter.log( text, indent );
}
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js
index 232778c319..f5e0a0eb03 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
+ * Copyright (c) 2009, 2011 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 http://www.eclipse.org/legal/epl-v10.html
@@ -40,7 +40,6 @@ qx.Mixin.define( "org.eclipse.rwt.test.fixture.RAPRequestPatch", {
request.setAsynchronous( async );
this._inDelayedSend = false;
this._copyParameters( request );
- this._logSend();
this._runningRequestCount++;
if( this._runningRequestCount === 1 ) {
// Removed: is distracting in debugging and useless unless tested
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 7fbc89b854..74ffe48886 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
@@ -804,14 +804,6 @@ qx.Class.define( "org.eclipse.rwt.test.fixture.TestUtil", {
qx.ui.core.Widget.__allowFlushs = !value;
},
- printStackTrace : function( qxObject ) {
- // Note: this works, regardless of current log-level
- var level = qx.log.Logger.ROOT_LOGGER._getDefaultFilter().getMinLevel();
- qx.log.Logger.ROOT_LOGGER.setMinLevel( qx.log.Logger.LEVEL_DEBUG );
- qxObject.printStackTrace();
- qx.log.Logger.ROOT_LOGGER.setMinLevel( level );
- },
-
emptyDragCache : function() {
qx.event.handler.DragAndDropHandler.__dragCache = null;
},
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js
index 4d3cca573b..205f992f8e 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js
@@ -33,7 +33,6 @@ qx.Class.define( "org.eclipse.rwt.test.tests.KeyEventUtilTest", {
var expected1 = "org.eclipse.swt.events.keyDown=w1";
var expected2 = "org.eclipse.swt.events.keyDown.keyCode=66";
var msg = testUtil.getMessage();
- console.log( msg );
assertTrue( msg.indexOf( expected1 ) != -1 );
assertTrue( msg.indexOf( expected2 ) != -1 );
widget.destroy();
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js
index f19dbb59c9..130089df81 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js
@@ -225,7 +225,13 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ScrollBarTest", {
assertFalse( bar._mergeEvents );
bar.setMergeEvents( true );
assertTrue( bar._mergeEvents );
- bar.setMergeEvents( false );
+ var error = null;
+ try {
+ bar.setMergeEvents( false );
+ } catch( ex ) {
+ error = ex;
+ }
+ assertNotNull( error );
assertTrue( bar._mergeEvents );
bar.destroy();
},
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 8bdcb42e01..8c5c16cf7e 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
@@ -250,7 +250,6 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
testFakeAppearance : function() {
var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
var widget = new qx.ui.basic.Terminator();
- widget.setAppearance( "my-appearance" );
testUtil.fakeAppearance( "my-appearance", {
style : function( states ) {
return {
@@ -258,6 +257,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
};
}
} );
+ widget.setAppearance( "my-appearance" );
widget._renderAppearance();
assertEquals( "my-appearance.gif", widget.getBackgroundImage() );
widget.destroy();
@@ -290,8 +290,11 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
} );
testUtil.restoreAppearance();
var widget = new qx.ui.basic.Terminator();
- widget.setAppearance( "my-appearance" );
- widget._renderAppearance();
+ try{
+ widget.setAppearance( "my-appearance" );
+ widget._renderAppearance();
+ }catch( ex ) {
+ }
assertNull( widget.getBackgroundImage() );
widget.destroy();
},
diff --git a/tests/org.eclipse.rap.rwt.jstest/js/resource/Includes.js b/tests/org.eclipse.rap.rwt.jstest/js/resource/Includes.js
index a484debe02..184f3a2d05 100644
--- a/tests/org.eclipse.rap.rwt.jstest/js/resource/Includes.js
+++ b/tests/org.eclipse.rap.rwt.jstest/js/resource/Includes.js
@@ -55,7 +55,6 @@
"qx/lang/Object.js",
"qx/Class.js",
"qx/Mixin.js",
- "qx/log/MLogging.js",
"qx/core/MUserData.js",
"qx/core/LegacyProperty.js",
"qx/core/Property.js",
@@ -68,16 +67,7 @@
"qx/event/type/Event.js",
"qx/event/type/DataEvent.js",
"qx/event/type/ChangeEvent.js",
- "qx/log/Filter.js",
- "qx/log/DefaultFilter.js",
- "qx/log/LogEventProcessor.js",
- "qx/log/appender/Abstract.js",
- "qx/log/appender/Window.js",
"qx/client/Timer.js",
- "qx/log/appender/FireBug.js",
- "qx/log/appender/Native.js",
- "qx/log/Logger.js",
- "qx/dev/StackTrace.js",
"qx/html/String.js",
"qx/dom/String.js",
"qx/html/Entity.js",
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/Application.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/Application.js
index 542396886e..84dd3296e8 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/Application.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/Application.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
+ * Copyright (c) 2009, 2011 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 http://www.eclipse.org/legal/epl-v10.html
@@ -18,13 +18,10 @@ qx.Class.define("org.eclipse.rwt.test.Application", {
members : {
main : function( evt ) {
this.base( arguments );
- this.info( "Starting RAP AppSimulator" );
org.eclipse.rwt.test.fixture.TestUtil.initRequestLog();
org.eclipse.rwt.test.fixture.AppSimulator.start();
- this.info( "Creating testrunner" );
this.runner = org.eclipse.rwt.test.TestRunner.getInstance();
org.eclipse.rwt.test.Asserts.createShortcuts();
- this.info( "DONE" );
},
// after the application is completely loaded:
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/TestRunner.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/TestRunner.js
index 7d72c54871..b81e418fe2 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/TestRunner.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/TestRunner.js
@@ -14,7 +14,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
construct : function() {
this.base( arguments );
- qx.log.Logger.ROOT_LOGGER.setMinLevel( qx.log.Logger.LEVEL_ERROR );
this._FREEZEONFAIL = true;
this._NOTRYCATCH = this._getURLParam( "notry" ) !== null;
this._FULLSCREEN = true;
@@ -57,11 +56,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
getLog = function() {
return org.eclipse.rwt.test.TestRunner.getInstance().getLog();
}
- // also stop on "this.error":
- qx.core.Object.prototype.error = function( msg, exc ) {
- this.getLogger().error(msg, this.toHashCode(), exc);
- throw msg;
- };
},
members : {
@@ -214,8 +208,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
// called by Asserts.js
processAssert : function( assertType, expected, value, isFailed, message ) {
if( isFailed ) {
- var trace = qx.dev.StackTrace.getStackTrace();
- qx.lang.Array.removeAt( trace, 0 );
var errorMessage = 'Assert "'
+ ( message ? message : this._asserts + 1 )
+ '", type "'
@@ -229,7 +221,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
"assert" : true,
"testClass" : this._testClasses[ this._currentClass ].classname,
"testFunction" : this._currentFunction,
- "trace" : trace,
"expected" : expected,
"actual" : value,
"msg" : errorMessage,
@@ -273,19 +264,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
this._log.asserts = this._asserts;
this._log.obj = testInstance;
this._log.currentFunction = this._currentFunction;
- try {
- var trace = this._getStackTrace( e );
- this._log.trace = trace;
- this.getLogger().log(
- qx.log.Logger.LEVEL_INFO,
- "Stack trace:",
- "",
- null,
- trace
- );
- } catch( e ) {
- this._log.trace = e;
- }
},
_checkFlushState : function() {
@@ -338,26 +316,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
qx.ui.core.Widget.__allowFlushs = true;
},
- _getStackTrace : function( e ) {
- var trace = null;
- if( e.trace ) {
- trace = e.trace;
- } else {
- var fromErr = [];
- if( !qx.core.Variant.isSet( "qx.client", "webkit" ) ) {
- // this somehow crashes webkit
- fromErr = qx.dev.StackTrace.getStackTraceFromError( e );
- }
- if( fromErr.length > 0 ) {
- trace = fromErr;
- } else {
- trace = qx.dev.StackTrace.getStackTrace();
- }
- }
- return trace;
- },
-
-
getLog : function(){
return this._log;
},
@@ -463,7 +421,6 @@ qx.Class.define("org.eclipse.rwt.test.TestRunner", {
},
info : function( text, indent ) {
- this.base( arguments, text );
this._presenter.log( text, indent );
}
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js
index 232778c319..f5e0a0eb03 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/RAPRequestPatch.js
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009 EclipseSource and others. All rights reserved.
+ * Copyright (c) 2009, 2011 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 http://www.eclipse.org/legal/epl-v10.html
@@ -40,7 +40,6 @@ qx.Mixin.define( "org.eclipse.rwt.test.fixture.RAPRequestPatch", {
request.setAsynchronous( async );
this._inDelayedSend = false;
this._copyParameters( request );
- this._logSend();
this._runningRequestCount++;
if( this._runningRequestCount === 1 ) {
// Removed: is distracting in debugging and useless unless tested
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
index 7fbc89b854..74ffe48886 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/fixture/TestUtil.js
@@ -804,14 +804,6 @@ qx.Class.define( "org.eclipse.rwt.test.fixture.TestUtil", {
qx.ui.core.Widget.__allowFlushs = !value;
},
- printStackTrace : function( qxObject ) {
- // Note: this works, regardless of current log-level
- var level = qx.log.Logger.ROOT_LOGGER._getDefaultFilter().getMinLevel();
- qx.log.Logger.ROOT_LOGGER.setMinLevel( qx.log.Logger.LEVEL_DEBUG );
- qxObject.printStackTrace();
- qx.log.Logger.ROOT_LOGGER.setMinLevel( level );
- },
-
emptyDragCache : function() {
qx.event.handler.DragAndDropHandler.__dragCache = null;
},
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js
index 4d3cca573b..205f992f8e 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/KeyEventUtilTest.js
@@ -33,7 +33,6 @@ qx.Class.define( "org.eclipse.rwt.test.tests.KeyEventUtilTest", {
var expected1 = "org.eclipse.swt.events.keyDown=w1";
var expected2 = "org.eclipse.swt.events.keyDown.keyCode=66";
var msg = testUtil.getMessage();
- console.log( msg );
assertTrue( msg.indexOf( expected1 ) != -1 );
assertTrue( msg.indexOf( expected2 ) != -1 );
widget.destroy();
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js
index f19dbb59c9..130089df81 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/ScrollBarTest.js
@@ -225,7 +225,13 @@ qx.Class.define( "org.eclipse.rwt.test.tests.ScrollBarTest", {
assertFalse( bar._mergeEvents );
bar.setMergeEvents( true );
assertTrue( bar._mergeEvents );
- bar.setMergeEvents( false );
+ var error = null;
+ try {
+ bar.setMergeEvents( false );
+ } catch( ex ) {
+ error = ex;
+ }
+ assertNotNull( error );
assertTrue( bar._mergeEvents );
bar.destroy();
},
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
index 8bdcb42e01..8c5c16cf7e 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/org/eclipse/rwt/test/tests/TestUtilTest.js
@@ -250,7 +250,6 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
testFakeAppearance : function() {
var testUtil = org.eclipse.rwt.test.fixture.TestUtil;
var widget = new qx.ui.basic.Terminator();
- widget.setAppearance( "my-appearance" );
testUtil.fakeAppearance( "my-appearance", {
style : function( states ) {
return {
@@ -258,6 +257,7 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
};
}
} );
+ widget.setAppearance( "my-appearance" );
widget._renderAppearance();
assertEquals( "my-appearance.gif", widget.getBackgroundImage() );
widget.destroy();
@@ -290,8 +290,11 @@ qx.Class.define( "org.eclipse.rwt.test.tests.TestUtilTest", {
} );
testUtil.restoreAppearance();
var widget = new qx.ui.basic.Terminator();
- widget.setAppearance( "my-appearance" );
- widget._renderAppearance();
+ try{
+ widget.setAppearance( "my-appearance" );
+ widget._renderAppearance();
+ }catch( ex ) {
+ }
assertNull( widget.getBackgroundImage() );
widget.destroy();
},
diff --git a/tests/org.eclipse.rap.rwt.q07.jstest/js/resource/Includes.js b/tests/org.eclipse.rap.rwt.q07.jstest/js/resource/Includes.js
index a484debe02..184f3a2d05 100644
--- a/tests/org.eclipse.rap.rwt.q07.jstest/js/resource/Includes.js
+++ b/tests/org.eclipse.rap.rwt.q07.jstest/js/resource/Includes.js
@@ -55,7 +55,6 @@
"qx/lang/Object.js",
"qx/Class.js",
"qx/Mixin.js",
- "qx/log/MLogging.js",
"qx/core/MUserData.js",
"qx/core/LegacyProperty.js",
"qx/core/Property.js",
@@ -68,16 +67,7 @@
"qx/event/type/Event.js",
"qx/event/type/DataEvent.js",
"qx/event/type/ChangeEvent.js",
- "qx/log/Filter.js",
- "qx/log/DefaultFilter.js",
- "qx/log/LogEventProcessor.js",
- "qx/log/appender/Abstract.js",
- "qx/log/appender/Window.js",
"qx/client/Timer.js",
- "qx/log/appender/FireBug.js",
- "qx/log/appender/Native.js",
- "qx/log/Logger.js",
- "qx/dev/StackTrace.js",
"qx/html/String.js",
"qx/dom/String.js",
"qx/html/Entity.js",

Back to the top