Default experimenters moved to separate bundle + unit tests
[openflowjava.git] / openflow-protocol-impl / src / test / java / org / opendaylight / openflowjava / protocol / impl / serialization / factories / OF10StatsRequestInputFactoryTest.java
index 845d7c2a462473919f6eebaa0ee2c6aec80e1e6e..5909067e512a02510d39501a88ed6b301e9d9926 100644 (file)
@@ -18,8 +18,8 @@ import org.opendaylight.openflowjava.protocol.api.extensibility.OFSerializer;
 import org.opendaylight.openflowjava.protocol.api.extensibility.SerializerRegistry;\r
 import org.opendaylight.openflowjava.protocol.impl.serialization.SerializerRegistryImpl;\r
 import org.opendaylight.openflowjava.protocol.impl.util.BufferHelper;\r
-import org.opendaylight.openflowjava.protocol.impl.util.ByteBufUtils;\r
-import org.opendaylight.openflowjava.protocol.impl.util.EncodeConstants;\r
+import org.opendaylight.openflowjava.util.ByteBufUtils;\r
+import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;\r
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;\r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowWildcardsV10;\r
@@ -145,7 +145,7 @@ public class OF10StatsRequestInputFactoryTest {
         Assert.assertEquals("Wrong nw-dst", 167772162, out.readUnsignedInt());\r
         Assert.assertEquals("Wrong tp-src", 57, out.readUnsignedShort());\r
         Assert.assertEquals("Wrong tp-dst", 58, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong registry-id", 1, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong table-id", 1, out.readUnsignedByte());\r
         out.skipBytes(1);\r
         Assert.assertEquals("Wrong out-port", 42, out.readUnsignedShort());\r
         Assert.assertTrue("Unread data", out.readableBytes() == 0);\r
@@ -212,7 +212,7 @@ public class OF10StatsRequestInputFactoryTest {
         Assert.assertEquals("Wrong nw-dst", 167772162, out.readUnsignedInt());\r
         Assert.assertEquals("Wrong tp-src", 57, out.readUnsignedShort());\r
         Assert.assertEquals("Wrong tp-dst", 58, out.readUnsignedShort());\r
-        Assert.assertEquals("Wrong registry-id", 42, out.readUnsignedByte());\r
+        Assert.assertEquals("Wrong table-id", 42, out.readUnsignedByte());\r
         out.skipBytes(1);\r
         Assert.assertEquals("Wrong out-port", 6653, out.readUnsignedShort());\r
         Assert.assertTrue("Unread data", out.readableBytes() == 0);\r