[Schmitzm-commits] r1305 - in trunk: . src_junit/schmitzm/geotools/styling src_junit/skrueger/i8n

[scm-commit@wald.intevation.org]

Author: alfonx
Date: 2010-11-24 15:39:51 +0100 (Wed, 24 Nov 2010)
New Revision: 1305

Modified:
   trunk/pom.xml
   trunk/src_junit/schmitzm/geotools/styling/StylingUtilTest.java
   trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java
Log:
Removed all uses of JUNit 3 testCase

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-11-24 14:25:18 UTC (rev 1304)
+++ trunk/pom.xml	2010-11-24 14:39:51 UTC (rev 1305)
@@ -201,7 +201,7 @@
 			<artifactId>junit</artifactId>
 			<version>4.8.1</version>
 			<type>jar</type>
-			<scope>compile</scope>
+			<scope>test</scope>
 		</dependency>
 
 		<dependency>

Modified: trunk/src_junit/schmitzm/geotools/styling/StylingUtilTest.java
===================================================================
--- trunk/src_junit/schmitzm/geotools/styling/StylingUtilTest.java	2010-11-24 14:25:18 UTC (rev 1304)
+++ trunk/src_junit/schmitzm/geotools/styling/StylingUtilTest.java	2010-11-24 14:39:51 UTC (rev 1305)
@@ -1,5 +1,7 @@
 package schmitzm.geotools.styling;
 
+import static org.junit.Assert.*;
+
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics2D;
@@ -15,8 +17,6 @@
 import javax.swing.JPanel;
 import javax.xml.transform.TransformerException;
 
-import junit.framework.TestCase;
-
 import org.geotools.data.FeatureSource;
 import org.geotools.feature.FeatureCollection;
 import org.geotools.geometry.jts.ReferencedEnvelope;
@@ -38,9 +38,10 @@
 import schmitzm.geotools.feature.FeatureUtil.GeometryForm;
 import schmitzm.geotools.styling.StylingUtil.SelectionStylesTypes;
 import schmitzm.io.IOUtil;
+import schmitzm.junit.TestingClass;
 import schmitzm.swing.TestingUtil;
 
-public class StylingUtilTest extends TestCase {
+public class StylingUtilTest extends TestingClass {
 
 	boolean INTERACTIVE = !GraphicsEnvironment.isHeadless();
 

Modified: trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java
===================================================================
--- trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java	2010-11-24 14:25:18 UTC (rev 1304)
+++ trunk/src_junit/skrueger/i8n/SwitchLanguageDialogTest.java	2010-11-24 14:39:51 UTC (rev 1305)
@@ -29,15 +29,16 @@
  ******************************************************************************/
 package skrueger.i8n;
 
+import static org.junit.Assert.assertTrue;
+
 import java.util.ArrayList;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
 
+import schmitzm.junit.TestingClass;
 import schmitzm.swing.TestingUtil;
 
-public class SwitchLanguageDialogTest extends TestCase {
+public class SwitchLanguageDialogTest extends TestingClass {
 
 	@Test
 	public void testDialog() throws Throwable {