Move tests to base package

Test FQCN is used by surefire to generate a report file, which has
limits on its length, causing problems with archival.

Move these tests to base model package to keep the file name short.

Change-Id: I90a49004c235590c87cb331e7cd31f693b3cd6d1
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/routing/policy/policy/definitions/policy/definition/statements/statement/actions/bgp/actions/set/ext/community/set/ext/community/method/InlineCommunitiesBuilderTest.java b/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/ExtInlineCommunitiesBuilderTest.java
similarity index 63%
rename from bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/routing/policy/policy/definitions/policy/definition/statements/statement/actions/bgp/actions/set/ext/community/set/ext/community/method/InlineCommunitiesBuilderTest.java
rename to bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/ExtInlineCommunitiesBuilderTest.java
index 222e3a22517e0fd5e4b514b61a31a7868bb25341..d31c721c713d9601101a6355783bf281ecd023d4 100644 (file)
--- a/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/routing/policy/policy/definitions/policy/definition/statements/statement/actions/bgp/actions/set/ext/community/set/ext/community/method/InlineCommunitiesBuilderTest.java
+++ b/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/ExtInlineCommunitiesBuilderTest.java
@@ -6,18 +6,21 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009.routing.policy.policy.definitions.policy.definition.statements.statement.actions.bgp.actions.set.ext.community.set.ext.community.method;
+package org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009;
+
+import static org.junit.Assert.assertEquals;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009.routing.policy.policy.definitions.policy.definition.statements.statement.actions.bgp.actions.set.ext.community.set.ext.community.method.Inline.Communities;
+import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009.routing.policy.policy.definitions.policy.definition.statements.statement.actions.bgp.actions.set.ext.community.set.ext.community.method.InlineCommunitiesBuilder;
 
-public class InlineCommunitiesBuilderTest {
+// This test is not in the appropriate package to work around file name limitations
+public class ExtInlineCommunitiesBuilderTest {
 
     @Test
     public void testValid() {
         final Communities communities = InlineCommunitiesBuilder.getDefaultInstance("route-origin:12.34.56.78:123");
-        Assert.assertEquals("route-origin:12.34.56.78:123", communities.getBgpExtCommunityType().getString());
+        assertEquals("route-origin:12.34.56.78:123", communities.getBgpExtCommunityType().getString());
     }
 
     @Test(expected=IllegalArgumentException.class)

diff --git a/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/routing/policy/policy/definitions/policy/definition/statements/statement/actions/bgp/actions/set/community/set/community/method/InlineCommunitiesBuilderTest.java b/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/InlineCommunitiesBuilderTest.java
similarity index 66%
rename from bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/routing/policy/policy/definitions/policy/definition/statements/statement/actions/bgp/actions/set/community/set/community/method/InlineCommunitiesBuilderTest.java
rename to bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/InlineCommunitiesBuilderTest.java
index 74d304298c4855734518374e5d66e855682a4673..d61a2d5771d9d9657a1911bddb460966fca7ba9c 100644 (file)
--- a/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/routing/policy/policy/definitions/policy/definition/statements/statement/actions/bgp/actions/set/community/set/community/method/InlineCommunitiesBuilderTest.java
+++ b/bgp/openconfig-api/src/test/java/org/opendaylight/yang/gen/v1/http/openconfig/net/yang/bgp/policy/rev151009/InlineCommunitiesBuilderTest.java
@@ -6,23 +6,25 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009.routing.policy.policy.definitions.policy.definition.statements.statement.actions.bgp.actions.set.community.set.community.method;
+package org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009;
+
+import static org.junit.Assert.assertEquals;
 
-import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009.routing.policy.policy.definitions.policy.definition.statements.statement.actions.bgp.actions.set.community.set.community.method.Inline.Communities;
+import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.policy.rev151009.routing.policy.policy.definitions.policy.definition.statements.statement.actions.bgp.actions.set.community.set.community.method.InlineCommunitiesBuilder;
 
+// This test is not in the appropriate package to work around file name limitations
 public class InlineCommunitiesBuilderTest {
 
     @Test
     public void testValid() {
         final Communities communities = InlineCommunitiesBuilder.getDefaultInstance("123");
-        Assert.assertEquals(123L, communities.getBgpStdCommunityType().getUint32().longValue());
+        assertEquals(123L, communities.getBgpStdCommunityType().getUint32().longValue());
     }
 
     @Test(expected=IllegalArgumentException.class)
     public void testInvalid() {
         InlineCommunitiesBuilder.getDefaultInstance("abc");
     }
-
 }