Merge into master from pull request #434:

Major oversight in test and typo (#434)
floodlight · Oct 16, 2015 · 6aa62c3 · 6aa62c3
2 parents 0e761f7 + 2f620ff
commit 6aa62c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/MacAddress.java b/java_gen/pre-written/src/main/java/org/projectfloodlight/openflow/types/MacAddress.java
@@ -80,7 +80,7 @@ public static MacAddress of(@Nonnull final String macString) throws IllegalArgum
         Preconditions.checkArgument(macString.length() == MAC_STRING_LENGTH,
                 FORMAT_ERROR + macString);
         final char separator = macString.charAt(2);
-        Preconditions.checkArgument(separator == ':' || separator == '0',
+        Preconditions.checkArgument(separator == ':' || separator == '-',
                 FORMAT_ERROR + macString + " (invalid separator)");
 
         int index = 0;

diff --git a/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/MacAddressTest.java b/java_gen/pre-written/src/test/java/org/projectfloodlight/openflow/types/MacAddressTest.java
@@ -62,15 +62,14 @@ public class MacAddressTest {
     @Test
     public void testOfString() {
         testOfStringForArray(testColonStrings);
-        testOfStringForArray(testColonStrings);
+        testOfStringForArray(testHyphenStrings);
     }
 
     private void testOfStringForArray(String [] strings) {
         for(int i=0; i < testAddresses.length; i++ ) {
             MacAddress ip = MacAddress.of(strings[i]);
             assertEquals(testInts[i], ip.getLong());
             assertArrayEquals(testAddresses[i], ip.getBytes());
-            assertEquals(strings[i], ip.toString());
         }
     }