sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tlpin...@apache.org
Subject svn commit: r1495656 - in /sis/branches/Shapefile/storage/sis-shapefile: pom.xml src/test/java/org/apache/sis/storage/shapefile/test/CmdLineDriverTest.java
Date Sat, 22 Jun 2013 01:30:34 GMT
Author: tlpinney
Date: Sat Jun 22 01:30:34 2013
New Revision: 1495656

URL: http://svn.apache.org/r1495656
Log:
Renamed junit tests, increased the junit version to use annotations

Modified:
    sis/branches/Shapefile/storage/sis-shapefile/pom.xml
    sis/branches/Shapefile/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/test/CmdLineDriverTest.java

Modified: sis/branches/Shapefile/storage/sis-shapefile/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/Shapefile/storage/sis-shapefile/pom.xml?rev=1495656&r1=1495655&r2=1495656&view=diff
==============================================================================
--- sis/branches/Shapefile/storage/sis-shapefile/pom.xml (original)
+++ sis/branches/Shapefile/storage/sis-shapefile/pom.xml Sat Jun 22 01:30:34 2013
@@ -57,30 +57,34 @@ Shapefile Driver
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
+      <version>4.8.2</version>
       <scope>test</scope>
     </dependency>
     <dependency>
 	  <groupId>com.esri.geometry</groupId>
- 	 <artifactId>esri-geometry-api</artifactId>
- 	 <version>1.0</version>
-  </dependency>
-  <dependency>
-	<groupId>commons-io</groupId>
-	<artifactId>commons-io</artifactId>
-	<version>2.4</version>
-  </dependency>  
- <dependency>
-	<groupId>commons-codec</groupId>
-	<artifactId>commons-codec</artifactId>
-	<version>1.8</version>
-</dependency>
-<dependency>
- 	<groupId>org.apache.sis.storage</groupId>
-  	<artifactId>sis-storage</artifactId>
-    <version>0.3-geoapi3.0-SNAPSHOT</version>
-</dependency>
-
+ 	  <artifactId>esri-geometry-api</artifactId>
+ 	  <version>1.0</version>
+    </dependency>
+    <dependency>
+	  <groupId>commons-io</groupId>
+	  <artifactId>commons-io</artifactId>
+	  <version>2.4</version>
+    </dependency>  
+    <dependency>
+	  <groupId>commons-codec</groupId>
+	  <artifactId>commons-codec</artifactId>
+	  <version>1.8</version>
+    </dependency>
+    <dependency>
+ 	  <groupId>org.apache.sis.storage</groupId>
+  	  <artifactId>sis-storage</artifactId>
+      <version>0.3-geoapi3.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
 </project>

Modified: sis/branches/Shapefile/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/test/CmdLineDriverTest.java
URL: http://svn.apache.org/viewvc/sis/branches/Shapefile/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/test/CmdLineDriverTest.java?rev=1495656&r1=1495655&r2=1495656&view=diff
==============================================================================
--- sis/branches/Shapefile/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/test/CmdLineDriverTest.java
(original)
+++ sis/branches/Shapefile/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/test/CmdLineDriverTest.java
Sat Jun 22 01:30:34 2013
@@ -1,98 +1,19 @@
 package org.apache.sis.storage.shapefile.test;
 
-import java.io.IOException;
-
-import org.apache.sis.storage.shapefile.ShapeFile;
+import static org.junit.Assert.assertTrue;
 
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
+import java.io.IOException;
+//import org.apache.sis.storage.shapefile.ShapeFile;
+import org.junit.Test;
 
 /**
  * Unit test for simple App.
  */
-public class CmdLineDriverTest 
-    extends TestCase
-{
-    /**
-     * Create the test case
-     *
-     * @param testName name of the test case
-     */
-    public CmdLineDriverTest( String testName )
-    {
-        super( testName );
-    }
-
-    /**
-     * @return the suite of tests being tested
-     */
-    public static Test suite()
-    {
-        return new TestSuite( CmdLineDriverTest.class );
-    }
-
-    /**
-     * Rigourous Test :-)
-     */
+public final strictfp  class CmdLineDriverTest {
+ 
+	@Test
     public void testApp() throws IOException
-    {
-    	ShapeFile shp;
-    	int count;
-    	
-    	shp = new ShapeFile("data/SignedBikeRoute_4326_clipped.shp");
-    	
-		//print(shp);
-		
-		count = 0;
-		for (Integer i: shp.FeatureMap.keySet()) {
-			//print(i);
-			//print(shp.FeatureMap.get(i));
-			//print("-----------------");
-			count++;
-			//System.exit(0);
-		}
-    	
-		
-		assertEquals(count, shp.FeatureCount);
-		
-		//Polyline poly = (Polyline) shp.FeatureMap.get(1).geom;
-		
-		
-    	
-    	shp = new ShapeFile("data/ANC90Ply_4326.shp");
-		//print(shp);
-		
-		count = 0;
-		for (Integer i: shp.FeatureMap.keySet()) {
-			//print(i);
-			//print(shp.FeatureMap.get(i));
-			//print("-----------------");
-			count++;
-			//System.exit(0);
-		}
-		
-		assertEquals(count, shp.FeatureCount);
-		
-	
-		
-		shp = new ShapeFile("data/ABRALicenseePt_4326_clipped.shp");
-		//print(shp);
-		
-		count = 0;
-		for (Integer i: shp.FeatureMap.keySet()) {
-			//print(i);
-			//print(shp.FeatureMap.get(i));
-			//print("-----------------");
-			count++;
-			//System.exit(0);
-		}
-		
-		assertEquals(count, shp.FeatureCount);
-		
-    	
-    	
-    	
+    {	
         assertTrue( true );
     }
 }



Mime
View raw message