X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=yang%2Fyang-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fstmt%2Fopenconfigver%2FOpenconfigVersionBorderCaseTest.java;fp=yang%2Fyang-parser-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fyangtools%2Fyang%2Fstmt%2Fsemver%2FSemanticVersionBorderCaseTest.java;h=fd3171fe9ac4a375fc7c1ff1bc56f1bed1cbbded;hb=e826b441fd88057793b5cea7e784522ea7adcd40;hp=8c5e2f11303d13d19c454637cc0300a868c08e83;hpb=1395b0039b09e103eafe3cd22ef722f6d63be8cf;p=yangtools.git

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionBorderCaseTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
similarity index 57%
rename from yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionBorderCaseTest.java
rename to yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
index 8c5e2f1130..fd3171fe9a 100644
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionBorderCaseTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.yangtools.yang.stmt.semver;
+package org.opendaylight.yangtools.yang.stmt.openconfigver;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -21,62 +21,62 @@ import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode;
 import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
 import org.opendaylight.yangtools.yang.stmt.StmtTestUtils;
 
-public class SemanticVersionBorderCaseTest {
+public class OpenconfigVersionBorderCaseTest {
 
     @Test
     public void borderCaseValidMajorTest() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-valid-major",
-                StatementParserMode.SEMVER_MODE);
+        SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-valid-major",
+                StatementParserMode.OPENCONFIG_VER_MODE);
         assertNotNull(context);
 
         Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next();
-        Module semVer = context.findModuleByNamespace(new URI("urn:opendaylight:yang:extension:semantic-version"))
+        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
                 .iterator().next();
 
-        assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion());
-        assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion());
+        assertEquals(SemVer.valueOf("0.0.1"), semVer.getOpenconfigVersion());
+        assertEquals(SemVer.valueOf("0.1.1"), foo.getOpenconfigVersion());
         Module bar = StmtTestUtils.findImportedModule(context, foo, "bar");
-        assertEquals(SemVer.valueOf("5.5.5"), bar.getSemanticVersion());
+        assertEquals(SemVer.valueOf("5.5.5"), bar.getOpenconfigVersion());
     }
 
     @Test
     public void borderCaseValidMinorTest() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-valid-minor",
-                StatementParserMode.SEMVER_MODE);
+        SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-valid-minor",
+                StatementParserMode.OPENCONFIG_VER_MODE);
         assertNotNull(context);
 
         Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next();
-        Module semVer = context.findModuleByNamespace(new URI("urn:opendaylight:yang:extension:semantic-version"))
+        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
                 .iterator().next();
 
-        assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion());
-        assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion());
+        assertEquals(SemVer.valueOf("0.0.1"), semVer.getOpenconfigVersion());
+        assertEquals(SemVer.valueOf("0.1.1"), foo.getOpenconfigVersion());
         Module bar = StmtTestUtils.findImportedModule(context, foo, "bar");
-        assertEquals(SemVer.valueOf("5.6.5"), bar.getSemanticVersion());
+        assertEquals(SemVer.valueOf("5.6.5"), bar.getOpenconfigVersion());
     }
 
     @Test
     public void borderCaseValidPatchTest() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-valid-patch",
-                StatementParserMode.SEMVER_MODE);
+        SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-valid-patch",
+                StatementParserMode.OPENCONFIG_VER_MODE);
         assertNotNull(context);
 
         Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next();
-        Module semVer = context.findModuleByNamespace(new URI("urn:opendaylight:yang:extension:semantic-version"))
+        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
                 .iterator().next();
 
-        assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion());
-        assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion());
+        assertEquals(SemVer.valueOf("0.0.1"), semVer.getOpenconfigVersion());
+        assertEquals(SemVer.valueOf("0.1.1"), foo.getOpenconfigVersion());
         Module bar = StmtTestUtils.findImportedModule(context, foo, "bar");
-        assertEquals(SemVer.valueOf("5.5.6"), bar.getSemanticVersion());
+        assertEquals(SemVer.valueOf("5.5.6"), bar.getOpenconfigVersion());
     }
 
     @Test
     public void borderCaseInvalidMajorTest() throws Exception {
         try {
-            StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-invalid-major",
-                    StatementParserMode.SEMVER_MODE);
-            fail("Test should fail due to invalid semantic version");
+            StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-invalid-major",
+                    StatementParserMode.OPENCONFIG_VER_MODE);
+            fail("Test should fail due to invalid openconfig version");
         } catch (ReactorException e) {
             assertTrue(e.getCause().getMessage()
                     .startsWith("Unable to find module compatible with requested import [bar(5.5.5)]."));
@@ -86,9 +86,9 @@ public class SemanticVersionBorderCaseTest {
     @Test
     public void borderCaseInvalidMinorTest() throws Exception {
         try {
-            StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-invalid-minor",
-                    StatementParserMode.SEMVER_MODE);
-            fail("Test should fail due to invalid semantic version");
+            StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-invalid-minor",
+                    StatementParserMode.OPENCONFIG_VER_MODE);
+            fail("Test should fail due to invalid openconfig version");
         } catch (ReactorException e) {
             assertTrue(e.getCause().getMessage()
                     .startsWith("Unable to find module compatible with requested import [bar(5.5.5)]."));
@@ -98,9 +98,9 @@ public class SemanticVersionBorderCaseTest {
     @Test
     public void borderCaseInvalidPatchTest() throws Exception {
         try {
-            StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-invalid-patch",
-                    StatementParserMode.SEMVER_MODE);
-            fail("Test should fail due to invalid semantic version");
+            StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-invalid-patch",
+                    StatementParserMode.OPENCONFIG_VER_MODE);
+            fail("Test should fail due to invalid openconfig version");
         } catch (ReactorException e) {
             assertTrue(e.getCause().getMessage()
                     .startsWith("Unable to find module compatible with requested import [bar(5.5.5)]."));