sis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From desruisse...@apache.org
Subject svn commit: r1529261 [3/3] - in /sis/branches/JDK6: ./ application/sis-console/src/main/java/org/apache/sis/console/ core/sis-metadata/src/main/java/org/apache/sis/internal/jaxb/gml/ core/sis-metadata/src/test/java/org/apache/sis/xml/ core/sis-referenc...
Date Fri, 04 Oct 2013 19:03:08 GMT
Copied: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
(from r1529257, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java?p2=sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java&p1=sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java&r1=1529257&r2=1529261&rev=1529261&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/CheckedArrayListTest.java
[UTF-8] Fri Oct  4 19:03:07 2013
@@ -39,7 +39,7 @@ public final strictfp class CheckedArray
      */
     @Test
     public void testAdd() {
-        final CheckedArrayList<String> list = new CheckedArrayList<>(String.class);
+        final CheckedArrayList<String> list = new CheckedArrayList<String>(String.class);
         assertTrue(list.add("One"));
         assertTrue(list.add("Two"));
         assertTrue(list.add("Three"));
@@ -51,7 +51,7 @@ public final strictfp class CheckedArray
      */
     @Test
     public void testAddAll() {
-        final CheckedArrayList<String> list = new CheckedArrayList<>(String.class);
+        final CheckedArrayList<String> list = new CheckedArrayList<String>(String.class);
         assertTrue(list.add("One"));
         assertTrue(list.addAll(Arrays.asList("Two", "Three")));
         assertEquals(Arrays.asList("One", "Two", "Three"), list);
@@ -62,7 +62,7 @@ public final strictfp class CheckedArray
      */
     @Test
     public void testAddNull() {
-        final CheckedArrayList<String> list = new CheckedArrayList<>(String.class);
+        final CheckedArrayList<String> list = new CheckedArrayList<String>(String.class);
         try {
             list.add(null);
         } catch (NullArgumentException e) {
@@ -76,7 +76,7 @@ public final strictfp class CheckedArray
      */
     @Test
     public void testAddAllNull() {
-        final CheckedArrayList<String> list = new CheckedArrayList<>(String.class);
+        final CheckedArrayList<String> list = new CheckedArrayList<String>(String.class);
         final Collection<String> toAdd = Arrays.asList("One", null, "Three");
         try {
             list.addAll(toAdd);
@@ -92,7 +92,7 @@ public final strictfp class CheckedArray
     @Test
     @SuppressWarnings({"unchecked","rawtypes"})
     public void testAddWrongType() {
-        final CheckedArrayList list = new CheckedArrayList<>(String.class);
+        final CheckedArrayList list = new CheckedArrayList<String>(String.class);
         try {
             list.add(Integer.valueOf(4));
         } catch (IllegalArgumentException e) {

Copied: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
(from r1529257, sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java)
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java?p2=sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java&p1=sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java&r1=1529257&r2=1529261&rev=1529261&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/internal/util/DoubleDoubleTest.java
[UTF-8] Fri Oct  4 19:03:07 2013
@@ -285,10 +285,10 @@ public final strictfp class DoubleDouble
      * Ensures that the {@link DoubleDouble#VALUES} elements are sorted in strictly increasing
order.
      * Also ensures that {@link DoubleDouble#ERRORS} has the same number of elements.
      *
-     * @throws ReflectiveOperationException Should never happen.
+     * @throws Exception If a reflective operation failed (should never happen).
      */
     @Test
-    public void testValuesSorted() throws ReflectiveOperationException {
+    public void testValuesSorted() throws Exception {
         Field field = DoubleDouble.class.getDeclaredField("VALUES");
         field.setAccessible(true);
         double[] array = (double[]) field.get(null);

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java?rev=1529261&r1=1529260&r2=1529261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
[UTF-8] Fri Oct  4 19:03:07 2013
@@ -44,7 +44,7 @@ import static org.junit.Assert.*;
  *
  * @author  Martin Desruisseaux (Geomatys)
  * @since   0.3 (derived from geotk-3.16)
- * @version 0.3
+ * @version 0.4
  * @module
  */
 public final strictfp class TestUtilities extends Static {
@@ -90,6 +90,17 @@ public final strictfp class TestUtilitie
     }
 
     /**
+     * Prints and clear the current content of {@link TestCase#out}, regardless of whether
+     * {@link TestCase#verbose} is {@code true} or {@code false}. This method should rarely
+     * be needed.
+     *
+     * @since 0.4
+     */
+    public static void forceFlushOutput() {
+        TestCase.flushOutput();
+    }
+
+    /**
      * If verbose output are enabled, prints the given title to {@link TestCase#out} in a
box.
      * This method is invoked for writing a clear visual separator between the verbose output
      * of different test cases. This method does nothing if verbose output is not enabled,

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java?rev=1529261&r1=1529260&r2=1529261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/test/suite/UtilityTestSuite.java
[UTF-8] Fri Oct  4 19:03:07 2013
@@ -58,9 +58,11 @@ import org.junit.BeforeClass;
     org.apache.sis.math.StatisticsFormatTest.class,
     org.apache.sis.internal.util.UtilitiesTest.class,
     org.apache.sis.internal.util.NumericsTest.class,
+    org.apache.sis.internal.util.DoubleDoubleTest.class,
     org.apache.sis.internal.jdk8.JDK8Test.class,
 
     // Collections.
+    org.apache.sis.internal.util.CheckedArrayListTest.class,
     org.apache.sis.internal.system.ReferenceQueueConsumerTest.class,
     org.apache.sis.util.collection.WeakHashSetTest.class,
     org.apache.sis.util.collection.WeakValueHashMapTest.class,

Modified: sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java?rev=1529261&r1=1529260&r2=1529261&view=diff
==============================================================================
--- sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
[UTF-8] (original)
+++ sis/branches/JDK6/core/sis-utility/src/test/java/org/apache/sis/util/ArraysExtTest.java
[UTF-8] Fri Oct  4 19:03:07 2013
@@ -181,6 +181,16 @@ public final strictfp class ArraysExtTes
     }
 
     /**
+     * Tests the {@link ArraysExt#swap(Object[], int, int)} method.
+     */
+    @Test
+    public void testSwapObject() {
+        final Integer[] array = new Integer[] {4, 8, 12, 15, 18};
+        ArraysExt.swap(array, 1, 3);
+        assertArrayEquals(new Integer[] {4, 15, 12, 8, 18}, array);
+    }
+
+    /**
      * Tests the {@link ArraysExt#swap(double[], int, int)} method.
      */
     @Test

Modified: sis/branches/JDK6/pom.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK6/pom.xml?rev=1529261&r1=1529260&r2=1529261&view=diff
==============================================================================
--- sis/branches/JDK6/pom.xml (original)
+++ sis/branches/JDK6/pom.xml Fri Oct  4 19:03:07 2013
@@ -619,6 +619,7 @@ Apache SIS is a free software, Java lang
           <validateLinks>true</validateLinks>
           <links>
             <link>http://www.geoapi.org/snapshot/javadoc</link>
+            <link>http://www.geoapi.org/snapshot/pending</link>
           </links>
 
           <!-- Separates packages on the overview page into the groups specified. -->



Mime
View raw message