feat : change test case

Author: sean-k1

src/main/java/com/github/shyiko/mysql/binlog/event/deserialization/TableMapEventMetadataDeserializer.java

@@ -69,7 +69,7 @@ public TableMapEventMetadata deserialize(ByteArrayInputStream inputStream, int n
             switch (fieldType) {
                 case SIGNEDNESS:
                     result.setSignedness(
-                        convertColumnOrder(readBooleanList(inputStream, nNumericColumns), nColumns,
+                        convertAllColumnOrder(readBooleanList(inputStream, nNumericColumns), nColumns,
                                            numericColumIdxList));
                     break;
                 case DEFAULT_CHARSET:
@@ -113,21 +113,19 @@ public TableMapEventMetadata deserialize(ByteArrayInputStream inputStream, int n
         return result;
     }
 
-    private static BitSet convertColumnOrder(BitSet numericOrderBitSet, int nColumns,
+    private static BitSet convertAllColumnOrder(BitSet numericOrderBitSet, int nColumns,
                                              List<Integer> numericColumIdxList) {
         // Case SIGNEDNESS The order of indices in the Inputstream corresponds to the order of numeric columns
         // So we need to change the index to all columns index (include non numeric type columns)
-
         BitSet columnOrderBitSet = new BitSet();
         int position = 0;
         for (int columnIndex = 0; columnIndex < nColumns; columnIndex++) {
-            if (numericColumIdxList.contains(columnIndex)) {
-                if (numericOrderBitSet.get(position++)) {
-                    columnOrderBitSet.set(columnIndex);
-                }
-
+            if (!numericColumIdxList.contains(columnIndex)) {
+                continue;
+            }
+            if (numericOrderBitSet.get(position++)) {
+                columnOrderBitSet.set(columnIndex);
             }
-
         }
         return columnOrderBitSet;
     }

src/test/java/com/github/shyiko/mysql/binlog/event/deserialization/TableMapEventMetadataDeserializerTest.java

@@ -2,6 +2,7 @@
 
 import com.github.shyiko.mysql.binlog.event.TableMapEventMetadata;
 import com.github.shyiko.mysql.binlog.io.ByteArrayInputStream;
+
 import org.testng.annotations.Test;
 
 import java.io.IOException;
@@ -29,26 +30,35 @@ public class TableMapEventMetadataDeserializerTest {
      */
     @Test
     public void deserialize() throws IOException {
-        byte[] metadataIncludingUnknownFieldType = {1, 2, -1, 2, 9, 83, 6, 63, 7, 63, 8, 63, 9, 63};
+        byte[] metadataIncludingUnknownFieldType = { 1, 1, 29, 2, 9, 83, 6, 63, 7, 63, 8, 63, 9, 63 };
         TableMapEventMetadataDeserializer deserializer = new TableMapEventMetadataDeserializer();
         // suppose there Columns idx likes
-        // col 0, 2, 4, 6, 7, 9, 11, 13 unsigned
-        // col 1 ,3 ..., 22 signed or non numeric
-        List<Integer> numericIndexWithAllColumn = Arrays.asList(0, 2, 4, 6, 7, 9, 11, 13);
+        // col 0, 1, 10, 11,,, non numeric
+        // col 2, 3, 4, 8 signed
+        // col 5, 6, 7, 9 unsigned
+        List<Integer> numericIndexWithAllColumn = Arrays.asList(2, 3, 4, 5, 6, 7, 8, 9);
         TableMapEventMetadata tableMapEventMetadata =
-            deserializer.deserialize(new ByteArrayInputStream(metadataIncludingUnknownFieldType), 23, 8, numericIndexWithAllColumn);
+            deserializer.deserialize(new ByteArrayInputStream(metadataIncludingUnknownFieldType), 23, 8,
+                                     numericIndexWithAllColumn);
 
         Map<Integer, Integer> expectedCharsetCollations = new LinkedHashMap<>();
         expectedCharsetCollations.put(6, 63);
         expectedCharsetCollations.put(7, 63);
         expectedCharsetCollations.put(8, 63);
         expectedCharsetCollations.put(9, 63);
 
+        // metadataIncludingUnknownFieldType[2] = 29
+        // bin 00011101
+        // 2, 3, 4, 5(hit), 6(hit), 7(hit), 8, 9(hit
         BitSet expectAllColumnBitSet = new BitSet();
-        for(int i=0; i< numericIndexWithAllColumn.size(); i++)expectAllColumnBitSet.set(numericIndexWithAllColumn.get(i));
+        expectAllColumnBitSet.set(5);
+        expectAllColumnBitSet.set(6);
+        expectAllColumnBitSet.set(7);
+        expectAllColumnBitSet.set(9);
 
         assertEquals(tableMapEventMetadata.getDefaultCharset().getDefaultCharsetCollation(), 83);
-        assertEquals(tableMapEventMetadata.getDefaultCharset().getCharsetCollations(), expectedCharsetCollations);
+        assertEquals(tableMapEventMetadata.getDefaultCharset().getCharsetCollations(),
+                     expectedCharsetCollations);
         assertEquals(tableMapEventMetadata.getSignedness(), expectAllColumnBitSet);
     }
 }