svn commit: r1682630 - in /webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite: MatrixTestCase.java MatrixTestSuiteBuilder.java

[ve...@apache.org]

Author: veithen
Date: Sat May 30 17:37:25 2015
New Revision: 1682630

URL: http://svn.apache.org/r1682630
Log:
Some Java 5 fixes.

Modified:
    webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java
    webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java

Modified: webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java?rev=1682630&r1=1682629&r2=1682630&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java (original)
+++ webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestCase.java Sat May 30 17:37:25 2015
@@ -27,7 +27,7 @@ import junit.framework.TestCase;
  * A test case that can be executed multiple times with different parameters.
  */
 public abstract class MatrixTestCase extends TestCase {
-    private final Dictionary/*<String,String>*/ parameters = new Hashtable();
+    private final Dictionary<String,String> parameters = new Hashtable<String,String>();
 
     public MatrixTestCase() {
         setName(getClass().getName());
@@ -46,7 +46,7 @@ public abstract class MatrixTestCase ext
         addTestParameter(name, String.valueOf(value));
     }
     
-    public final Dictionary getTestParameters() {
+    public final Dictionary<String,String> getTestParameters() {
         return parameters;
     }
 

Modified: webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java?rev=1682630&r1=1682629&r2=1682630&view=diff
==============================================================================
--- webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java (original)
+++ webservices/axiom/trunk/testing/testutils/src/main/java/org/apache/axiom/testutils/suite/MatrixTestSuiteBuilder.java Sat May 30 17:37:25 2015
@@ -19,7 +19,6 @@
 package org.apache.axiom.testutils.suite;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
 import junit.framework.TestSuite;
@@ -36,10 +35,10 @@ import org.osgi.framework.InvalidSyntaxE
  */
 public abstract class MatrixTestSuiteBuilder {
     private static class Exclude {
-        private final Class testClass;
+        private final Class<? extends MatrixTestCase> testClass;
         private final Filter filter;
         
-        public Exclude(Class testClass, Filter filter) {
+        public Exclude(Class<? extends MatrixTestCase> testClass, Filter filter) {
             this.testClass = testClass;
             this.filter = filter;
         }
@@ -50,10 +49,10 @@ public abstract class MatrixTestSuiteBui
         }
     }
     
-    private final List/*<Exclude>*/ excludes = new ArrayList();
+    private final List<Exclude> excludes = new ArrayList<Exclude>();
     private TestSuite suite;
     
-    public final void exclude(Class testClass, String filter) {
+    public final void exclude(Class<? extends MatrixTestCase> testClass, String filter) {
         try {
             excludes.add(new Exclude(testClass, filter == null ? null : FrameworkUtil.createFilter(filter)));
         } catch (InvalidSyntaxException ex) {
@@ -61,7 +60,7 @@ public abstract class MatrixTestSuiteBui
         }
     }
     
-    public final void exclude(Class testClass) {
+    public final void exclude(Class<? extends MatrixTestCase> testClass) {
         exclude(testClass, null);
     }
     
@@ -78,8 +77,8 @@ public abstract class MatrixTestSuiteBui
     }
     
     protected final void addTest(MatrixTestCase test) {
-        for (Iterator it = excludes.iterator(); it.hasNext(); ) {
-            if (((Exclude)it.next()).accept(test)) {
+        for (Exclude exclude : excludes) {
+            if (exclude.accept(test)) {
                 return;
             }
         }