commit dc38b8005a48b8522c284d53229ccc8207d08868
author Gaurav Agrawal <gaurav.agrawal@huawei.com> Mon Feb 13 14:52:14 2017 +0530
committer Gaurav Agrawal <gaurav.agrawal@huawei.com> Mon Feb 13 14:52:28 2017 +0530
tree dde7f24810c7155325a6e32618151716b35c8895
parent f42405d6f1922c20ed7602b451a4f8ffb2d14849

Bug fix: Correct the folder structure for test

Change-Id: Ic8044547b749fcb627ca73d6cbf353c1f8714109

runtime/pom.xml

diff --git a/runtime/pom.xml b/runtime/pom.xml
index b046e4e..5c25317 100644
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -69,6 +69,22 @@
     <build>
         <plugins>
             <plugin>
+                <groupId>org.onosproject</groupId>
+                <artifactId>onos-yang-compiler-maven-plugin</artifactId>
+                <version>${project.version}</version>
+                <configuration>
+                    <yangFilesDir>src/test/resources</yangFilesDir>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <goals>
+                            <goal>yang2java</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
                 <version>3.0.2</version>

runtime/src/test/java/org/onosproject/yang/runtime/impl/DefaultYangModelRegistryTest.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/DefaultYangModelRegistryTest.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/DefaultYangModelRegistryTest.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/DefaultYangModelRegistryTest.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/DefaultYangModelRegistryTest.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java
similarity index 98%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java
index ccadffe..c20af6b 100644
--- a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java
+++ b/runtime/src/test/java/org/onosproject/yang/runtime/impl/ModelObjectIdTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.onosproject.yang.runtime.app;
+package org.onosproject.yang.runtime.impl;
 
 import org.junit.Test;
 import org.onosproject.yang.gen.v1.modelobjecttest.check.Cont53;

runtime/src/test/java/org/onosproject/yang/runtime/impl/RuntimeHandlerTest.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/RuntimeHandlerTest.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/RuntimeHandlerTest.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/RuntimeHandlerTest.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/RuntimeHandlerTest.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/SerializerRegistryTest.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/SerializerRegistryTest.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/SerializerRegistryTest.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/SerializerRegistryTest.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/SerializerRegistryTest.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestCaseSchemaContext.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestCaseSchemaContext.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestCaseSchemaContext.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestCaseSchemaContext.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestCaseSchemaContext.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestLeafSchemaContext.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestLeafSchemaContext.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestLeafSchemaContext.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestLeafSchemaContext.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestLeafSchemaContext.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestRpcSchemaContext.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestRpcSchemaContext.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestRpcSchemaContext.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestRpcSchemaContext.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestRpcSchemaContext.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestSchemaContext.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestSchemaContext.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestSchemaContext.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestSchemaContext.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestSchemaContext.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestSerializer.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestSerializer.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestSerializer.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestSerializer.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestSerializer.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestUtils.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestUtils.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestUtils.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestUtils.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestUtils.java

runtime/src/test/java/org/onosproject/yang/runtime/impl/TestYangSchemaNodeProvider.java

diff --git a/runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestYangSchemaNodeProvider.java b/runtime/src/test/java/org/onosproject/yang/runtime/impl/TestYangSchemaNodeProvider.java
similarity index 100%
rename from runtime/src/main/test/java/org/onosproject/yang/runtime/impl/TestYangSchemaNodeProvider.java
rename to runtime/src/test/java/org/onosproject/yang/runtime/impl/TestYangSchemaNodeProvider.java

runtime/src/test/resources/modelObjectId/modelObjectIdTest.yang

diff --git a/runtime/src/main/test/resources/modelObjectId/modelObjectIdTest.yang b/runtime/src/test/resources/modelObjectId/modelObjectIdTest.yang
similarity index 100%
rename from runtime/src/main/test/resources/modelObjectId/modelObjectIdTest.yang
rename to runtime/src/test/resources/modelObjectId/modelObjectIdTest.yang

runtime/src/test/resources/schemaProviderTestYangFiles/choice-case.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/choice-case.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/choice-case.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/choice-case.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/choice-case.yang

runtime/src/test/resources/schemaProviderTestYangFiles/food.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/food.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/food.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/food.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/food.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-inet-types.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-inet-types.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-inet-types.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-inet-types.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-inet-types.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-network.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-network.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-network.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-network.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-network.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-schedule.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-schedule.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-schedule.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-schedule.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-schedule.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-topology.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-topology.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-topology.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-topology.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-topology.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-types.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-types.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-types.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-types.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-te-types.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-yang-types.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-yang-types.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-yang-types.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-ietf-yang-types.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-ietf-yang-types.yang

runtime/src/test/resources/schemaProviderTestYangFiles/yrt-network-topology.yang

diff --git a/runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-network-topology.yang b/runtime/src/test/resources/schemaProviderTestYangFiles/yrt-network-topology.yang
similarity index 100%
rename from runtime/src/main/test/resources/schemaProviderTestYangFiles/yrt-network-topology.yang
rename to runtime/src/test/resources/schemaProviderTestYangFiles/yrt-network-topology.yang

runtime/src/test/resources/ysrTestYangFiles/CheckWithNamespace.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/CheckWithNamespace.yang b/runtime/src/test/resources/ysrTestYangFiles/CheckWithNamespace.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/CheckWithNamespace.yang
rename to runtime/src/test/resources/ysrTestYangFiles/CheckWithNamespace.yang

runtime/src/test/resources/ysrTestYangFiles/multiRevisions/norev.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/norev.yang b/runtime/src/test/resources/ysrTestYangFiles/multiRevisions/norev.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/norev.yang
rename to runtime/src/test/resources/ysrTestYangFiles/multiRevisions/norev.yang

runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev.yang b/runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev.yang
rename to runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev.yang

runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev2.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev2.yang b/runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev2.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev2.yang
rename to runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev2.yang

runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev3.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev3.yang b/runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev3.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev3.yang
rename to runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev3.yang

runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev4.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev4.yang b/runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev4.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/multiRevisions/withrev4.yang
rename to runtime/src/test/resources/ysrTestYangFiles/multiRevisions/withrev4.yang

runtime/src/test/resources/ysrTestYangFiles/withoutNotification/ysr3.yang

diff --git a/runtime/src/main/test/resources/ysrTestYangFiles/withoutNotification/ysr3.yang b/runtime/src/test/resources/ysrTestYangFiles/withoutNotification/ysr3.yang
similarity index 100%
rename from runtime/src/main/test/resources/ysrTestYangFiles/withoutNotification/ysr3.yang
rename to runtime/src/test/resources/ysrTestYangFiles/withoutNotification/ysr3.yang