Fix checkstyle in yang-parser-impl and enable enforcement

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / stmt / openconfigver / OpenconfigVersionBorderCaseTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
index aee183e1b7efad8a2eabcf4710fa215d73b39875..b9ff232e115ffec7b9ea9923061bbd30ffd80e75 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/openconfigver/OpenconfigVersionBorderCaseTest.java
@@ -25,13 +25,12 @@ public class OpenconfigVersionBorderCaseTest {
 
     @Test
     public void borderCaseValidMajorTest() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-valid-major",
-                StatementParserMode.SEMVER_MODE);
+        SchemaContext context = StmtTestUtils.parseYangSources(
+            "/openconfig-version/border-case/border-case-valid-major", StatementParserMode.SEMVER_MODE);
         assertNotNull(context);
 
-        Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next();
-        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
-                .iterator().next();
+        Module foo = context.findModules(URI.create("foo")).iterator().next();
+        Module semVer = context.findModules(URI.create("http://openconfig.net/yang/openconfig-ext")).iterator().next();
 
         assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get());
         assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get());
@@ -41,13 +40,12 @@ public class OpenconfigVersionBorderCaseTest {
 
     @Test
     public void borderCaseValidMinorTest() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-valid-minor",
-                StatementParserMode.SEMVER_MODE);
+        SchemaContext context = StmtTestUtils.parseYangSources(
+            "/openconfig-version/border-case/border-case-valid-minor", StatementParserMode.SEMVER_MODE);
         assertNotNull(context);
 
-        Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next();
-        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
-                .iterator().next();
+        Module foo = context.findModules(URI.create("foo")).iterator().next();
+        Module semVer = context.findModules(URI.create("http://openconfig.net/yang/openconfig-ext")).iterator().next();
 
         assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get());
         assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get());
@@ -57,13 +55,12 @@ public class OpenconfigVersionBorderCaseTest {
 
     @Test
     public void borderCaseValidPatchTest() throws Exception {
-        SchemaContext context = StmtTestUtils.parseYangSources("/openconfig-version/border-case/border-case-valid-patch",
-                StatementParserMode.SEMVER_MODE);
+        SchemaContext context = StmtTestUtils.parseYangSources(
+            "/openconfig-version/border-case/border-case-valid-patch", StatementParserMode.SEMVER_MODE);
         assertNotNull(context);
 
-        Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next();
-        Module semVer = context.findModuleByNamespace(new URI("http://openconfig.net/yang/openconfig-ext"))
-                .iterator().next();
+        Module foo = context.findModules(URI.create("foo")).iterator().next();
+        Module semVer = context.findModules(URI.create("http://openconfig.net/yang/openconfig-ext")).iterator().next();
 
         assertEquals(SemVer.valueOf("0.0.1"), semVer.getSemanticVersion().get());
         assertEquals(SemVer.valueOf("0.1.1"), foo.getSemanticVersion().get());
@@ -78,7 +75,7 @@ public class OpenconfigVersionBorderCaseTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid openconfig version");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage()
+            assertTrue(e.getCause().getCause().getMessage()
                     .startsWith("Unable to find module compatible with requested import [bar(5.5.5)]."));
         }
     }
@@ -90,7 +87,7 @@ public class OpenconfigVersionBorderCaseTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid openconfig version");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage()
+            assertTrue(e.getCause().getCause().getMessage()
                     .startsWith("Unable to find module compatible with requested import [bar(5.5.5)]."));
         }
     }
@@ -102,7 +99,7 @@ public class OpenconfigVersionBorderCaseTest {
                     StatementParserMode.SEMVER_MODE);
             fail("Test should fail due to invalid openconfig version");
         } catch (ReactorException e) {
-            assertTrue(e.getCause().getMessage()
+            assertTrue(e.getCause().getCause().getMessage()
                     .startsWith("Unable to find module compatible with requested import [bar(5.5.5)]."));
         }
     }