From: Robert Varga Date: Tue, 5 Apr 2022 01:36:34 +0000 (+0200) Subject: Further cleanup of tests X-Git-Tag: v8.0.3~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=yangtools.git;a=commitdiff_plain;h=ad338ff278f137696478df3d27675f1d1e78a8eb Further cleanup of tests Convert more tests to use AbstractYangTest's assertions. Change-Id: Ib6efc701ba59d3c5323b8e69cfb51a2d22700e53 Signed-off-by: Robert Varga --- diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java index 8e4903b041..f53ae33365 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc6020/Bug5410Test.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc6020; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableList; @@ -22,15 +21,14 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +import org.opendaylight.yangtools.yang.stmt.AbstractYangTest; -public class Bug5410Test { +public class Bug5410Test extends AbstractYangTest { private static final String FOO_NS = "foo"; @Test - public void testYangPattern() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5410"); - assertNotNull(context); + public void testYangPattern() { + final var context = assertEffectiveModelDir("/bugs/bug5410"); final PatternConstraint pattern = getPatternConstraintOf(context, "leaf-with-pattern"); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java index d0dffbf332..d9456ba093 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java @@ -8,12 +8,9 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc7950; import static org.hamcrest.CoreMatchers.anyOf; -import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; -import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Optional; @@ -26,14 +23,11 @@ import org.opendaylight.yangtools.yang.model.api.stmt.IncludeStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; import org.opendaylight.yangtools.yang.model.api.stmt.ReferenceStatement; import org.opendaylight.yangtools.yang.parser.rfc7950.reactor.RFC7950Reactors; -import org.opendaylight.yangtools.yang.parser.spi.meta.InvalidSubstatementException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; - -public class Bug6874Test { +import org.opendaylight.yangtools.yang.stmt.AbstractYangTest; +public class Bug6874Test extends AbstractYangTest { private static final StatementStreamSource ROOT_MODULE = sourceForResource( "/rfc7950/include-import-stmt-test/valid-11/root-module.yang"); private static final StatementStreamSource CHILD_MODULE = sourceForResource( @@ -44,9 +38,8 @@ public class Bug6874Test { "/rfc7950/include-import-stmt-test/valid-11/imported-module.yang"); @Test - public void valid11Test() throws Exception { - final var schemaContext = StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/valid-11"); - assertNotNull(schemaContext); + public void valid11Test() { + final var schemaContext = assertEffectiveModelDir("/rfc7950/include-import-stmt-test/valid-11"); // Test for valid include statement final Module testModule = schemaContext.findModules("root-module").iterator().next(); @@ -62,20 +55,14 @@ public class Bug6874Test { @Test public void invalid10IncludeStmtTest() { - final var ex = assertThrows(SomeModifiersUnresolvedException.class, - () -> StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/invalid-include-10")).getCause(); - assertThat(ex, instanceOf(InvalidSubstatementException.class)); - assertThat(ex.getMessage(), anyOf( + assertInvalidSubstatementExceptionDir("/rfc7950/include-import-stmt-test/invalid-include-10", anyOf( startsWith("DESCRIPTION is not valid for INCLUDE"), startsWith("REFERENCE is not valid for INCLUDE"))); } @Test - public void invalid10ImportStmtTest() throws Exception { - final var ex = assertThrows(SomeModifiersUnresolvedException.class, - () -> StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/invalid-import-10")).getCause(); - assertThat(ex, instanceOf(InvalidSubstatementException.class)); - assertThat(ex.getMessage(), anyOf( + public void invalid10ImportStmtTest() { + assertInvalidSubstatementExceptionDir("/rfc7950/include-import-stmt-test/invalid-import-10", anyOf( startsWith("DESCRIPTION is not valid for IMPORT"), startsWith("REFERENCE is not valid for IMPORT"))); } @@ -95,8 +82,7 @@ public class Bug6874Test { }); } - @SuppressWarnings("rawtypes") - private static void verifyDescAndRef(final DeclaredStatement stmt) { + private static void verifyDescAndRef(final DeclaredStatement stmt) { if (stmt instanceof DescriptionStatement) { assertEquals("Yang 1.1: Allow description and reference in include and import.", ((DescriptionStatement) stmt).argument()); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java index eb770b2520..12e46f3a42 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java @@ -10,16 +10,12 @@ package org.opendaylight.yangtools.yang.parser.stmt.rfc7950; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.AbstractYangTest; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6876Test extends AbstractYangTest { @Test @@ -33,11 +29,7 @@ public class Bug6876Test extends AbstractYangTest { @Test public void yang10Test() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/rfc7950/bug6876/yang10")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/rfc7950/bug6876/yang10", startsWith( "An augment cannot add node 'mandatory-leaf' because it is mandatory and in module different than target")); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java index 75303aa1ef..29d44c279e 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.ArrayList; @@ -20,16 +19,13 @@ import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; -public class Bug2872Test { - +public class Bug2872Test extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug2872"); - assertNotNull(schema); + public void test() { + final var schema = assertEffectiveModelDir("/bugs/bug2872"); final QNameModule bug2872module = QNameModule.create(XMLNamespace.of("bug2872"), Revision.of("2016-06-08")); final QName foo = QName.create(bug2872module, "bar"); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java index f4137be82d..cbd0cf4c18 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java @@ -17,15 +17,12 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.Submodule; -public class Bug3799Test { - +public class Bug3799Test extends AbstractYangTest { @Test - public void test() throws Exception { - SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug3799"); - assertNotNull(schema); + public void test() { + final var schema = assertEffectiveModelDir("/bugs/bug3799"); Collection modules = schema.getModules(); assertNotNull(modules); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java index 5543b3f251..a5271be0c6 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java @@ -7,27 +7,21 @@ */ package org.opendaylight.yangtools.yang.stmt; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.hamcrest.CoreMatchers.allOf; +import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.startsWith; +import static org.hamcrest.MatcherAssert.assertThat; -import com.google.common.base.Throwables; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; - -public class Bug4410Test { +public class Bug4410Test extends AbstractYangTest { @Test - public void test() throws Exception { - try { - StmtTestUtils.parseYangSources("/bugs/bug4410"); - fail("SomeModifiersUnresolvedException should be thrown."); - } catch (SomeModifiersUnresolvedException e) { - Throwable rootCause = Throwables.getRootCause(e); - assertTrue(rootCause instanceof InferenceException); - final String message = rootCause.getMessage(); - assertTrue(message.startsWith("Type [(foo)")); - assertTrue(message.contains("was not found")); - } + public void test() { + final var cause = assertInferenceExceptionDir("/bugs/bug4410", + startsWith("Yang model processing phase EFFECTIVE_MODEL failed [at ")).getCause(); + assertThat(cause, instanceOf(InferenceException.class)); + assertThat(cause.getMessage(), allOf(startsWith("Type [(foo)"), containsString("was not found"))); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java index 974c9ae802..35017dc46d 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.util.Collection; @@ -17,14 +16,12 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; -public class Bug4456Test { +public class Bug4456Test extends AbstractYangTest { @Test - public void test() throws Exception { - SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug4456"); - assertNotNull(schema); + public void test() { + final var schema = assertEffectiveModelDir("/bugs/bug4456"); Set modules = (Set) schema.findModules(XMLNamespace.of("foo")); assertEquals(1, modules.size()); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java index e0c892228e..c757e41d93 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4610Test.java @@ -25,10 +25,10 @@ import org.opendaylight.yangtools.yang.model.api.stmt.GroupingEffectiveStatement import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; -public class Bug4610Test { +public class Bug4610Test extends AbstractYangTest { @Test - public void test() throws Exception { - final EffectiveModelContext context = StmtTestUtils.parseYangSources("/bugs/bug4610"); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug4610"); final Revision revision = Revision.of("2015-12-12"); // Original diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java index a931e1b61e..aa82f7bd95 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java @@ -7,15 +7,11 @@ */ package org.opendaylight.yangtools.yang.stmt; -import static org.junit.Assert.assertNotNull; - import org.junit.Test; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class Bug5059Test { +public class Bug5059Test extends AbstractYangTest { @Test - public void test() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5059"); - assertNotNull(context); + public void test() { + assertEffectiveModelDir("/bugs/bug5059"); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java index 297e96754e..c99ba06452 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java @@ -10,15 +10,12 @@ package org.opendaylight.yangtools.yang.stmt; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertThrows; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class Bug5335Test extends AbstractYangTest { private static final String FOO = "foo"; @@ -34,31 +31,19 @@ public class Bug5335Test extends AbstractYangTest { @Test public void incorrectTest1() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug5335/incorrect/case-1")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug5335/incorrect/case-1", startsWith( "An augment cannot add node 'mandatory-leaf' because it is mandatory and in module different than target")); } @Test public void incorrectTest2() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug5335/incorrect/case-2")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug5335/incorrect/case-2", startsWith( "An augment cannot add node 'mandatory-leaf' because it is mandatory and in module different than target")); } @Test public void incorrectTest3() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug5335/incorrect/case-2")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug5335/incorrect/case-3", startsWith( "An augment cannot add node 'mandatory-leaf' because it is mandatory and in module different than target")); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java index 87597f9c59..2991b4cd4f 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java @@ -12,24 +12,21 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; -public class Bug5396Test { +public class Bug5396Test extends AbstractYangTest { @Test - public void test() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5396"); - assertNotNull(context); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug5396"); QName root = QName.create("foo", "root"); QName myLeaf2 = QName.create("foo", "my-leaf2"); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java index 062e2cd62b..6926d024fb 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java @@ -7,9 +7,10 @@ */ package org.opendaylight.yangtools.yang.stmt; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Optional; @@ -17,25 +18,23 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.xpath.api.YangXPathExpression.QualifiedBound; -public class Bug5481Test { +public class Bug5481Test extends AbstractYangTest { @Test public void test() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5481"); - assertNotNull(context); - + final var context = assertEffectiveModelDir("/bugs/bug5481"); ContainerSchemaNode topContainer = verifyTopContainer(context); verifyExtendedLeaf(topContainer); } - private static ContainerSchemaNode verifyTopContainer(final SchemaContext context) { + private static ContainerSchemaNode verifyTopContainer(final EffectiveModelContext context) { QName top = QName.create("http://example.com/module1", "2016-03-09", "top"); DataSchemaNode dataChildByName = context.getDataChildByName(top); - assertTrue(dataChildByName instanceof ContainerSchemaNode); + assertThat(dataChildByName, instanceOf(ContainerSchemaNode.class)); ContainerSchemaNode topContainer = (ContainerSchemaNode) dataChildByName; diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java index 88c034f9c3..c9eed5281c 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java @@ -7,9 +7,9 @@ */ package org.opendaylight.yangtools.yang.stmt; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import java.util.Collection; import org.junit.Test; @@ -17,16 +17,13 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.MustDefinition; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class Bug5518Test { +public class Bug5518Test extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5518"); - assertNotNull(context); - + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug5518"); final DataSchemaNode dataChildByName = context.getDataChildByName(QName.create("foo", "root")); - assertTrue(dataChildByName instanceof ContainerSchemaNode); + assertThat(dataChildByName, instanceOf(ContainerSchemaNode.class)); final ContainerSchemaNode root = (ContainerSchemaNode) dataChildByName; final Collection mustConstraints = root.getMustConstraints(); assertEquals(1, mustConstraints.size()); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java index d29f8d2ed1..f6c28f9e1d 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java @@ -9,22 +9,19 @@ package org.opendaylight.yangtools.yang.stmt; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; -public class Bug5550Test { +public class Bug5550Test extends AbstractYangTest { private static final String NS = "foo"; private static final String REV = "2016-03-18"; @Test - public void test() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5550"); - assertNotNull(context); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug5550"); QName root = QName.create(NS, REV, "root"); QName containerInGrouping = QName.create(NS, REV, "container-in-grouping"); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java index 84578c794a..a5c9bc0541 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java @@ -14,17 +14,12 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -public class Bug5712Test { - +public class Bug5712Test extends AbstractYangTest { @Test - public void testTypedefWithNewStatementParser() throws Exception { - SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug5712"); - assertNotNull(schemaContext); - - Module badModule = schemaContext.findModules("bad").iterator().next(); + public void testTypedefWithNewStatementParser() { + final var badModule = assertEffectiveModelDir("/bugs/bug5712").findModules("bad").iterator().next(); assertNotNull(badModule); checkThing2TypeDef(badModule); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java index 74d05dac60..e8e4157a14 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.isA; -import static org.junit.Assert.assertNotNull; import java.util.Iterator; import org.junit.Test; @@ -21,16 +20,14 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class Bug5884Test { +public class Bug5884Test extends AbstractYangTest { private static final String NS = "urn:yang.foo"; private static final String REV = "2016-01-01"; @Test - public void testBug5884() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5884"); - assertNotNull(context); + public void testBug5884() { + final var context = assertEffectiveModelDir("/bugs/bug5884"); final QName root = QName.create(NS, REV, "main-container"); final QName choice = QName.create(NS, REV, "test-choice"); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java index a9bf847bdd..b5522b2e4f 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java @@ -5,19 +5,13 @@ * 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; -import static org.junit.Assert.assertNotNull; - import org.junit.Test; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -public class Bug5899Test { +public class Bug5899Test extends AbstractYangTest { @Test - public void testBug5899() throws Exception { - final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug5899"); - assertNotNull(schemaContext); + public void testBug5899() { + assertEffectiveModelDir("/bugs/bug5899"); } } \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java index 43d9347554..95af9388c8 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.util.Collection; @@ -17,16 +16,14 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; -public class Bug5942Test { +public class Bug5942Test extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug5942"); - assertNotNull(schemaContext); + public void test() { + final var schemaContext = assertEffectiveModelDir("/bugs/bug5942"); final DataSchemaNode root = schemaContext.getDataChildByName(QName.create("foo", "2016-06-02", "root")); assertTrue(root instanceof ContainerSchemaNode); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java index 6b9690b85a..710ffae229 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6131Test.java @@ -8,17 +8,13 @@ package org.opendaylight.yangtools.yang.stmt; -import java.io.IOException; -import java.net.URISyntaxException; +import static org.junit.Assert.assertThrows; + import org.junit.Test; -import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -public class Bug6131Test { - @Test(expected = NullPointerException.class) - public void test() throws ReactorException, URISyntaxException, SourceException, IOException, - YangSyntaxErrorException { - StmtTestUtils.parseYangSources("/bugs/bug6131"); +public class Bug6131Test extends AbstractYangTest { + @Test + public void test() { + assertThrows(NullPointerException.class, () -> TestUtils.loadModules("/bugs/bug6131")); } } \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java index f44361f384..dc590638a3 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java @@ -12,15 +12,12 @@ import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug6240Test extends AbstractYangTest { private static final String NS = "bar"; @@ -60,10 +57,7 @@ public class Bug6240Test extends AbstractYangTest { @Test public void testInvalidModels() { - final var ex = assertThrows(SomeModifiersUnresolvedException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug6240/incorrect")); - final var cause = ex.getCause(); - assertThat(cause, instanceOf(SourceException.class)); - assertThat(cause.getMessage(), startsWith("Grouping '(bar?revision=2016-07-19)foo-imp-grp' was not resolved.")); + assertInferenceExceptionDir("/bugs/bug6240/incorrect", + startsWith("Grouping '(bar?revision=2016-07-19)foo-imp-grp' was not resolved.")); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java index f7ee7b77c9..88adedfb46 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java @@ -8,7 +8,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -25,11 +24,10 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition.Bit; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.EnumTypeDefinition.EnumPair; -public class Bug6316Test { +public class Bug6316Test extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6316"); - assertNotNull(context); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug6316"); verifyEnumTypedefinition(context); verifyBitsTypedefinition(context); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java index 51ee39dd54..197c584693 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java @@ -10,19 +10,14 @@ package org.opendaylight.yangtools.yang.stmt; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; -import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -public class Bug6669Test { +public class Bug6669Test extends AbstractYangTest { private static final String REV = "2016-09-08"; private static final String FOO_NS = "foo"; private static final String BAR_NS = "bar"; @@ -34,57 +29,39 @@ public class Bug6669Test { @Test public void testInvalidAugment() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug6669/invalid/test1")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug6669/invalid/test1", startsWith( "An augment cannot add node 'm' because it is mandatory and in module different than target")); } @Test public void testInvalidAugment2() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug6669/invalid/test2")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug6669/invalid/test2", startsWith( "An augment cannot add node 'm' because it is mandatory and in module different than target")); } @Test public void testInvalidAugment3() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug6669/invalid/test3")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug6669/invalid/test3", startsWith( "An augment cannot add node 'l' because it is mandatory and in module different than target")); } @Test - public void testValidAugment() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/valid/test1"); - assertNotNull(context); - + public void testValidAugment() { + final var context = assertEffectiveModelDir("/bugs/bug6669/valid/test1"); final SchemaNode findDataSchemaNode = context.findDataTreeChild(ROOT, BAR, BAR_1, M).get(); assertThat(findDataSchemaNode, instanceOf(LeafSchemaNode.class)); } @Test - public void testValidAugment2() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/valid/test2"); - assertNotNull(context); - + public void testValidAugment2() { + final var context = assertEffectiveModelDir("/bugs/bug6669/valid/test2"); final SchemaNode findDataSchemaNode = context.findDataTreeChild(ROOT, BAR, BAR_1, BAR_2, M).get(); assertThat(findDataSchemaNode, instanceOf(LeafSchemaNode.class)); } @Test public void testValidAugment3() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/valid/test3"); - assertNotNull(context); - + final var context = assertEffectiveModelDir("/bugs/bug6669/valid/test3"); final SchemaNode findDataSchemaNode = context.findDataTreeChild(ROOT, BAR, BAR_1, BAR_2, QName.create(BAR_NS, REV, "l")).get(); assertThat(findDataSchemaNode, instanceOf(ListSchemaNode.class)); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java index 1b5a62d8a4..309997d468 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7037Test.java @@ -19,20 +19,18 @@ import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; -public class Bug7037Test { +public class Bug7037Test extends AbstractYangTest { private static final String FOO_NS = "foo"; private static final String BAR_NS = "bar"; @Test - public void test() throws Exception { - final EffectiveModelContext context = StmtTestUtils.parseYangSources("/bugs/bug7037"); - assertNotNull(context); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug7037"); - final Collection unknownSchemaNodes = context.getModuleStatement(foo("foo")) - .getDeclared().declaredSubstatements(UnrecognizedStatement.class); + final var unknownSchemaNodes = context.getModuleStatement(foo("foo")) .getDeclared() + .declaredSubstatements(UnrecognizedStatement.class); assertEquals(1, unknownSchemaNodes.size()); final UnrecognizedStatement first = unknownSchemaNodes.iterator().next(); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java index 34294e62e7..d75cb90e37 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7038Test.java @@ -9,10 +9,10 @@ package org.opendaylight.yangtools.yang.stmt; import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -24,12 +24,11 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.stmt.ModuleStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; -public class Bug7038Test { +public class Bug7038Test extends AbstractYangTest { @Test - public void unknownNodeTest() throws Exception { - final ModuleStatement bar = StmtTestUtils.parseYangSources("/bugs/bug7038") + public void unknownNodeTest() { + final ModuleStatement bar = assertEffectiveModelDir("/bugs/bug7038") .getModuleStatement(QNameModule.create(XMLNamespace.of("bar"))).getDeclared(); final UnrecognizedStatement decimal64 = bar.findFirstDeclaredSubstatement(UnrecognizedStatement.class) .orElseThrow(); @@ -39,7 +38,7 @@ public class Bug7038Test { @Test public void testYang11() throws Exception { - final ContainerSchemaNode root = (ContainerSchemaNode) StmtTestUtils.parseYangSources("/bugs/bug7038/yang11") + final ContainerSchemaNode root = (ContainerSchemaNode) assertEffectiveModelDir("/bugs/bug7038/yang11") .getDataChildByName(QName.create("foo", "root")); final TypeDefinition typedef = ((LeafSchemaNode) root.getDataChildByName(QName.create("foo", "my-leafref"))) .getType(); @@ -49,10 +48,7 @@ public class Bug7038Test { @Test public void testYang10() throws Exception { - try { - StmtTestUtils.parseYangSources("/bugs/bug7038/yang10"); - } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e.getCause().getMessage().startsWith("REQUIRE_INSTANCE is not valid for TYPE")); - } + assertInvalidSubstatementExceptionDir("/bugs/bug7038/yang10", + startsWith("REQUIRE_INSTANCE is not valid for TYPE")); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java index 586baeda12..653d0f386c 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8126Test.java @@ -11,7 +11,6 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.startsWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThrows; import java.util.Optional; import org.junit.Test; @@ -19,17 +18,14 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.stmt.ModuleEffectiveStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -public class Bug8126Test { +public class Bug8126Test extends AbstractYangTest { private static final XMLNamespace FOO_NS = XMLNamespace.of("foo"); private static final XMLNamespace BAR_NS = XMLNamespace.of("bar"); @Test - public void testValidAugments() throws Exception { - final ModuleEffectiveStatement fooModule = StmtTestUtils.parseYangSources("/bugs/bug8126/valid") + public void testValidAugments() { + final var fooModule = assertEffectiveModelDir("/bugs/bug8126/valid") .getModuleStatement(QNameModule.create(FOO_NS)); assertThat(fooModule.findSchemaTreeNode( foo("root"), bar("my-container"), bar("my-choice"), bar("one"), bar("one"), bar("mandatory-leaf")) @@ -45,31 +41,19 @@ public class Bug8126Test { @Test public void testAugmentMandatoryChoice() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug8126/inv-choice")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug8126/inv-choice", startsWith( "An augment cannot add node 'mandatory-choice' because it is mandatory and in module different than ")); } @Test public void testAugmentMandatoryList() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug8126/inv-list")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug8126/inv-list", startsWith( "An augment cannot add node 'mandatory-list' because it is mandatory and in module different than ")); } @Test public void testAugmentMandatoryContainer() { - final ReactorException ex = assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/bugs/bug8126/inv-cont")); - final Throwable cause = ex.getCause(); - assertThat(cause, instanceOf(InferenceException.class)); - assertThat(cause.getMessage(), startsWith( + assertInferenceExceptionDir("/bugs/bug8126/inv-cont", startsWith( "An augment cannot add node 'mandatory-leaf-3' because it is mandatory and in module different than ")); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java index 389ada9b36..40ca85b095 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug8597Test.java @@ -8,24 +8,18 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.ModuleImport; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class Bug8597Test { +public class Bug8597Test extends AbstractYangTest { @Test public void test() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug8597"); - assertNotNull(context); - - final Module foo = context.findModule("foo").get(); - for (final ModuleImport moduleImport : foo.getImports()) { + final var foo = assertEffectiveModelDir("/bugs/bug8597").findModule("foo").orElseThrow(); + for (ModuleImport moduleImport : foo.getImports()) { switch (moduleImport.getModuleName()) { case "bar": assertEquals(Revision.ofNullable("1970-01-01"), moduleImport.getRevision()); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java index c62daf64ba..828722729b 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9005Test.java @@ -8,21 +8,18 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.ModuleImport; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.Submodule; -public class Bug9005Test { +public class Bug9005Test extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug9005"); - assertNotNull(context); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug9005"); final Module foo = context.findModule("foo", Revision.of("2017-07-07")).get(); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java index 8f75d76d9e..70d02905cf 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9242Test.java @@ -17,18 +17,16 @@ import org.opendaylight.yangtools.yang.common.Revision; import org.opendaylight.yangtools.yang.model.api.Deviation; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -public class Bug9242Test { +public class Bug9242Test extends AbstractYangTest { @Test - public void testDeviateReplaceWithUserDefinedTypes() throws Exception { - final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug9242/"); - assertNotNull(schemaContext); + public void testDeviateReplaceWithUserDefinedTypes() { + final var schemaContext = assertEffectiveModelDir("/bugs/bug9242/"); final Revision revision = Revision.of("2017-10-13"); - final Module rootModule = schemaContext.findModule("root-module", revision).get(); - final Module impModule = schemaContext.findModule("imp-module", revision).get(); + final Module rootModule = schemaContext.findModule("root-module", revision).orElseThrow(); + final Module impModule = schemaContext.findModule("imp-module", revision).orElseThrow(); TypeDefinition deviatedMyLeafType = null; TypeDefinition deviatedMyLeaf2Type = null; diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java index e4a81c1bc8..5ba1b6c982 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug9244Test.java @@ -20,14 +20,11 @@ import org.opendaylight.yangtools.yang.model.api.ElementCountConstraint; import org.opendaylight.yangtools.yang.model.api.LeafListSchemaNode; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; - -public class Bug9244Test { +public class Bug9244Test extends AbstractYangTest { @Test - public void testDeviateReplaceOfImplicitSubstatements() throws Exception { - final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug9244/"); - assertNotNull(schemaContext); + public void testDeviateReplaceOfImplicitSubstatements() { + final var schemaContext = assertEffectiveModelDir("/bugs/bug9244/"); final Module barModule = schemaContext.findModule("bar", Revision.of("2017-10-13")).get(); final ContainerSchemaNode barCont = (ContainerSchemaNode) barModule.getDataChildByName( diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java index ee03318aa8..dcbe351e2e 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java @@ -7,9 +7,9 @@ */ package org.opendaylight.yangtools.yang.stmt; +import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertThrows; import java.util.Optional; import org.junit.Before; @@ -22,15 +22,14 @@ import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -public class CaseStmtTest { +public class CaseStmtTest extends AbstractYangTest { private static final Optional OPT_FALSE = Optional.of(Boolean.FALSE); private static final Optional OPT_TRUE = Optional.of(Boolean.TRUE); - private SchemaContext schema; + private EffectiveModelContext schema; private Module rootFoo; private Module rootBar; private QNameModule qnameFoo; @@ -41,8 +40,8 @@ public class CaseStmtTest { private CaseSchemaNode tempChoice; @Before - public void setup() throws Exception { - schema = StmtTestUtils.parseYangSources("/case-test"); + public void setup() { + schema = assertEffectiveModelDir("/case-test"); Revision rev = Revision.of("2015-09-09"); rootFoo = schema.findModule("foo", rev).get(); rootBar = schema.findModule("bar", rev).get(); @@ -530,13 +529,13 @@ public class CaseStmtTest { @Test public void testInferenceExceptionChoice() { - assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/choice")); + assertInferenceExceptionDir("/case-test/case-test-exceptions/choice", + startsWith("Parent node has config=false, this node must not be specifed as config=true [at ")); } @Test - public void testInferenceExceptionCase() throws Exception { - assertThrows(ReactorException.class, - () -> StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/case")); + public void testInferenceExceptionCase() { + assertInferenceExceptionDir("/case-test/case-test-exceptions/case", + startsWith("Parent node has config=false, this node must not be specifed as config=true [at ")); } } \ No newline at end of file diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java index 6c3f9a0da8..b51b5b8472 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java @@ -29,13 +29,10 @@ import org.opendaylight.yangtools.yang.model.api.stmt.RefineEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement; import org.opendaylight.yangtools.yang.model.api.stmt.UsesEffectiveStatement; -public class ControllerStmtParserTest { - +public class ControllerStmtParserTest extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/sal-broker-impl"); - assertNotNull(context); - + public void test() { + final var context = assertEffectiveModelDir("/sal-broker-impl"); salDomBrokerImplModuleTest(context); configModuleTest(context); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java index 648f644f36..43aa2d7724 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java @@ -44,12 +44,10 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.InvalidSubstatementException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -public class DeviationResolutionTest { - +public class DeviationResolutionTest extends AbstractYangTest { @Test public void testDeviateNotSupported() throws Exception { - final EffectiveModelContext schemaContext = StmtTestUtils.parseYangSources( - "/deviation-resolution-test/deviation-not-supported"); + final var schemaContext = assertEffectiveModelDir("/deviation-resolution-test/deviation-not-supported"); assertNotNull(schemaContext); final Module importedModule = schemaContext.findModule("imported", Revision.of("2017-01-20")).get(); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java index 5b4a4e2e04..5849aa871a 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityIssueIetfRoutingTest.java @@ -7,15 +7,11 @@ */ package org.opendaylight.yangtools.yang.stmt; -import static org.junit.Assert.assertNotNull; - import org.junit.Test; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -public class IdentityIssueIetfRoutingTest { +public class IdentityIssueIetfRoutingTest extends AbstractYangTest { @Test - public void test() throws Exception { - final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/identity-ietf-routing-test/"); - assertNotNull(context); + public void test() { + assertEffectiveModelDir("/bugs/identity-ietf-routing-test/"); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java index 3a591ce650..1b037d9441 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java @@ -122,11 +122,6 @@ public final class StmtTestUtils { return parseYangSources(config, supportedFeatures, sources); } - public static EffectiveModelContext parseYangSources(final String yangSourcesDirectoryPath) - throws ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { - return parseYangSources(yangSourcesDirectoryPath, YangParserConfiguration.DEFAULT); - } - public static EffectiveModelContext parseYangSources(final String yangSourcesDirectoryPath, final YangParserConfiguration config) throws ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java index 15e88ad4c7..b134482b57 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1039Test.java @@ -11,9 +11,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -public class YT1039Test { +public class YT1039Test extends AbstractYangTest { @Test - public void testUsesRefineAnyxml() throws Exception { - assertEquals(2, StmtTestUtils.parseYangSources("/bugs/YT1039").getModuleStatements().size()); + public void testUsesRefineAnyxml() { + assertEquals(2, assertEffectiveModelDir("/bugs/YT1039").getModuleStatements().size()); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java index ab26a16c43..d657c4de3e 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1042Test.java @@ -7,26 +7,14 @@ */ package org.opendaylight.yangtools.yang.stmt; -import static org.hamcrest.MatcherAssert.assertThat; -import static org.hamcrest.Matchers.isA; import static org.hamcrest.Matchers.startsWith; -import static org.junit.Assert.fail; import org.junit.Test; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -public class YT1042Test { +public class YT1042Test extends AbstractYangTest { @Test - public void testSubmoduleConflict() throws Exception { - try { - StmtTestUtils.parseYangSources("/bugs/YT1042"); - fail("Sechema assembly should have failed"); - } catch (ReactorException e) { - final Throwable cause = e.getCause(); - assertThat(cause, isA(SourceException.class)); - assertThat(cause.getMessage(), - startsWith("Cannot add data tree child with name (foo)foo, a conflicting child already exists")); - } + public void testSubmoduleConflict() { + assertSourceExceptionDir("/bugs/YT1042", + startsWith("Cannot add data tree child with name (foo)foo, a conflicting child already exists")); } } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java index fcb664aa26..c71d10dfbb 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1133Test.java @@ -18,7 +18,7 @@ import java.nio.charset.StandardCharsets; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -public class YT1133Test { +public class YT1133Test extends AbstractYangTest { @Test @SuppressWarnings("checkstyle:regexpSinglelineJava") public void testAugmentKeys() throws Exception { @@ -28,7 +28,7 @@ public class YT1133Test { try (PrintStream out = new PrintStream(output, true, StandardCharsets.UTF_8)) { System.setOut(out); - ctx = StmtTestUtils.parseYangSources("/bugs/YT1133"); + ctx = assertEffectiveModelDir("/bugs/YT1133"); } finally { System.setOut(stdout); } diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java index 08f99382f0..088e05a17d 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1201Test.java @@ -20,13 +20,13 @@ import org.opendaylight.yangtools.yang.xpath.api.YangExpr; import org.opendaylight.yangtools.yang.xpath.api.YangLocationPath.Relative; import org.opendaylight.yangtools.yang.xpath.api.YangXPathAxis; -public class YT1201Test { +public class YT1201Test extends AbstractYangTest { private static final QName FOO = QName.create("foo", "foo"); private static final QName BAR = QName.create("foo", "bar"); @Test - public void testWhenPrefixes() throws Exception { - final DataSchemaNode bar = StmtTestUtils.parseYangSources("/bugs/YT1201/").getDataChildByName(BAR); + public void testWhenPrefixes() { + final DataSchemaNode bar = assertEffectiveModelDir("/bugs/YT1201/").getDataChildByName(BAR); assertThat(bar, instanceOf(ContainerSchemaNode.class)); final YangExpr when = ((ContainerSchemaNode) bar).getWhenCondition().get().getRootExpr(); assertThat(when, instanceOf(Relative.class)); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1262Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1262Test.java index e31079486a..e2a368bc3e 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1262Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT1262Test.java @@ -24,10 +24,10 @@ import org.opendaylight.yangtools.yang.model.api.stmt.OutputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.RpcEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.TypedefNamespace; -public class YT1262Test { +public class YT1262Test extends AbstractYangTest { @Test - public void testTypedefNamespaces() throws Exception { - final var modelContext = StmtTestUtils.parseYangSources("/bugs/YT1262"); + public void testTypedefNamespaces() { + final var modelContext = assertEffectiveModelDir("/bugs/YT1262"); final var module = modelContext.getModuleStatement(QNameModule.create(XMLNamespace.of("foo"))); assertTypedef(module, "fdef"); assertTypedef(module, "sdef"); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java index fc73ebd0f1..a208d74c89 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT841Test.java @@ -15,12 +15,12 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.stmt.InputEffectiveStatement; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaTreeEffectiveStatement; -public class YT841Test { +public class YT841Test extends AbstractYangTest { private static final QName FOO = QName.create("foo", "2018-01-02", "foo"); @Test public void testFindDataSchemaNode() throws Exception { - final SchemaTreeEffectiveStatement input = StmtTestUtils.parseYangSources("/bugs/YT841/") + final SchemaTreeEffectiveStatement input = assertEffectiveModelDir("/bugs/YT841/") .getModuleStatement(FOO) .findSchemaTreeNode(FOO, FOO, FOO, QName.create(FOO, "input")) .orElse(null); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java index 7f2693c838..19cf648685 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YT956Test.java @@ -16,15 +16,15 @@ import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -public class YT956Test { +public class YT956Test extends AbstractYangTest { private static final QName ANOTHER_CONTAINER = QName.create("http://www.example.com/anothermodule", "another-container"); private static final QName FIRST_AUGMENT = QName.create("http://www.example.com/mainmodule", "first-augment"); @Test - public void testAugmentationConditional() throws Exception { - final DataSchemaNode another = StmtTestUtils.parseYangSources("/bugs/YT956/") - .findDataChildByName(ANOTHER_CONTAINER).get(); + public void testAugmentationConditional() { + final DataSchemaNode another = assertEffectiveModelDir("/bugs/YT956/") + .getDataChildByName(ANOTHER_CONTAINER); assertThat(another, isA(ContainerSchemaNode.class)); final ContainerSchemaNode anotherContainer = (ContainerSchemaNode) another; diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java index d5b95791f9..1bfa3555d4 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java @@ -11,9 +11,7 @@ import static org.hamcrest.CoreMatchers.startsWith; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; -import java.util.Collection; import org.junit.Test; -import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.ModuleImport; public class YangParserIdentityTest extends AbstractYangTest { @@ -35,10 +33,10 @@ public class YangParserIdentityTest extends AbstractYangTest { // imported module prefixed base identity name equals identity name, but // prefix differs @Test - public void testParsingImportPrefixIdentityTestModule() throws Exception { - Module module = StmtTestUtils.parseYangSources("/identity/import").findModules("prefiximportidentitytest") + public void testParsingImportPrefixIdentityTestModule() { + final var module = assertEffectiveModelDir("/identity/import").findModules("prefiximportidentitytest") .iterator().next(); - Collection imports = module.getImports(); + final var imports = module.getImports(); assertEquals(imports.size(), 1); ModuleImport dummy = TestUtils.findImport(imports, "dummy"); assertNotEquals(dummy.getPrefix(), module.getPrefix()); diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java index 2b42c6b9bc..f2f13907c6 100644 --- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java +++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java @@ -10,14 +10,12 @@ package org.opendaylight.yangtools.yang.stmt.test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; import java.util.List; import java.util.Optional; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.Int32TypeDefinition; @@ -25,16 +23,15 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; -import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; +import org.opendaylight.yangtools.yang.stmt.AbstractYangTest; -public class Bug5200Test { +public class Bug5200Test extends AbstractYangTest { private static final String NS = "foo"; private static final String REV = "2016-05-05"; @Test - public void test() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5200"); - assertNotNull(context); + public void test() { + final var context = assertEffectiveModelDir("/bugs/bug5200"); QName root = QName.create(NS, REV, "root"); QName myLeaf = QName.create(NS, REV, "my-leaf");