Move unit tests to the package where the implementations are placed

Change-Id: I61f2bd76b0cdf270fa407b0cbb04d43f4f7f61aa

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepCloseMsg;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,17 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepErrorMsg;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,19 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepInitiateMsg;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
+
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.core.Is.is;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 
 
 public class PcepInitiateMsgExtTest {
 public class PcepInitiateMsgExtTest {
 
 

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepInitiateMsg;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,17 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Assert;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepKeepaliveMsg;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepLabelUpdateMsg;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,20 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepOpenMsg;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 /**
 /**
  * Test cases for PCEP OPEN Message.
  * Test cases for PCEP OPEN Message.
  */
  */

@@ -13,19 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepReportMsg;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 
 
 public class PcepReportMsgExtTest {
 public class PcepReportMsgExtTest {
 
 

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepReportMsg;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,16 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepTEReportMsg;
 
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.instanceOf;

@@ -13,22 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import static org.hamcrest.core.Is.is;
-import static org.hamcrest.Matchers.instanceOf;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
-
-import static org.hamcrest.MatcherAssert.assertThat;
-
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepUpdateMsg;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 
 
 /**
 /**
  *  Test cases for PCEP update message.
  *  Test cases for PCEP update message.

@@ -13,20 +13,16 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.core.Is.is;
+package org.onosproject.pcepio.protocol;
 
 
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffer;
 import org.jboss.netty.buffer.ChannelBuffers;
 import org.jboss.netty.buffer.ChannelBuffers;
-import static org.hamcrest.MatcherAssert.assertThat;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.exceptions.PcepParseException;
 import org.onosproject.pcepio.exceptions.PcepParseException;
-import org.onosproject.pcepio.protocol.PcepFactories;
-import org.onosproject.pcepio.protocol.PcepMessage;
-import org.onosproject.pcepio.protocol.PcepMessageReader;
-import org.onosproject.pcepio.protocol.PcepUpdateMsg;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 
 
 public class PcepUpdateMsgTest {
 public class PcepUpdateMsgTest {
     /**
     /**

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.AdministrativeGroupTlv;
 
 
 /**
 /**
  * Test of the AdministrativeGroupTlv.
  * Test of the AdministrativeGroupTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.AutonomousSystemTlv;
 
 
 /**
 /**
  * Test of the AutonomousSystemTlv.
  * Test of the AutonomousSystemTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.BGPLSidentifierTlv;
 
 
 /**
 /**
  * Test of the BGPLSidentifierTlv.
  * Test of the BGPLSidentifierTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.GmplsCapabilityTlv;
 
 
 /**
 /**
  * Test of the GmplsCapabilityTlv.
  * Test of the GmplsCapabilityTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IGPMetricTlv;
 
 
 /**
 /**
  * Test of the IGPMetricTlv.
  * Test of the IGPMetricTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4InterfaceAddressTlv;
 
 
 /**
 /**
  * Test of the IPv4InterfaceAddressTlv.
  * Test of the IPv4InterfaceAddressTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4NeighborAddressTlv;
 
 
 /**
 /**
  * Test of the IPv4NeighborAddressTlv.
  * Test of the IPv4NeighborAddressTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4SubObject;
 
 
 /**
 /**
  * Test of the IPv4SubObject.
  * Test of the IPv4SubObject.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4TERouterIdOfLocalNodeTlv;
 
 
 /**
 /**
  * Test of the IPv4TERouterIdOfLocalNodeTlv.
  * Test of the IPv4TERouterIdOfLocalNodeTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4TERouterIdOfRemoteNodeTlv;
 
 
 /**
 /**
  * Test of the IPv4TERouterIdOfRemoteNodeTlv.
  * Test of the IPv4TERouterIdOfRemoteNodeTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv6InterfaceAddressTlv;
 
 
 /**
 /**
  * Test of the IPv6InterfaceAddressTlv.
  * Test of the IPv6InterfaceAddressTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv6NeighborAddressTlv;
 
 
 /**
 /**
  * Test of the IPv6NeighborAddressTlv.
  * Test of the IPv6NeighborAddressTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv6SubObject;
 
 
 /**
 /**
  * Test of the IPv6SubObject.
  * Test of the IPv6SubObject.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv6TERouterIdofLocalNodeTlv;
 
 
 /**
 /**
  * Test of the IPv6TERouterIdofLocalNodeTlv.
  * Test of the IPv6TERouterIdofLocalNodeTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv6TERouterIdofRemoteNodeTlv;
 
 
 /**
 /**
  * Test of the IPv6TERouterIdofRemoteNodeTlv.
  * Test of the IPv6TERouterIdofRemoteNodeTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.ISISAreaIdentifierTlv;
 
 
 /**
 /**
  * Test of the ISISAreaIdentifierTlv.
  * Test of the ISISAreaIdentifierTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.LabelSubObject;
 
 
 /**
 /**
  * Test of the LabelSubObject.
  * Test of the LabelSubObject.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.LinkLocalRemoteIdentifiersTlv;
 
 
 /**
 /**
  * Test of the LinkLocalRemoteIdentifiersTlv.
  * Test of the LinkLocalRemoteIdentifiersTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.LinkNameTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for LinkNameTlv.
  * Equality test for LinkNameTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.LinkProtectionTypeTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the LinkProtectionTypeTlv.
  * Test of the LinkProtectionTypeTlv.

@@ -13,19 +13,13 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
 
 
 import java.util.LinkedList;
 import java.util.LinkedList;
 
 
-import org.onosproject.pcepio.types.LocalTENodeDescriptorsTlv;
-import org.onosproject.pcepio.types.AutonomousSystemTlv;
-import org.onosproject.pcepio.types.BGPLSidentifierTlv;
-import org.onosproject.pcepio.types.PcepValueType;
-
 /**
 /**
  * Test of the LocalTENodeDescriptorsTlv.
  * Test of the LocalTENodeDescriptorsTlv.
  */
  */

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.MPLSProtocolMaskTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the MPLSProtocolMaskTlv.
  * Test of the MPLSProtocolMaskTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.MaximumLinkBandwidthTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the MaximumLinkBandwidthTlv.
  * Test of the MaximumLinkBandwidthTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.MaximumReservableLinkBandwidthTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the MaximumReservableLinkBandwidthTlv.
  * Test of the MaximumReservableLinkBandwidthTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.NexthopIPv4addressTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for NexthopIPv4addressTlv.
  * Equality test for NexthopIPv4addressTlv.

@@ -14,12 +14,10 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.NexthopIPv6addressTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for NexthopIPv6addressTlv.
  * Equality test for NexthopIPv6addressTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.NexthopUnnumberedIPv4IDTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for NexthopUnnumberedIPv4IDTlv.
  * Equality test for NexthopUnnumberedIPv4IDTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.NodeFlagBitsTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the NodeFlagBitsTlv.
  * Test of the NodeFlagBitsTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.NodeNameTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the NodeNameTlv.
  * Test of the NodeNameTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
-
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.OSPFareaIDsubTlv;
 
 
 /**
 /**
  * Test of the OSPFareaIDsubTlv.
  * Test of the OSPFareaIDsubTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.OpaqueLinkAttributeTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the OpaqueLinkAttributeTlv.
  * Test of the OpaqueLinkAttributeTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PathKeySubObject;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the PathKeySubObject.
  * Test of the PathKeySubObject.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PathSetupTypeTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the PathSetupTypeTlv.
  * Test of the PathSetupTypeTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PceccCapabilityTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test of the PceccCapabilityTlv.
  * Test of the PceccCapabilityTlv.

@@ -14,12 +14,10 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PcepNaiIpv4Adjacency;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for PcepNaiIpv4Adjacency.
  * Equality test for PcepNaiIpv4Adjacency.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PcepNaiIpv4NodeId;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 public class PcepNaiIpv4NodeIdTest {
 public class PcepNaiIpv4NodeIdTest {
 
 

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PcepNaiIpv6Adjacency;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 public class PcepNaiIpv6AdjacencyTest {
 public class PcepNaiIpv6AdjacencyTest {
     private final byte[] localIpv6Addr1 = {(byte) 0x01010101 };
     private final byte[] localIpv6Addr1 = {(byte) 0x01010101 };
@@ -36,4 +34,4 @@ public class PcepNaiIpv6AdjacencyTest {
     public void basics() {
     public void basics() {
         new EqualsTester().addEqualityGroup(tlv1, tlv2).addEqualityGroup(tlv3).testEquals();
         new EqualsTester().addEqualityGroup(tlv1, tlv2).addEqualityGroup(tlv3).testEquals();
     }
     }
-}
\ No newline at end of file
+}

@@ -14,12 +14,10 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PcepNaiIpv6NodeId;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for PcepNaiIpv6NodeId.
  * Equality test for PcepNaiIpv6NodeId.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.PcepNaiUnnumberedAdjacencyIpv4;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 public class PcepNaiUnnumberedAdjacencyIpv4Test {
 public class PcepNaiUnnumberedAdjacencyIpv4Test {
 
 

@@ -13,17 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import java.util.LinkedList;
+package org.onosproject.pcepio.types;
 
 
+import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.AutonomousSystemTlv;
-import org.onosproject.pcepio.types.BGPLSidentifierTlv;
-import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.RemoteTENodeDescriptorsTlv;
 
 
-import com.google.common.testing.EqualsTester;
+import java.util.LinkedList;
 
 
 /**
 /**
  * Test case for Remote TE Node Descriptors tlv.
  * Test case for Remote TE Node Descriptors tlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.RouterIDSubTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for Router ID Sub tlv.
  * Test case for Router ID Sub tlv.

@@ -14,12 +14,10 @@
  * limitations under the License.
  * limitations under the License.
  */
  */
 
 
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.RoutingUniverseTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Equality test for RoutingUniverseTlv.
  * Equality test for RoutingUniverseTlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.SharedRiskLinkGroupTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for Shared Risk Link Group tlv.
  * Test case for Shared Risk Link Group tlv.

@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
+import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.junit.Test;
 import org.onosproject.pcepio.protocol.PcepNai;
 import org.onosproject.pcepio.protocol.PcepNai;
-import org.onosproject.pcepio.types.SrEroSubObject;
-
-import com.google.common.testing.EqualsTester;
 
 
 public class SrEroSubObjectTest {
 public class SrEroSubObjectTest {
 
 

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.StatefulIPv4LspIdentidiersTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 public class StatefulIPv4LspIdentidiersTlvTest {
 public class StatefulIPv4LspIdentidiersTlvTest {
 
 

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.StatefulLspDbVerTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for Stateful Lsp Db Ver tlv.
  * Test case for Stateful Lsp Db Ver tlv.

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
-import org.junit.Test;
-import org.onosproject.pcepio.types.StatefulLspErrorCodeTlv;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 public class StatefulLspErrorCodeTlvTest {
 public class StatefulLspErrorCodeTlvTest {
 
 

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
-import org.junit.Test;
-import org.onosproject.pcepio.types.StatefulPceCapabilityTlv;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for Stateful Pce Capability tlv.
  * Test case for Stateful Pce Capability tlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.SymbolicPathNameTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for Symbolic path tlv.
  * Test case for Symbolic path tlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.TEDefaultMetricTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for TE Default Metric tlv.
  * Test case for TE Default Metric tlv.
@@ -33,4 +31,4 @@ public class TEDefaultMetricTlvTest {
     public void basics() {
     public void basics() {
         new EqualsTester().addEqualityGroup(tlv1, tlv2).addEqualityGroup(tlv3).testEquals();
         new EqualsTester().addEqualityGroup(tlv1, tlv2).addEqualityGroup(tlv3).testEquals();
     }
     }
-}
\ No newline at end of file
+}

@@ -13,17 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import java.util.LinkedList;
+package org.onosproject.pcepio.types;
 
 
+import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.AdministrativeGroupTlv;
-import org.onosproject.pcepio.types.MaximumReservableLinkBandwidthTlv;
-import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.TELinkAttributesTlv;
 
 
-import com.google.common.testing.EqualsTester;
+import java.util.LinkedList;
 
 
 /**
 /**
  * Test case for TE Link Attribute Tlv.
  * Test case for TE Link Attribute Tlv.

@@ -13,17 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import java.util.LinkedList;
+package org.onosproject.pcepio.types;
 
 
+import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4InterfaceAddressTlv;
-import org.onosproject.pcepio.types.LinkLocalRemoteIdentifiersTlv;
-import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.TELinkDescriptorsTlv;
 
 
-import com.google.common.testing.EqualsTester;
+import java.util.LinkedList;
 
 
 /**
 /**
  * Test case for TE link descriptors Tlv.
  * Test case for TE link descriptors Tlv.

@@ -13,17 +13,12 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import java.util.LinkedList;
+package org.onosproject.pcepio.types;
 
 
+import com.google.common.testing.EqualsTester;
 import org.junit.Test;
 import org.junit.Test;
-import org.onosproject.pcepio.types.IPv4TERouterIdOfLocalNodeTlv;
-import org.onosproject.pcepio.types.NodeFlagBitsTlv;
-import org.onosproject.pcepio.types.PcepValueType;
-import org.onosproject.pcepio.types.TENodeAttributesTlv;
 
 
-import com.google.common.testing.EqualsTester;
+import java.util.LinkedList;
 
 
 /**
 /**
  * Test case for TE Node Attribute tlv.
  * Test case for TE Node Attribute tlv.

@@ -13,12 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
-
-import org.junit.Test;
-import org.onosproject.pcepio.types.TedCapabilityTlv;
+package org.onosproject.pcepio.types;
 
 
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Test case for TED Capability tlv.
  * Test case for TED Capability tlv.

@@ -13,11 +13,10 @@
  * See the License for the specific language governing permissions and
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * limitations under the License.
  */
  */
-package org.onosproject.pcepio;
+package org.onosproject.pcepio.types;
 
 
-import org.junit.Test;
-import org.onosproject.pcepio.types.UnreservedBandwidthTlv;
 import com.google.common.testing.EqualsTester;
 import com.google.common.testing.EqualsTester;
+import org.junit.Test;
 
 
 /**
 /**
  * Unit Test case for Unreserved Bandwidth Tlv.
  * Unit Test case for Unreserved Bandwidth Tlv.