svn commit: r1103600 - /lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java

[sh...@apache.org]

Author: shaie
Date: Mon May 16 03:09:17 2011
New Revision: 1103600

URL: http://svn.apache.org/viewvc?rev=1103600&view=rev
Log:
use assertArraysEqual instead of the deprecated version

Modified:
    lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java

Modified: lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java?rev=1103600&r1=1103599&r2=1103600&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java (original)
+++ lucene/dev/branches/branch_3x/lucene/contrib/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java Mon May 16 03:09:17 2011
@@ -217,11 +217,11 @@ public class TestGrouping extends Lucene
     };
   }
 
-  private Comparable[] fillFields(GroupDoc d, Sort sort) {
+  private Comparable<?>[] fillFields(GroupDoc d, Sort sort) {
     final SortField[] sortFields = sort.getSort();
-    final Comparable[] fields = new Comparable[sortFields.length];
+    final Comparable<?>[] fields = new Comparable[sortFields.length];
     for(int fieldIDX=0;fieldIDX<sortFields.length;fieldIDX++) {
-      final Comparable c;
+      final Comparable<?> c;
       final SortField sf = sortFields[fieldIDX];
       if (sf.getField().equals("sort1")) {
         c = d.sort1;
@@ -253,7 +253,7 @@ public class TestGrouping extends Lucene
     Arrays.sort(groupDocs, groupSortComp);
     final HashMap<String,List<GroupDoc>> groups = new HashMap<String,List<GroupDoc>>();
     final List<String> sortedGroups = new ArrayList<String>();
-    final List<Comparable[]> sortedGroupFields = new ArrayList<Comparable[]>();
+    final List<Comparable<?>[]> sortedGroupFields = new ArrayList<Comparable<?>[]>();
 
     int totalHitCount = 0;
 
@@ -517,7 +517,7 @@ public class TestGrouping extends Lucene
       final GroupDocs expectedGroup = expected.groups[groupIDX];
       final GroupDocs actualGroup = actual.groups[groupIDX];
       assertEquals(expectedGroup.groupValue, actualGroup.groupValue);
-      assertEquals(expectedGroup.groupSortValues, actualGroup.groupSortValues);
+      assertArrayEquals(expectedGroup.groupSortValues, actualGroup.groupSortValues);
 
       // TODO
       // assertEquals(expectedGroup.maxScore, actualGroup.maxScore);
@@ -533,7 +533,7 @@ public class TestGrouping extends Lucene
         assertEquals(expectedFD.doc, docIDtoID[actualFD.doc]);
         // TODO
         // assertEquals(expectedFD.score, actualFD.score);
-        assertEquals(expectedFD.fields, actualFD.fields);
+        assertArrayEquals(expectedFD.fields, actualFD.fields);
       }
     }
   }