Cleaned up the test classes

phishman3579 · phishman3579 · commit 3440d162dc0e · 2015-01-14T16:10:52.000-05:00
diff --git a/src/com/jwetherell/algorithms/data_structures/test/AVLTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/AVLTreeTests.java
@@ -14,6 +14,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class AVLTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/BTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/BTreeTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class BTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/BinaryHeapTests.java b/src/com/jwetherell/algorithms/data_structures/test/BinaryHeapTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class BinaryHeapTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/BinarySearchTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/BinarySearchTreeTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class BinarySearchTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/CompactSuffixTrieTests.java b/src/com/jwetherell/algorithms/data_structures/test/CompactSuffixTrieTests.java
@@ -7,6 +7,7 @@
 
 import com.jwetherell.algorithms.data_structures.CompactSuffixTrie;
 
+@SuppressWarnings("static-method")
 public class CompactSuffixTrieTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/HashArrayMappedTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/HashArrayMappedTreeTests.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class HashArrayMappedTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/HashMapTests.java b/src/com/jwetherell/algorithms/data_structures/test/HashMapTests.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class HashMapTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/IntervalTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/IntervalTreeTests.java
@@ -10,6 +10,7 @@
 
 import com.jwetherell.algorithms.data_structures.IntervalTree;
 
+@SuppressWarnings("static-method")
 public class IntervalTreeTests {
 	
 	private static boolean collectionsEqual(Collection<?> c1, Collection<?> c2) {
diff --git a/src/com/jwetherell/algorithms/data_structures/test/KdTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/KdTreeTests.java
@@ -9,6 +9,7 @@
 
 import com.jwetherell.algorithms.data_structures.KdTree;
 
+@SuppressWarnings("static-method")
 public class KdTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/ListTests.java b/src/com/jwetherell/algorithms/data_structures/test/ListTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class ListTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/MatrixTests.java b/src/com/jwetherell/algorithms/data_structures/test/MatrixTests.java
@@ -6,6 +6,7 @@
 
 import com.jwetherell.algorithms.data_structures.Matrix;
 
+@SuppressWarnings("static-method")
 public class MatrixTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/PatriciaTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/PatriciaTreeTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class PatriciaTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/QuadTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/QuadTreeTests.java
@@ -10,6 +10,7 @@
 
 import com.jwetherell.algorithms.data_structures.QuadTree;
 
+@SuppressWarnings("static-method")
 public class QuadTreeTests {
 
     private static final Random RANDOM = new Random();
diff --git a/src/com/jwetherell/algorithms/data_structures/test/QueueTests.java b/src/com/jwetherell/algorithms/data_structures/test/QueueTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class QueueTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/RadixTrieTests.java b/src/com/jwetherell/algorithms/data_structures/test/RadixTrieTests.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class RadixTrieTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/RedBlackTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/RedBlackTreeTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class RedBlackTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/SegmentTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/SegmentTreeTests.java
@@ -12,13 +12,15 @@
 import com.jwetherell.algorithms.data_structures.SegmentTree.DynamicSegmentTree;
 import com.jwetherell.algorithms.data_structures.SegmentTree.FlatSegmentTree;
 
+@SuppressWarnings("static-method")
 public class SegmentTreeTests {
     
     private static boolean collectionsEqual(Collection<?> c1, Collection<?> c2) {
         if (c1.size()!=c2.size()) return false;
         return c1.containsAll(c2) && c2.containsAll(c1);
     }
 
+    @SuppressWarnings("cast")
     @Test
     public void testSegmentTree() {
         {   // Quadrant Segment tree
diff --git a/src/com/jwetherell/algorithms/data_structures/test/SkipListMapTests.java b/src/com/jwetherell/algorithms/data_structures/test/SkipListMapTests.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class SkipListMapTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/SkipListTests.java b/src/com/jwetherell/algorithms/data_structures/test/SkipListTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class SkipListTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/SplayTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/SplayTreeTests.java
@@ -14,6 +14,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class SplayTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/StackTests.java b/src/com/jwetherell/algorithms/data_structures/test/StackTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class StackTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/SuffixTreeTests.java b/src/com/jwetherell/algorithms/data_structures/test/SuffixTreeTests.java
@@ -7,6 +7,7 @@
 import com.jwetherell.algorithms.data_structures.SuffixTree;
 import com.jwetherell.algorithms.data_structures.test.common.SuffixTreeTest;
 
+@SuppressWarnings("static-method")
 public class SuffixTreeTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/SuffixTrieTests.java b/src/com/jwetherell/algorithms/data_structures/test/SuffixTrieTests.java
@@ -7,6 +7,7 @@
 import com.jwetherell.algorithms.data_structures.SuffixTrie;
 import com.jwetherell.algorithms.data_structures.test.common.SuffixTreeTest;
 
+@SuppressWarnings("static-method")
 public class SuffixTrieTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/TreapTests.java b/src/com/jwetherell/algorithms/data_structures/test/TreapTests.java
@@ -14,6 +14,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class TreapTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/TreeMapTests.java b/src/com/jwetherell/algorithms/data_structures/test/TreeMapTests.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class TreeMapTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/TrieMapTests.java b/src/com/jwetherell/algorithms/data_structures/test/TrieMapTests.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class TrieMapTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/TrieTests.java b/src/com/jwetherell/algorithms/data_structures/test/TrieTests.java
@@ -13,6 +13,7 @@
 import com.jwetherell.algorithms.data_structures.test.common.Utils.TestData;
 import com.jwetherell.algorithms.data_structures.test.common.Utils.Type;
 
+@SuppressWarnings("static-method")
 public class TrieTests {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/data_structures/test/common/Utils.java b/src/com/jwetherell/algorithms/data_structures/test/common/Utils.java
@@ -5,7 +5,7 @@
 
 public class Utils {
 
-    public static enum Type {Integer, String};
+    public static enum Type {Integer, String}
 
     public static void handleError(Object obj) {
         System.err.println(obj.toString());
diff --git a/src/com/jwetherell/algorithms/data_structures/timing/DataStructuresTiming.java b/src/com/jwetherell/algorithms/data_structures/timing/DataStructuresTiming.java
@@ -55,7 +55,7 @@ public class DataStructuresTiming {
     private static int testIndex = 0; // Index into the tests
     private static int testNumber = 0; // Number of aggregate tests which have been run
 
-    private static enum Type {Integer, String};
+    private static enum Type {Integer, String}
 
     public static void main(String[] args) {
         System.out.println("Starting tests.");
@@ -1582,7 +1582,7 @@ private static <K,V> boolean testJavaMap(java.util.Map<K,V> map, Type keyType, S
         return true;
     }
 
-    private static final String getTestResults(int testNumber, String[] names, long[][] results) {
+    private static final String getTestResults(int number, String[] names, long[][] results) {
         StringBuilder resultsBuilder = new StringBuilder();
         String format = "%-32s %-10s %-15s %-15s %-20s %-15s %-15s\n";
         Formatter formatter = new Formatter(resultsBuilder, Locale.US);
@@ -1600,7 +1600,7 @@ private static final String getTestResults(int testNumber, String[] names, long[
             long[] result = results[i];
             if (name != null && result != null) {
                 double addTime = result[0] / MILLIS;
-                addTime /= testNumber;
+                addTime /= number;
                 String addTimeString = null;
                 if (addTime > MINUTES) {
                     addTime /= MINUTES;
@@ -1613,7 +1613,7 @@ private static final String getTestResults(int testNumber, String[] names, long[
                 }
 
                 double removeTime = result[1] / MILLIS;
-                removeTime /= testNumber;
+                removeTime /= number;
                 String removeTimeString = null;
                 if (removeTime > MINUTES) {
                     removeTime /= MINUTES;
@@ -1627,7 +1627,7 @@ private static final String getTestResults(int testNumber, String[] names, long[
 
                 // sorted
                 double addSortedTime = result[2] / MILLIS;
-                addSortedTime /= testNumber;
+                addSortedTime /= number;
                 String sortedAddTimeString = null;
                 if (addSortedTime > MINUTES) {
                     addSortedTime /= MINUTES;
@@ -1640,7 +1640,7 @@ private static final String getTestResults(int testNumber, String[] names, long[
                 }
 
                 double removeSortedTime = result[3] / MILLIS;
-                removeSortedTime /= testNumber;
+                removeSortedTime /= number;
                 String sortedRemoveTimeString = null;
                 if (removeSortedTime > MINUTES) {
                     removeSortedTime /= MINUTES;
@@ -1653,7 +1653,7 @@ private static final String getTestResults(int testNumber, String[] names, long[
                 }
 
                 double lookupTime = result[4] / MILLIS;
-                lookupTime /= testNumber;
+                lookupTime /= number;
                 String lookupTimeString = null;
                 if (lookupTime > MINUTES) {
                     lookupTime /= MINUTES;
@@ -1666,7 +1666,7 @@ private static final String getTestResults(int testNumber, String[] names, long[
                 }
 
                 double size = result[5];
-                size /= testNumber;
+                size /= number;
                 String sizeString = null;
                 if (size > MB) {
                     size = size / MB;
diff --git a/src/com/jwetherell/algorithms/graph/test/Graphs.java b/src/com/jwetherell/algorithms/graph/test/Graphs.java
@@ -23,6 +23,7 @@
 import com.jwetherell.algorithms.graph.Prim;
 import com.jwetherell.algorithms.graph.TopologicalSort;
 
+@SuppressWarnings("static-method")
 public class Graphs {
 
     private static int debug = 0; // Debug level. 0=None, 1=Some
@@ -849,11 +850,11 @@ public void topologicalSortOnDirectedGraph() {
             Graph.Edge<Integer> ce4_5 = new Graph.Edge<Integer>(6, cv4, cv5);
             edges.add(ce4_5);
 
-            Graph<Integer> directed = new Graph<Integer>(Graph.TYPE.DIRECTED, verticies, edges);
-            if (debug > 0) System.out.println(directed.toString());
+            Graph<Integer> digraph = new Graph<Integer>(Graph.TYPE.DIRECTED, verticies, edges);
+            if (debug > 0) System.out.println(digraph.toString());
 
             System.out.println("Topological sort of the directed graph.");
-            List<Graph.Vertex<Integer>> results = TopologicalSort.sort(directed);
+            List<Graph.Vertex<Integer>> results = TopologicalSort.sort(digraph);
             if (debug > 0) System.out.println("result=" + results);
             assertTrue("Topological sort error. results="+results, results.size()!=0);
 
diff --git a/src/com/jwetherell/algorithms/mathematics/test/Mathematics.java b/src/com/jwetherell/algorithms/mathematics/test/Mathematics.java
@@ -15,6 +15,7 @@
 import com.jwetherell.algorithms.mathematics.Multiplication;
 import com.jwetherell.algorithms.mathematics.Primes;
 
+@SuppressWarnings("static-method")
 public class Mathematics {
 
     private static final int MIN = 1;
diff --git a/src/com/jwetherell/algorithms/numbers/test/Numbers.java b/src/com/jwetherell/algorithms/numbers/test/Numbers.java
@@ -10,6 +10,7 @@
 import com.jwetherell.algorithms.numbers.Integers;
 import com.jwetherell.algorithms.numbers.Longs;
 
+@SuppressWarnings("static-method")
 public class Numbers {
 
     private static final Random RANDOM = new Random();
diff --git a/src/com/jwetherell/algorithms/search/test/Search.java b/src/com/jwetherell/algorithms/search/test/Search.java
@@ -9,6 +9,7 @@
 import com.jwetherell.algorithms.search.LinearSearch;
 import com.jwetherell.algorithms.search.QuickSelect;
 
+@SuppressWarnings("static-method")
 public class Search {
 
     private static final int           SIZE            = 9999;
diff --git a/src/com/jwetherell/algorithms/sequence/test/Sequences.java b/src/com/jwetherell/algorithms/sequence/test/Sequences.java
@@ -11,6 +11,7 @@
 import com.jwetherell.algorithms.sequence.LongestCommonSubsequence;
 import com.jwetherell.algorithms.sequence.TotalOfSequence;
 
+@SuppressWarnings("static-method")
 public class Sequences {
 
     @Test
diff --git a/src/com/jwetherell/algorithms/sorts/test/Sorts.java b/src/com/jwetherell/algorithms/sorts/test/Sorts.java
@@ -16,6 +16,7 @@
 import com.jwetherell.algorithms.sorts.RadixSort;
 import com.jwetherell.algorithms.sorts.ShellSort;
 
+@SuppressWarnings("static-method")
 public class Sorts {
 
     private static final Random RANDOM = new Random();
diff --git a/src/com/jwetherell/algorithms/strings/test/Strings.java b/src/com/jwetherell/algorithms/strings/test/Strings.java
@@ -9,6 +9,7 @@
 
 import com.jwetherell.algorithms.strings.StringFunctions;
 
+@SuppressWarnings("static-method")
 public class Strings {
 
     @Test
