http://code.google.com/p/wiquery/issues/detail?id=132

svn path=/trunk/; revision=562
papegaaij · Nov 19, 2010 · 1dd4790 · 1dd4790
1 parent b4c16ef
commit 1dd4790
Show file tree

Hide file tree

Showing 97 changed files with 195 additions and 196 deletions.
diff --git a/pom.xml b/pom.xml
@@ -44,7 +44,7 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<wicket.version>1.4.12</wicket.version>
+		<wicket.version>1.4.13</wicket.version>
 		<jackson.version>1.6.1</jackson.version>
 		<log4j.version>1.2.16</log4j.version>
 		<slf4j.version>1.6.1</slf4j.version>
@@ -159,10 +159,9 @@
 
 		<!-- Test dependencies -->
 		<dependency>
-			<groupId>org.testng</groupId>
-			<artifactId>testng</artifactId>
-			<version>5.5</version>
-			<classifier>jdk15</classifier>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.8.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

diff --git a/src/test/java/org/odlabs/wiquery/core/JSQueryTestCase.java b/src/test/java/org/odlabs/wiquery/core/JSQueryTestCase.java
@@ -8,8 +8,8 @@
 import org.odlabs.wiquery.core.javascript.JsStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class JSQueryTestCase extends TestCase {
 

diff --git a/src/test/java/org/odlabs/wiquery/core/ajax/JQueryAjaxOptionTestCase.java b/src/test/java/org/odlabs/wiquery/core/ajax/JQueryAjaxOptionTestCase.java
@@ -25,7 +25,7 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.ajax.JQueryAjaxOption.AjaxType;
-import org.testng.annotations.Test;
+import org.junit.Test;
 
 /**
  * Test on {@link JQueryAjaxOption}

diff --git a/src/test/java/org/odlabs/wiquery/core/commons/WiQuerySettingsTest.java b/src/test/java/org/odlabs/wiquery/core/commons/WiQuerySettingsTest.java
@@ -13,7 +13,7 @@
 import org.odlabs.wiquery.ui.core.CoreUIJavaScriptResourceReference;
 import org.odlabs.wiquery.ui.themes.WiQueryCoreThemeResourceReference;
 import org.odlabs.wiquery.ui.widget.WidgetJavascriptResourceReference;
-import org.testng.annotations.Test;
+import org.junit.Test;
 /**
  * Tests {@link WiQuerySettings}.
  * @author Arthur Hupka

diff --git a/...a/org/odlabs/wiquery/core/commons/merge/WiQueryMergedStyleSheetResourceReferenceTest.java b/...a/org/odlabs/wiquery/core/commons/merge/WiQueryMergedStyleSheetResourceReferenceTest.java
@@ -21,8 +21,8 @@
  */
 package org.odlabs.wiquery.core.commons.merge;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/EffectBehaviorTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/EffectBehaviorTestCase.java
@@ -29,8 +29,8 @@
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.util.tester.WicketTester;
 import org.odlabs.wiquery.core.effects.basic.Hide;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/EffectTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/EffectTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 import org.odlabs.wiquery.core.javascript.JsScope;
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Test on {@link EffectTest}

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/basic/HideTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/basic/HideTestCase.java
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 import org.odlabs.wiquery.core.javascript.JsStatement;
 
 

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/basic/ShowTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/basic/ShowTestCase.java
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 import org.odlabs.wiquery.core.javascript.JsStatement;
 
 

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/basic/ToggleTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/basic/ToggleTestCase.java
@@ -23,8 +23,8 @@
 
 import junit.framework.TestCase;
 
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 import org.odlabs.wiquery.core.javascript.JsStatement;
 
 

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/fading/FadeInTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/fading/FadeInTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/fading/FadeOutTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/fading/FadeOutTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/fading/FadeToTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/fading/FadeToTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/sliding/SlideDownTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/sliding/SlideDownTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/sliding/SlideToggleTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/sliding/SlideToggleTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/effects/sliding/SlideUpTestCase.java b/src/test/java/org/odlabs/wiquery/core/effects/sliding/SlideUpTestCase.java
@@ -24,8 +24,8 @@
 import junit.framework.TestCase;
 
 import org.odlabs.wiquery.core.javascript.JsStatement;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 
 /**

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/JsQueryTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/JsQueryTestCase.java
@@ -29,7 +29,7 @@
 import org.apache.wicket.util.tester.WicketTester;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
+import org.junit.Assert;
 
 /**
  * Test {@link JsQuery}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/JsScopeEventTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/JsScopeEventTestCase.java
@@ -4,8 +4,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link JsScope}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/JsScopeTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/JsScopeTestCase.java
@@ -4,8 +4,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link JsScope}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/JsStatementTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/JsStatementTestCase.java
@@ -31,7 +31,7 @@
 import org.odlabs.wiquery.core.options.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
+import org.junit.Assert;
 
 /**
  * Test {@link JsStatement}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/JsUtilsTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/JsUtilsTestCase.java
@@ -5,8 +5,8 @@
 import org.odlabs.wiquery.core.events.MouseEvent;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link JsUtils}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/helper/AttributesHelperTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/helper/AttributesHelperTestCase.java
@@ -6,8 +6,8 @@
 import org.odlabs.wiquery.core.javascript.JsStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link AttributesHelper}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/helper/CssHelperTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/helper/CssHelperTestCase.java
@@ -6,8 +6,8 @@
 import org.odlabs.wiquery.core.options.Options;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link CssHelper}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/helper/DateHelperTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/helper/DateHelperTestCase.java
@@ -6,8 +6,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class DateHelperTestCase extends TestCase{
 	protected static final Logger log = LoggerFactory.getLogger(

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/helper/EventsHelperTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/helper/EventsHelperTestCase.java
@@ -26,7 +26,7 @@
 import org.odlabs.wiquery.core.javascript.JsStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
+import org.junit.Assert;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/helper/ManipulatingHelperTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/helper/ManipulatingHelperTestCase.java
@@ -5,8 +5,8 @@
 import org.odlabs.wiquery.core.javascript.JsStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link ManipulatingHelper}

diff --git a/src/test/java/org/odlabs/wiquery/core/javascript/helper/TraversingHelperTestCase.java b/src/test/java/org/odlabs/wiquery/core/javascript/helper/TraversingHelperTestCase.java
@@ -5,8 +5,8 @@
 import org.odlabs.wiquery.core.javascript.JsStatement;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link TraversingHelper}

diff --git a/src/test/java/org/odlabs/wiquery/core/jqueryplugins/JQueryCookieOptionTestCase.java b/src/test/java/org/odlabs/wiquery/core/jqueryplugins/JQueryCookieOptionTestCase.java
@@ -25,8 +25,8 @@
 
 import org.apache.wicket.WicketRuntimeException;
 import org.odlabs.wiquery.ui.datepicker.DateOption;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Test on {@link JQueryCookieOption}

diff --git a/src/test/java/org/odlabs/wiquery/core/options/ArrayItemOptionsTestCase.java b/src/test/java/org/odlabs/wiquery/core/options/ArrayItemOptionsTestCase.java
@@ -6,8 +6,8 @@
 import org.odlabs.wiquery.core.options.IntegerItemOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link ArrayItemOptions}

diff --git a/src/test/java/org/odlabs/wiquery/core/options/EventLabelOptionsTestCase.java b/src/test/java/org/odlabs/wiquery/core/options/EventLabelOptionsTestCase.java
@@ -4,8 +4,8 @@
 import org.odlabs.wiquery.core.options.EventLabelOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 import junit.framework.TestCase;
 

diff --git a/src/test/java/org/odlabs/wiquery/core/options/ListItemOptionsTestCase.java b/src/test/java/org/odlabs/wiquery/core/options/ListItemOptionsTestCase.java
@@ -6,8 +6,8 @@
 import org.odlabs.wiquery.core.options.ListItemOptions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link ListItemOptions}

diff --git a/src/test/java/org/odlabs/wiquery/core/options/LiteralOptionTestCase.java b/src/test/java/org/odlabs/wiquery/core/options/LiteralOptionTestCase.java
@@ -5,8 +5,8 @@
 import org.odlabs.wiquery.core.options.LiteralOption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link LiteralOption}

diff --git a/src/test/java/org/odlabs/wiquery/core/options/OptionsTestCase.java b/src/test/java/org/odlabs/wiquery/core/options/OptionsTestCase.java
@@ -15,8 +15,8 @@
 import org.odlabs.wiquery.core.javascript.JsScope;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Unit test on the {@link ListItemOptions}
@@ -156,7 +156,7 @@ public void testGetFloat() {
 		options.put("keyFloat", 1F);
 
 		Assert.assertFalse(options.isEmpty());
-		Assert.assertEquals(1F, options.getFloat("keyFloat"));
+		Assert.assertEquals((Object) 1F, (Object) options.getFloat("keyFloat"));
 	}
 
 	@Test

diff --git a/src/test/java/org/odlabs/wiquery/ui/accordion/AccordionActiveTestCase.java b/src/test/java/org/odlabs/wiquery/ui/accordion/AccordionActiveTestCase.java
@@ -5,8 +5,8 @@
 import org.odlabs.wiquery.core.options.LiteralOption;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class AccordionActiveTestCase extends TestCase{
 	protected static final Logger log = LoggerFactory.getLogger(

diff --git a/src/test/java/org/odlabs/wiquery/ui/accordion/AccordionAnimatedTestCase.java b/src/test/java/org/odlabs/wiquery/ui/accordion/AccordionAnimatedTestCase.java
@@ -4,8 +4,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
-import org.testng.annotations.Test;
+import org.junit.Assert;
+import org.junit.Test;
 
 public class AccordionAnimatedTestCase extends TestCase{
 	protected static final Logger log = LoggerFactory.getLogger(