sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1530409 - in /sis/branches/JDK7: application/sis-console/ core/sis-utility/src/test/java/org/apache/sis/xml/ profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/ storage/sis-shapefile/src/test/java/org/apache/sis/storage/sh...
Date Tue, 08 Oct 2013 19:58:14 GMT
Author: desruisseaux
Date: Tue Oct  8 19:58:14 2013
New Revision: 1530409

URL: http://svn.apache.org/r1530409
Log:
Added missing TestSuite.

Added:
    sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
      - copied, changed from r1530327, sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileSuite.java
    sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/
    sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/
    sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
  (with props)
Removed:
    sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileSuite.java
Modified:
    sis/branches/JDK7/application/sis-console/pom.xml
    sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
    sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/CmdLineDriverTest.java
    sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java

Modified: sis/branches/JDK7/application/sis-console/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/application/sis-console/pom.xml?rev=1530409&r1=1530408&r2=1530409&view=diff
==============================================================================
--- sis/branches/JDK7/application/sis-console/pom.xml (original)
+++ sis/branches/JDK7/application/sis-console/pom.xml Tue Oct  8 19:58:14 2013
@@ -114,6 +114,12 @@ Console application.
 
     <!-- Test dependencies -->
     <dependency>
+      <!-- For UCAR NetCDF -->
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-jdk14</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.opengis.wrapper</groupId>
       <artifactId>geoapi-netcdf</artifactId>
       <version>${geoapi.version}</version>

Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java?rev=1530409&r1=1530408&r2=1530409&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/xml/OGCNamespacePrefixMapperTest.java
[UTF-8] Tue Oct  8 19:58:14 2013
@@ -56,7 +56,7 @@ public final strictfp class OGCNamespace
         try {
             ensureOverrideMethods(new OGCNamespacePrefixMapper(null));
         } catch (NoClassDefFoundError e) {
-            assumeNoException(e);
+            // Ignore the exception, since it may be normal.
         }
     }
 
@@ -73,7 +73,7 @@ public final strictfp class OGCNamespace
         try {
             ensureOverrideMethods(new OGCNamespacePrefixMapper_Endorsed(null));
         } catch (NoClassDefFoundError e) {
-            assumeNoException(e);
+            // Ignore the exception, since it may be normal.
         }
     }
 

Copied: sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
(from r1530327, sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileSuite.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java?p2=sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java&p1=sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileSuite.java&r1=1530327&r2=1530409&rev=1530409&view=diff
==============================================================================
--- sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileSuite.java
[UTF-8] (original)
+++ sis/branches/JDK7/profiles/sis-french-profile/src/test/java/org/apache/sis/test/suite/FrenchProfileTestSuite.java
[UTF-8] Tue Oct  8 19:58:14 2013
@@ -34,14 +34,14 @@ import org.junit.BeforeClass;
     org.apache.sis.internal.profile.fra.DataIdentificationTest.class,
     org.apache.sis.profile.france.FrenchProfileTest.class
 })
-public final strictfp class FrenchProfileSuite extends TestSuite {
+public final strictfp class FrenchProfileTestSuite extends TestSuite {
     /**
      * Verifies the list of tests before to run the suite.
      * See {@link #verifyTestList(Class, Class[])} for more information.
      */
     @BeforeClass
     public static void verifyTestList() {
-        assertNoMissingTest(FrenchProfileSuite.class);
-        verifyTestList(FrenchProfileSuite.class);
+        assertNoMissingTest(FrenchProfileTestSuite.class);
+        verifyTestList(FrenchProfileTestSuite.class);
     }
 }

Modified: sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/CmdLineDriverTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/CmdLineDriverTest.java?rev=1530409&r1=1530408&r2=1530409&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/CmdLineDriverTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/CmdLineDriverTest.java
[UTF-8] Tue Oct  8 19:58:14 2013
@@ -17,9 +17,10 @@
 package org.apache.sis.storage.shapefile;
 
 import java.io.IOException;
+import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
-import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.*;
 
 
 /**
@@ -30,7 +31,7 @@ import static org.junit.Assert.assertTru
  * @version 0.4
  * @module
  */
-public final strictfp class CmdLineDriverTest {
+public final strictfp class CmdLineDriverTest extends TestCase {
 
     @Test
     public void testApp() throws IOException {

Modified: sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java?rev=1530409&r1=1530408&r2=1530409&view=diff
==============================================================================
--- sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
[UTF-8] (original)
+++ sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/storage/shapefile/ShapeFileTest.java
[UTF-8] Tue Oct  8 19:58:14 2013
@@ -18,12 +18,12 @@ package org.apache.sis.storage.shapefile
 
 import java.io.File;
 import java.io.IOException;
-
 import java.net.URISyntaxException;
 import org.apache.sis.storage.DataStoreException;
+import org.apache.sis.test.TestCase;
 import org.junit.Test;
 
-import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 
 /**
@@ -33,7 +33,7 @@ import static junit.framework.Assert.ass
  * @version 0.4
  * @module
  */
-public final strictfp class ShapeFileTest {
+public final strictfp class ShapeFileTest extends TestCase {
     private static String path(final String name) throws IOException, URISyntaxException
{
         return new File(ShapeFileTest.class.getResource(name).toURI()).getPath();
     }

Added: sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java?rev=1530409&view=auto
==============================================================================
--- sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
(added)
+++ sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
[UTF-8] Tue Oct  8 19:58:14 2013
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.sis.test.suite;
+
+import org.apache.sis.test.TestSuite;
+import org.junit.runners.Suite;
+import org.junit.BeforeClass;
+
+
+/**
+ * All tests from the {@code sis-shapefile} module, in approximative dependency order.
+ */
+@Suite.SuiteClasses({
+    org.apache.sis.storage.shapefile.ShapeFileTest.class,
+    org.apache.sis.storage.shapefile.CmdLineDriverTest.class
+})
+public final strictfp class ShapefileTestSuite extends TestSuite {
+    /**
+     * Verifies the list of tests before to run the suite.
+     * See {@link #verifyTestList(Class, Class[])} for more information.
+     */
+    @BeforeClass
+    public static void verifyTestList() {
+        assertNoMissingTest(ShapefileTestSuite.class);
+        verifyTestList(ShapefileTestSuite.class);
+    }
+}

Propchange: sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: sis/branches/JDK7/storage/sis-shapefile/src/test/java/org/apache/sis/test/suite/ShapefileTestSuite.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain;charset=UTF-8



Mime
View raw message