Move unit tests to a directory structure that follows the classes under test
Change-Id: Ibfa840e4aab4100125b4ead0f864f5ad1bea18b6
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/AreaIdTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgp/AreaIdTest.java
deleted file mode 100644
index 3e7c654..0000000
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/AreaIdTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.bgp;
-
-import com.google.common.testing.EqualsTester;
-
-import org.junit.Test;
-import org.onosproject.bgpio.types.AreaIDTlv;
-
-/**
- * Test for AreaID Tlv.
- */
-public class AreaIdTest {
- private final int value1 = 10;
- private final int value2 = 20;
- private final AreaIDTlv tlv1 = AreaIDTlv.of(value1);
- private final AreaIDTlv sameAsTlv1 = AreaIDTlv.of(value1);
- private final AreaIDTlv tlv2 = AreaIDTlv.of(value2);
-
- @Test
- public void testEquality() {
- new EqualsTester()
- .addEqualityGroup(tlv1, sameAsTlv1)
- .addEqualityGroup(tlv2)
- .testEquals();
- }
-}
\ No newline at end of file
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/IsIsNonPseudonodeTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgp/IsIsNonPseudonodeTest.java
deleted file mode 100644
index 8112b51..0000000
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/IsIsNonPseudonodeTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2014-2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.bgp;
-
-import org.junit.Test;
-import org.onosproject.bgpio.types.IsIsNonPseudonode;
-
-import com.google.common.testing.EqualsTester;
-
-/**
- * Test for IsIsNonPseudonode Tlv.
- */
-public class IsIsNonPseudonodeTest {
- private final byte[] value1 = new byte[] {0x19, 0x00, (byte) 0x95, 0x01, (byte) 0x90, 0x58};
- private final byte[] value2 = new byte[] {0x19, 0x00, (byte) 0x95, 0x01, (byte) 0x90, 0x59};
- private final IsIsNonPseudonode tlv1 = IsIsNonPseudonode.of(value1);
- private final IsIsNonPseudonode sameAsTlv1 = IsIsNonPseudonode.of(value1);
- private final IsIsNonPseudonode tlv2 = IsIsNonPseudonode.of(value2);
-
- @Test
- public void basics() {
- new EqualsTester()
- .addEqualityGroup(tlv1, sameAsTlv1)
- .addEqualityGroup(tlv2)
- .testEquals();
- }
-}
\ No newline at end of file
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfNonPseudonodeTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfNonPseudonodeTest.java
deleted file mode 100644
index 1900291..0000000
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfNonPseudonodeTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2014-2015 Open Networking Laboratory
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.onosproject.bgp;
-
-import org.junit.Test;
-import org.onosproject.bgpio.types.OSPFNonPseudonode;
-
-import com.google.common.testing.EqualsTester;
-
-/**
- * Test for OSPFNonPseudonode Tlv.
- */
-public class OspfNonPseudonodeTest {
- private final int value1 = 0x12121212;
- private final int value2 = 0x12121211;
- private final OSPFNonPseudonode tlv1 = OSPFNonPseudonode.of(value1);
- private final OSPFNonPseudonode sameAsTlv1 = OSPFNonPseudonode.of(value1);
- private final OSPFNonPseudonode tlv2 = OSPFNonPseudonode.of(value2);
-
- @Test
- public void basics() {
- new EqualsTester()
- .addEqualityGroup(tlv1, sameAsTlv1)
- .addEqualityGroup(tlv2)
- .testEquals();
- }
-}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BGPKeepaliveMsgTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BGPKeepaliveMsgTest.java
similarity index 90%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BGPKeepaliveMsgTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BGPKeepaliveMsgTest.java
index 57ab9d9..68ce307 100755
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BGPKeepaliveMsgTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BGPKeepaliveMsgTest.java
@@ -13,22 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
+package org.onosproject.bgpio.protocol;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.junit.Test;
import org.onosproject.bgpio.exceptions.BGPParseException;
-import org.onosproject.bgpio.protocol.BGPFactories;
-import org.onosproject.bgpio.protocol.BGPKeepaliveMsg;
-import org.onosproject.bgpio.protocol.BGPMessage;
-import org.onosproject.bgpio.protocol.BGPMessageReader;
import org.onosproject.bgpio.types.BGPHeader;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
+
/**
* Test case for BGP KEEPALIVE Message.
*/
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BGPOpenMsgTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BGPOpenMsgTest.java
similarity index 97%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BGPOpenMsgTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BGPOpenMsgTest.java
index d010857..d521017 100755
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BGPOpenMsgTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BGPOpenMsgTest.java
@@ -13,22 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
+package org.onosproject.bgpio.protocol;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.junit.Test;
import org.onosproject.bgpio.exceptions.BGPParseException;
-import org.onosproject.bgpio.protocol.BGPFactories;
-import org.onosproject.bgpio.protocol.BGPMessage;
-import org.onosproject.bgpio.protocol.BGPMessageReader;
-import org.onosproject.bgpio.protocol.BGPOpenMsg;
import org.onosproject.bgpio.types.BGPHeader;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
+
/**
* Test cases for BGP Open Message.
*/
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpNotificationMsgTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java
similarity index 97%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpNotificationMsgTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java
index d3e6e49..78edf13 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpNotificationMsgTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/protocol/BgpNotificationMsgTest.java
@@ -13,22 +13,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
+package org.onosproject.bgpio.protocol;
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.junit.Test;
import org.onosproject.bgpio.exceptions.BGPParseException;
-import org.onosproject.bgpio.protocol.BGPFactories;
-import org.onosproject.bgpio.protocol.BGPMessage;
-import org.onosproject.bgpio.protocol.BGPMessageReader;
-import org.onosproject.bgpio.protocol.BGPNotificationMsg;
import org.onosproject.bgpio.types.BGPHeader;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
+
/**
* Test for Notification message.
*/
@@ -225,4 +221,4 @@
buf.readBytes(testNotificationMsg, 0, iReadLen);
assertThat(testNotificationMsg, is(notificationMsg));
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java
new file mode 100644
index 0000000..6a9e2ec
--- /dev/null
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AreaIdTest.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.bgpio.types;
+
+import org.junit.Test;
+
+import com.google.common.testing.EqualsTester;
+
+/**
+ * Test for AreaID Tlv.
+ */
+public class AreaIdTest {
+ private final int value1 = 10;
+ private final int value2 = 20;
+ private final AreaIDTlv tlv1 = AreaIDTlv.of(value1);
+ private final AreaIDTlv sameAsTlv1 = AreaIDTlv.of(value1);
+ private final AreaIDTlv tlv2 = AreaIDTlv.of(value2);
+
+ @Test
+ public void testEquality() {
+ new EqualsTester()
+ .addEqualityGroup(tlv1, sameAsTlv1)
+ .addEqualityGroup(tlv2)
+ .testEquals();
+ }
+
+ /**
+ * Test for OSPFNonPseudonode Tlv.
+ */
+ public static class OspfNonPseudonodeTest {
+ private final int value1 = 0x12121212;
+ private final int value2 = 0x12121211;
+ private final OSPFNonPseudonode tlv1 = OSPFNonPseudonode.of(value1);
+ private final OSPFNonPseudonode sameAsTlv1 = OSPFNonPseudonode.of(value1);
+ private final OSPFNonPseudonode tlv2 = OSPFNonPseudonode.of(value2);
+
+ @Test
+ public void basics() {
+ new EqualsTester()
+ .addEqualityGroup(tlv1, sameAsTlv1)
+ .addEqualityGroup(tlv2)
+ .testEquals();
+ }
+ }
+
+ /**
+ * Test for IsIsNonPseudonode Tlv.
+ */
+ public static class IsIsNonPseudonodeTest {
+ private final byte[] value1 = new byte[] {0x19, 0x00, (byte) 0x95, 0x01, (byte) 0x90, 0x58};
+ private final byte[] value2 = new byte[] {0x19, 0x00, (byte) 0x95, 0x01, (byte) 0x90, 0x59};
+ private final IsIsNonPseudonode tlv1 = IsIsNonPseudonode.of(value1);
+ private final IsIsNonPseudonode sameAsTlv1 = IsIsNonPseudonode.of(value1);
+ private final IsIsNonPseudonode tlv2 = IsIsNonPseudonode.of(value2);
+
+ @Test
+ public void basics() {
+ new EqualsTester()
+ .addEqualityGroup(tlv1, sameAsTlv1)
+ .addEqualityGroup(tlv2)
+ .testEquals();
+ }
+ }
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/As4PathTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java
similarity index 96%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/As4PathTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java
index 96d05bf..3ea56b6 100755
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/As4PathTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/As4PathTest.java
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.onosproject.bgpio.types.As4Path;
import com.google.common.testing.EqualsTester;
@@ -53,4 +52,4 @@
.addEqualityGroup(attr4)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/AsPathTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java
similarity index 96%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/AsPathTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java
index 792164e..e56ec5a 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/AsPathTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AsPathTest.java
@@ -13,13 +13,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import java.util.ArrayList;
import java.util.List;
import org.junit.Test;
-import org.onosproject.bgpio.types.AsPath;
import com.google.common.testing.EqualsTester;
@@ -53,4 +52,4 @@
.addEqualityGroup(attr4)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/AutonomousSystemTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/AutonomousSystemTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java
index c41408d..1695583 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/AutonomousSystemTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/AutonomousSystemTest.java
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
-
-import com.google.common.testing.EqualsTester;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.AutonomousSystemTlv;
+
+import com.google.common.testing.EqualsTester;
/**
* Test for AutonomousSystem Tlv.
@@ -37,4 +36,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BGPLSIdentifierTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BGPLSIdentifierTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BGPLSIdentifierTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BGPLSIdentifierTest.java
index 5f35781..f3355d3 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BGPLSIdentifierTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/BGPLSIdentifierTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.BGPLSIdentifierTlv;
import com.google.common.testing.EqualsTester;
@@ -37,4 +36,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/IPReachabilityInformationTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/IPReachabilityInformationTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java
index 81f4b72..7bea518 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/IPReachabilityInformationTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPReachabilityInformationTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.IPReachabilityInformationTlv;
import com.google.common.testing.EqualsTester;
@@ -38,4 +37,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/IPv4AddressTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/IPv4AddressTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java
index f3a0469..fdb7118 100755
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/IPv4AddressTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv4AddressTest.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
import org.onlab.packet.Ip4Address;
-import org.onosproject.bgpio.types.IPv4AddressTlv;
import com.google.common.testing.EqualsTester;
@@ -38,4 +37,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/IPv6AddressTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/IPv6AddressTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java
index 2023093..781935b 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/IPv6AddressTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IPv6AddressTest.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
import org.onlab.packet.Ip6Address;
-import org.onosproject.bgpio.types.IPv6AddressTlv;
import com.google.common.testing.EqualsTester;
@@ -38,4 +37,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/IsIsPseudonodeTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/IsIsPseudonodeTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java
index bbc9e6a..a2a7c2b 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/IsIsPseudonodeTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/IsIsPseudonodeTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.IsIsPseudonode;
import com.google.common.testing.EqualsTester;
@@ -37,4 +36,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/LinkLocalRemoteIdentifiersTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/LinkLocalRemoteIdentifiersTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java
index 22b9aba..f1510b1 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/LinkLocalRemoteIdentifiersTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/LinkLocalRemoteIdentifiersTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.LinkLocalRemoteIdentifiersTlv;
import com.google.common.testing.EqualsTester;
@@ -37,4 +36,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/NextHopTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/NextHopTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java
index 109197b..799419a 100755
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/NextHopTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/NextHopTest.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
import org.onlab.packet.Ip4Address;
-import org.onosproject.bgpio.types.NextHop;
import com.google.common.testing.EqualsTester;
@@ -38,4 +37,4 @@
.addEqualityGroup(attr2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/OriginTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/OriginTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java
index 88261ad..da7b557 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/OriginTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OriginTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.Origin;
import com.google.common.testing.EqualsTester;
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfPseudonodeTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/OspfPseudonodeTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java
index 55b1190..a800231 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfPseudonodeTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfPseudonodeTest.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
import org.onlab.packet.Ip4Address;
-import org.onosproject.bgpio.types.OSPFPseudonode;
import com.google.common.testing.EqualsTester;
@@ -40,4 +39,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfRouteTypeTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/OspfRouteTypeTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java
index e2fd1ea..859bdbe 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/OspfRouteTypeTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/OspfRouteTypeTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types;
import org.junit.Test;
-import org.onosproject.bgpio.types.OSPFRouteTypeTlv;
import com.google.common.testing.EqualsTester;
@@ -37,4 +36,4 @@
.addEqualityGroup(tlv2)
.testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpAttrNodeFlagBitTlvTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpAttrNodeFlagBitTlvTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java
index 5f1411f..4efb7f5 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpAttrNodeFlagBitTlvTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrNodeFlagBitTlvTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
-import org.onosproject.bgpio.types.attr.BgpAttrNodeFlagBitTlv;
import com.google.common.testing.EqualsTester;
@@ -48,4 +47,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpAttrRouterIdV6Test.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpAttrRouterIdV6Test.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java
index 72ca5db..16ca58e 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpAttrRouterIdV6Test.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpAttrRouterIdV6Test.java
@@ -13,11 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
import org.onlab.packet.Ip6Address;
-import org.onosproject.bgpio.types.attr.BgpAttrRouterIdV6;
import com.google.common.testing.EqualsTester;
@@ -47,4 +46,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrIgpMetricTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java
similarity index 93%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrIgpMetricTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java
index 32280a79..ef1cfce 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrIgpMetricTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrIgpMetricTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
-import org.onosproject.bgpio.types.attr.BgpLinkAttrIgpMetric;
import com.google.common.testing.EqualsTester;
@@ -41,4 +40,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMplsProtocolMaskTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java
similarity index 92%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMplsProtocolMaskTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java
index d218334..c0d7f98 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrMplsProtocolMaskTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrMplsProtocolMaskTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
-import org.onosproject.bgpio.types.attr.BgpLinkAttrMplsProtocolMask;
import com.google.common.testing.EqualsTester;
@@ -40,4 +39,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrProtectionTypeTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrProtectionTypeTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java
index 89f97a8..2fb7635 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpLinkAttrProtectionTypeTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpLinkAttrProtectionTypeTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
-import org.onosproject.bgpio.types.attr.BgpLinkAttrProtectionType;
import com.google.common.testing.EqualsTester;
@@ -54,4 +53,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrIgpFlagsTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java
similarity index 95%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrIgpFlagsTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java
index fd718f7..535518f 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrIgpFlagsTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrIgpFlagsTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
-import org.onosproject.bgpio.types.attr.BgpPrefixAttrIgpFlags;
import com.google.common.testing.EqualsTester;
@@ -51,4 +50,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrMetricTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java
similarity index 92%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrMetricTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java
index 5a3662b..fe6079f 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrMetricTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrMetricTest.java
@@ -13,10 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
-import org.onosproject.bgpio.types.attr.BgpPrefixAttrMetric;
import com.google.common.testing.EqualsTester;
@@ -37,4 +36,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}
diff --git a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOspfFwdAddrTest.java b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java
similarity index 94%
rename from bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOspfFwdAddrTest.java
rename to bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java
index f736bea..f6fe39f 100644
--- a/bgp/bgpio/src/test/java/org/onosproject/bgp/BgpPrefixAttrOspfFwdAddrTest.java
+++ b/bgp/bgpio/src/test/java/org/onosproject/bgpio/types/attr/BgpPrefixAttrOspfFwdAddrTest.java
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.onosproject.bgp;
+package org.onosproject.bgpio.types.attr;
import org.junit.Test;
import org.onlab.packet.Ip4Address;
import org.onlab.packet.Ip6Address;
-import org.onosproject.bgpio.types.attr.BgpPrefixAttrOspfFwdAddr;
import com.google.common.testing.EqualsTester;
@@ -49,4 +48,4 @@
new EqualsTester().addEqualityGroup(data, sameAsData)
.addEqualityGroup(diffData).testEquals();
}
-}
\ No newline at end of file
+}