X-Git-Url: http://git.rot13.org/?p=zxing.git;a=blobdiff_plain;f=core%2Ftest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Foned%2Frss%2Fexpanded%2FBitArrayBuilderTest.java;fp=core%2Ftest%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Foned%2Frss%2Fexpanded%2FBitArrayBuilderTest.java;h=760c97d56e24857a8298c89f5d885b86fb60c059;hp=92cc13c43345e472c46c598badf251e668bbdb1e;hb=e5d03a79a458340b69a57914a352f0a8841cdf69;hpb=a932cce57fabafd18a5db770f2c87afbd72e31b9

diff --git a/core/test/src/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java b/core/test/src/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java
index 92cc13c4..760c97d5 100644
--- a/core/test/src/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java
+++ b/core/test/src/com/google/zxing/oned/rss/expanded/BitArrayBuilderTest.java
@@ -31,15 +31,17 @@ import java.util.Vector;
 import com.google.zxing.common.BitArray;
 import com.google.zxing.oned.rss.DataCharacter;
 
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * @author Pablo Orduña, University of Deusto (pablo.orduna@deusto.es)
  * @author Eduardo Castillejo, University of Deusto (eduardo.castillejo@deusto.es)
  */
-public final class BitArrayBuilderTest extends TestCase {
+public final class BitArrayBuilderTest extends Assert {
 
-  public void testBuildBitArray1(){
+  @Test
+  public void testBuildBitArray1() {
     int [][] pairValues = {
         { 19 },
         { 673, 16 }
@@ -50,13 +52,13 @@ public final class BitArrayBuilderTest extends TestCase {
     checkBinary(pairValues, expected);
   }
 
-  private void checkBinary(int[][] pairValues, String expected) {
+  private static void checkBinary(int[][] pairValues, String expected) {
     BitArray binary = buildBitArray(pairValues);
     assertEquals(expected, binary.toString());
   }
 
   private static BitArray buildBitArray(int[][] pairValues) {
-    Vector pairs = new Vector();
+    Vector<ExpandedPair> pairs = new Vector<ExpandedPair>();
     for(int i = 0; i < pairValues.length; ++i){
       int [] pair = pairValues[i];
 
@@ -80,7 +82,6 @@ public final class BitArrayBuilderTest extends TestCase {
       pairs.add(expandedPair);
     }
 
-    BitArray binary = BitArrayBuilder.buildBitArray(pairs);
-    return binary;
+    return BitArrayBuilder.buildBitArray(pairs);
   }
 }