From b81b12961e1d021c241e285e32ef20595a3098bd Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Mon, 20 Feb 2017 13:26:23 +0100 Subject: [PATCH] Update StmtTestUtils Do not use deprecated YangStatementSourceImpl. Also adjust tests to throw Exception, thus ridding them of some complexity. Change-Id: I549197204adc64edb60d44cc439d02dbd39c815e Signed-off-by: Robert Varga --- .../reactor/CrossSourceStatementReactor.java | 5 ++ .../stmt/rfc7950/ActionStatementTest.java | 20 ++--- .../parser/stmt/rfc7950/Bug6867BasicTest.java | 21 ++--- .../yang/parser/stmt/rfc7950/Bug6868Test.java | 13 +--- .../yang/parser/stmt/rfc7950/Bug6869Test.java | 12 +-- .../yang/parser/stmt/rfc7950/Bug6870Test.java | 12 +-- .../yang/parser/stmt/rfc7950/Bug6871Test.java | 11 +-- .../yang/parser/stmt/rfc7950/Bug6874Test.java | 43 ++++++----- .../yang/parser/stmt/rfc7950/Bug6876Test.java | 17 ++--- .../yang/parser/stmt/rfc7950/Bug6880Test.java | 8 +- .../yang/parser/stmt/rfc7950/Bug6883Test.java | 6 +- .../yang/parser/stmt/rfc7950/Bug6884Test.java | 18 ++--- .../yang/parser/stmt/rfc7950/Bug6885Test.java | 25 +++--- .../yang/parser/stmt/rfc7950/Bug6887Test.java | 43 +++++------ .../yang/parser/stmt/rfc7950/Bug6897Test.java | 15 ++-- .../yang/parser/stmt/rfc7950/Bug6901Test.java | 74 +++++------------- .../stmt/rfc7950/IdentityStatementTest.java | 8 +- .../rfc7950/IdentityrefStatementTest.java | 8 +- .../stmt/rfc7950/LeafrefStatementTest.java | 8 +- .../yang/stmt/AugmentArgumentParsingTest.java | 55 ++++++-------- .../yang/stmt/AugmentProcessTest.java | 56 ++++---------- .../yang/stmt/AugmentSimplestTest.java | 15 ++-- .../yang/stmt/AugmentToExtensionTest.java | 10 +-- .../yangtools/yang/stmt/Bug2872Test.java | 6 +- .../yangtools/yang/stmt/Bug3799Test.java | 16 ++-- .../yang/stmt/Bug3874ExtensionTest.java | 8 +- .../yangtools/yang/stmt/Bug4231Test.java | 6 +- .../yangtools/yang/stmt/Bug4410Test.java | 6 +- .../yangtools/yang/stmt/Bug4456Test.java | 6 +- .../yangtools/yang/stmt/Bug4933Test.java | 6 +- .../yangtools/yang/stmt/Bug5059Test.java | 6 +- .../yangtools/yang/stmt/Bug5101Test.java | 6 +- .../yangtools/yang/stmt/Bug5335Test.java | 18 ++--- .../yangtools/yang/stmt/Bug5396Test.java | 6 +- .../yangtools/yang/stmt/Bug5437Test.java | 6 +- .../yangtools/yang/stmt/Bug5481Test.java | 7 +- .../yangtools/yang/stmt/Bug5518Test.java | 6 +- .../yangtools/yang/stmt/Bug5550Test.java | 6 +- .../yangtools/yang/stmt/Bug5712Test.java | 8 +- .../yangtools/yang/stmt/Bug5884Test.java | 10 +-- .../yangtools/yang/stmt/Bug5899Test.java | 7 +- .../yangtools/yang/stmt/Bug5942Test.java | 6 +- .../yangtools/yang/stmt/Bug5946Test.java | 9 +-- .../yangtools/yang/stmt/Bug6150Test.java | 25 ++---- .../yangtools/yang/stmt/Bug6180Test.java | 13 +--- .../yangtools/yang/stmt/Bug6240Test.java | 12 +-- .../yangtools/yang/stmt/Bug6316Test.java | 6 +- .../yangtools/yang/stmt/Bug6410Test.java | 7 +- .../yangtools/yang/stmt/Bug6491Test.java | 9 +-- .../yangtools/yang/stmt/Bug6669Test.java | 19 ++--- .../yangtools/yang/stmt/Bug6771Test.java | 11 +-- .../yangtools/yang/stmt/Bug6972Test.java | 7 +- .../yangtools/yang/stmt/Bug7146Test.java | 4 +- .../yangtools/yang/stmt/Bug7440Test.java | 7 +- .../yangtools/yang/stmt/Bug7480Test.java | 11 +-- .../yangtools/yang/stmt/CaseStmtTest.java | 9 +-- .../yangtools/yang/stmt/ChoiceStmtTest.java | 16 ++-- .../yang/stmt/ControllerStmtParserTest.java | 9 +-- .../yang/stmt/DeclaredStatementsTest.java | 35 ++++----- .../yang/stmt/DeviationResolutionTest.java | 42 +++++----- .../yang/stmt/DeviationStmtTest.java | 8 +- .../yang/stmt/EffectiveBuildTest.java | 22 +++--- .../yang/stmt/EffectiveIdentityTest.java | 26 +++---- .../yang/stmt/EffectiveModuleTest.java | 23 +++--- .../EffectiveModulesAndSubmodulesTest.java | 25 +++--- .../yang/stmt/EffectiveStatementTypeTest.java | 6 +- ...EffectiveUsesRefineAndConstraintsTest.java | 9 ++- .../yang/stmt/ExtensionStmtTest.java | 20 +++-- .../yang/stmt/GroupingAndUsesStmtTest.java | 16 ++-- .../yangtools/yang/stmt/GroupingTest.java | 5 +- .../yangtools/yang/stmt/IdentityStmtTest.java | 44 ++++++----- .../yang/stmt/IfFeatureResolutionTest.java | 8 +- .../yang/stmt/ImportResolutionBasicTest.java | 54 ++++++------- .../yang/stmt/ImportRevisionsTest.java | 59 +++++++------- .../yang/stmt/IncludeResolutionTest.java | 42 +++++----- .../yang/stmt/IncludeRevisionsTest.java | 39 ++++------ .../yang/stmt/IncludedStmtsTest.java | 19 ++--- .../yangtools/yang/stmt/KeyTest.java | 22 ++---- .../yangtools/yang/stmt/ListKeysTest.java | 35 +++------ .../yangtools/yang/stmt/ListTest.java | 8 +- .../yang/stmt/MoreRevisionsTest.java | 68 +++++++---------- .../yang/stmt/MustAndWhenStmtTest.java | 13 ++-- .../yang/stmt/NotificationStmtTest.java | 11 ++- .../yangtools/yang/stmt/OrderingTest.java | 27 ++----- .../yangtools/yang/stmt/RpcStmtTest.java | 13 ++-- .../yangtools/yang/stmt/StmtTestUtils.java | 73 ++++++++++-------- .../yang/stmt/SubstatementValidatorTest.java | 14 ++-- .../yangtools/yang/stmt/TestUtils.java | 60 +++++---------- .../yang/stmt/TypedefConstraintsTest.java | 10 +-- .../yang/stmt/TypedefSubStmtsTest.java | 9 ++- .../yang/stmt/TypesResolutionTest.java | 41 ++++------ .../yangtools/yang/stmt/UsesAugmentTest.java | 5 +- .../yangtools/yang/stmt/YangFileStmtTest.java | 47 ++++++------ .../yang/stmt/YangParserIdentityTest.java | 7 +- .../yangtools/yang/stmt/YangParserTest.java | 35 ++++----- .../yang/stmt/YangParserWithContextTest.java | 76 +++++++++---------- .../yang/stmt/YangTypes2StmtTest.java | 17 ++--- .../yang/stmt/YangTypesStmtTest.java | 27 +++---- .../semver/SemanticVersionBorderCaseTest.java | 21 ++--- .../semver/SemanticVersionComplexTest.java | 33 +++----- .../semver/SemanticVersionDefaultsTest.java | 14 ++-- .../SemanticVersionIgnoringRevisionTest.java | 13 +--- .../semver/SemanticVersionImportTest.java | 17 ++--- .../SemanticVersionMultipleImportTest.java | 18 ++--- .../semver/SemanticVersionPositionTest.java | 14 +--- .../yang/stmt/semver/SemanticVersionTest.java | 32 ++++---- .../yangtools/yang/stmt/test/Bug5200Test.java | 6 +- .../yang/stmt/yin/YinFileStmtTest.java | 12 +-- .../plugin/ThirdPartyExtensionPluginTest.java | 14 ++-- 109 files changed, 841 insertions(+), 1296 deletions(-) diff --git a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java index 56efa9c1d4..1bb3850b3e 100644 --- a/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java +++ b/yang/yang-parser-impl/src/main/java/org/opendaylight/yangtools/yang/parser/stmt/reactor/CrossSourceStatementReactor.java @@ -11,6 +11,7 @@ import com.google.common.collect.ImmutableMap; import com.google.common.io.ByteSource; import java.io.IOException; import java.io.InputStream; +import java.util.Arrays; import java.util.Collection; import java.util.EnumMap; import java.util.List; @@ -127,6 +128,10 @@ public class CrossSourceStatementReactor { * which should be added into main sources */ public void addSources(final StatementStreamSource... sources) { + addSources(Arrays.asList(sources)); + } + + public void addSources(final Collection sources) { for (final StatementStreamSource source : sources) { context.addSource(source); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java index 30fa197b34..afba32cd18 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/ActionStatementTest.java @@ -13,19 +13,16 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.HashSet; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.model.api.ActionDefinition; +import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.ActionDefinition; -import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; @@ -36,8 +33,7 @@ public class ActionStatementTest { private static final String FOO_REV = "2016-12-13"; @Test - public void testActionStatementInDataContainers() throws ReactorException, FileNotFoundException, - URISyntaxException, ParseException { + public void testActionStatementInDataContainers() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foo.yang"); assertNotNull(schemaContext); @@ -79,7 +75,7 @@ public class ActionStatementTest { } @Test - public void testActionUnsupportedInYang10() throws ReactorException, FileNotFoundException, URISyntaxException { + public void testActionUnsupportedInYang10() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foo10.yang"); fail("Test should fail due to invalid Yang 1.0"); @@ -89,7 +85,7 @@ public class ActionStatementTest { } @Test - public void testActionWithinIllegalAncestor() throws FileNotFoundException, URISyntaxException { + public void testActionWithinIllegalAncestor() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foo-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -100,7 +96,7 @@ public class ActionStatementTest { } @Test - public void testActionWithinListWithoutKey() throws FileNotFoundException, URISyntaxException { + public void testActionWithinListWithoutKey() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/action-stmt/bar-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -112,7 +108,7 @@ public class ActionStatementTest { } @Test - public void testActionInUsedGroupingWithinCase() throws FileNotFoundException, URISyntaxException { + public void testActionInUsedGroupingWithinCase() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/action-stmt/baz-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -124,7 +120,7 @@ public class ActionStatementTest { } @Test - public void testActionInUsedGroupingAtTopLevelOfModule() throws FileNotFoundException, URISyntaxException { + public void testActionInUsedGroupingAtTopLevelOfModule() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/action-stmt/foobar-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java index 54cc314a04..a154d46e19 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6867BasicTest.java @@ -12,31 +12,27 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6867BasicTest { @Test - public void valid10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void valid10Test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/basic-test/valid-10.yang"); assertNotNull(schemaContext); } @Test - public void valid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void valid11Test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/basic-test/valid-11.yang"); assertNotNull(schemaContext); } @Test - public void invalid10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/basic-test/invalid-10.yang"); fail("Test should fail due to invalid Yang 1.0"); @@ -46,7 +42,7 @@ public class Bug6867BasicTest { } @Test - public void invalid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid11Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/basic-test/invalid-11.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -56,13 +52,13 @@ public class Bug6867BasicTest { } @Test - public void anyData11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void anyData11Test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/basic-test/anydata-11.yang"); assertNotNull(schemaContext); } @Test - public void anyData10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void anyData10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/basic-test/anydata-10.yang"); fail("Test should fail due to invalid Yang 1.0"); @@ -72,14 +68,13 @@ public class Bug6867BasicTest { } @Test - public void yangModelTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void yangModelTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/model"); assertNotNull(schemaContext); } @Test - public void unsupportedVersionTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void unsupportedVersionTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/basic-test/unsupported-version.yang"); fail("Test should fail due to unsupported Yang version"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java index 6514223a85..0131e3b047 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6868Test.java @@ -15,8 +15,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -27,9 +25,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6868Test { @@ -41,8 +37,7 @@ public class Bug6868Test { "my-container-3", "foo", "not-foo", "imp-bar", "imp-bar-2"); @Test - public void ifFeatureYang11ResolutionTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeatureYang11ResolutionTest() throws Exception { assertSchemaContextFor(null, ALL_CONTAINERS); assertSchemaContextFor(ImmutableSet.of(), ImmutableSet.of("my-container-1", "my-container-2", "not-foo")); assertSchemaContextFor(ImmutableSet.of("foo"), ImmutableSet.of("foo")); @@ -57,8 +52,8 @@ public class Bug6868Test { assertSchemaContextFor(ImmutableSet.of("foo", "baz", "imp:bar"), ImmutableSet.of("foo", "imp-bar", "imp-bar-2")); } - private static void assertSchemaContextFor(final Set supportedFeatures, final Set expectedContainers) - throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + private static void assertSchemaContextFor(final Set supportedFeatures, + final Set expectedContainers) throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/bug6868/yang11", supportedFeatures != null ? createFeaturesSet(supportedFeatures) : null, StatementParserMode.DEFAULT_MODE); @@ -96,7 +91,7 @@ public class Bug6868Test { } @Test - public void invalidYang10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalidYang10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6868/invalid10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java index 3d90a59159..95fbb41750 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6869Test.java @@ -17,8 +17,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -30,9 +28,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6869Test { @@ -40,8 +36,7 @@ public class Bug6869Test { private static final String FOO_REV = "1970-01-01"; @Test - public void identityNoFeaureTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void identityNoFeaureTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6869/foo.yang", ImmutableSet.of()); assertNotNull(schemaContext); @@ -56,8 +51,7 @@ public class Bug6869Test { } @Test - public void identityAllFeauresTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void identityAllFeauresTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6869/foo.yang", createFeaturesSet("identity-feature", "mandatory-leaf", "tls", "ssh", "two", "three")); assertNotNull(schemaContext); @@ -94,7 +88,7 @@ public class Bug6869Test { } @Test - public void invalidYang10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalidYang10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6869/invalid10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java index e1fb13099a..1ec0b6ed9e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6870Test.java @@ -15,8 +15,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.List; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -29,9 +27,7 @@ import org.opendaylight.yangtools.yang.model.api.type.ModifierKind; import org.opendaylight.yangtools.yang.model.api.type.PatternConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6870Test { @@ -39,7 +35,7 @@ public class Bug6870Test { private static final String FOO_REV = "1970-01-01"; @Test - public void valid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void valid11Test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6870/foo.yang"); assertNotNull(schemaContext); @@ -47,7 +43,7 @@ public class Bug6870Test { assertModifier(schemaContext, null, ImmutableList.of("root", "my-leaf-2")); } - private void assertModifier(final SchemaContext schemaContext, final ModifierKind expectedModifierKind, + private static void assertModifier(final SchemaContext schemaContext, final ModifierKind expectedModifierKind, final List localNamePath) { final SchemaNode findNode = findNode(schemaContext, localNamePath); assertTrue(findNode instanceof LeafSchemaNode); @@ -71,7 +67,7 @@ public class Bug6870Test { } @Test - public void invalid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid11Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6870/invalid11.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -82,7 +78,7 @@ public class Bug6870Test { } @Test - public void invalid10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6870/invalid10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java index 21e2e7f9eb..e61cdb6125 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6871Test.java @@ -13,9 +13,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.Set; import org.junit.Test; @@ -32,8 +29,7 @@ import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6871Test { @Test - public void testValidYang11Model() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void testValidYang11Model() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6871/foo.yang"); assertNotNull(schemaContext); @@ -64,14 +60,13 @@ public class Bug6871Test { } @Test - public void testInvalidYang10Model() throws FileNotFoundException, URISyntaxException { + public void testInvalidYang10Model() throws Exception { assertException("/rfc7950/bug6871/foo10.yang", "MUST is not valid for NOTIFICATION"); assertException("/rfc7950/bug6871/bar10.yang", "MUST is not valid for INPUT"); assertException("/rfc7950/bug6871/baz10.yang", "MUST is not valid for OUTPUT"); } - private static void assertException(final String sourcePath, final String exceptionMessage) - throws FileNotFoundException, URISyntaxException { + private static void assertException(final String sourcePath, final String exceptionMessage) throws Exception { try { StmtTestUtils.parseYangSource(sourcePath); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java index 30990b4688..a672030f0d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6874Test.java @@ -11,9 +11,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.ModuleImport; @@ -21,29 +20,28 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.meta.DeclaredStatement; 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.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.DescriptionStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.IncludeStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ModuleStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.ReferenceStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6874Test { - private static final YangStatementSourceImpl ROOT_MODULE = new YangStatementSourceImpl - ("/rfc7950/include-import-stmt-test/valid-11/root-module.yang", false); - private static final YangStatementSourceImpl CHILD_MODULE = new YangStatementSourceImpl - ("/rfc7950/include-import-stmt-test/valid-11/child-module.yang", false); - private static final YangStatementSourceImpl CHILD_MODULE_1 = new YangStatementSourceImpl - ("/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang", false); - private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl - ("/rfc7950/include-import-stmt-test/valid-11/imported-module.yang", false); + private static final StatementStreamSource ROOT_MODULE = sourceForResource + ("/rfc7950/include-import-stmt-test/valid-11/root-module.yang"); + private static final StatementStreamSource CHILD_MODULE = sourceForResource + ("/rfc7950/include-import-stmt-test/valid-11/child-module.yang"); + private static final StatementStreamSource CHILD_MODULE_1 = sourceForResource + ("/rfc7950/include-import-stmt-test/valid-11/child-module-1.yang"); + private static final StatementStreamSource IMPORTED_MODULE = sourceForResource + ("/rfc7950/include-import-stmt-test/valid-11/imported-module.yang"); @Test - public void valid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void valid11Test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/valid-11"); assertNotNull(schemaContext); @@ -58,38 +56,40 @@ public class Bug6874Test { } @Test - public void invalid10IncludeStmtTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid10IncludeStmtTest() throws Exception { try { StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/invalid-include-10"); fail("Test must fail: DESCRIPTION/REFERENCE are not valid for INCLUDE in Yang 1.0"); } catch (final SomeModifiersUnresolvedException e) { final String msg = e.getCause().getMessage(); - assertTrue(msg.startsWith("DESCRIPTION is not valid for INCLUDE") || msg.startsWith("REFERENCE is not valid for INCLUDE")); + assertTrue(msg.startsWith("DESCRIPTION is not valid for INCLUDE") + || msg.startsWith("REFERENCE is not valid for INCLUDE")); } } @Test - public void invalid10ImportStmtTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid10ImportStmtTest() throws Exception { try { StmtTestUtils.parseYangSources("/rfc7950/include-import-stmt-test/invalid-import-10"); fail("Test must fail: DESCRIPTION/REFERENCE are not valid for IMPORT in Yang 1.0"); } catch (final SomeModifiersUnresolvedException e) { final String msg = e.getCause().getMessage(); - assertTrue(msg.startsWith("DESCRIPTION is not valid for IMPORT") || msg.startsWith("REFERENCE is not valid for IMPORT")); + assertTrue(msg.startsWith("DESCRIPTION is not valid for IMPORT") + || msg.startsWith("REFERENCE is not valid for IMPORT")); } } @Test public void descriptionAndReferenceTest11() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_MODULE, CHILD_MODULE, CHILD_MODULE_1, IMPORTED_MODULE); + reactor.addSources(ROOT_MODULE, CHILD_MODULE, CHILD_MODULE_1, IMPORTED_MODULE); reactor.build().getRootStatements().forEach(declaredStmt -> { if(declaredStmt instanceof ModuleStatementImpl) { declaredStmt.declaredSubstatements().forEach(subStmt -> { if (subStmt instanceof IncludeStatementImpl && subStmt.rawArgument().equals("child-module")) { - subStmt.declaredSubstatements().forEach(includeSubStmt -> { verifyDescAndRef(includeSubStmt); }); + subStmt.declaredSubstatements().forEach(Bug6874Test::verifyDescAndRef); } }); } @@ -97,9 +97,10 @@ public class Bug6874Test { } @SuppressWarnings("rawtypes") - private void verifyDescAndRef (DeclaredStatement stmt) { + private static void verifyDescAndRef (final DeclaredStatement stmt) { if (stmt instanceof DescriptionStatementImpl) { - assertEquals("Yang 1.1: Allow description and reference in include and import.", ((DescriptionStatementImpl) stmt).argument()); + assertEquals("Yang 1.1: Allow description and reference in include and import.", + ((DescriptionStatementImpl) stmt).argument()); } if (stmt instanceof ReferenceStatementImpl) { assertEquals("https://tools.ietf.org/html/rfc7950 section-7.1.5/6", ((ReferenceStatementImpl) stmt).argument()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java index 7e6190deda..542d6164cd 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6876Test.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableList; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -21,8 +19,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6876Test { @@ -32,20 +28,23 @@ public class Bug6876Test { private static final String FOO_REV = "1970-01-01"; @Test - public void yang11Test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void yang11Test() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/rfc7950/bug6876/yang11"); assertNotNull(context); - assertTrue(findNode(context, ImmutableList.of(bar("augment-target"), bar("my-leaf"))) instanceof LeafSchemaNode); - assertTrue(findNode(context, ImmutableList.of(bar("augment-target"), foo("mandatory-leaf"))) instanceof LeafSchemaNode); + assertTrue(findNode(context, ImmutableList.of(bar("augment-target"), + bar("my-leaf"))) instanceof LeafSchemaNode); + assertTrue(findNode(context, ImmutableList.of(bar("augment-target"), + foo("mandatory-leaf"))) instanceof LeafSchemaNode); } @Test - public void yang10Test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void yang10Test() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/rfc7950/bug6876/yang10"); assertNotNull(context); - assertTrue(findNode(context, ImmutableList.of(bar("augment-target"), bar("my-leaf"))) instanceof LeafSchemaNode); + assertTrue(findNode(context, ImmutableList.of(bar("augment-target"), + bar("my-leaf"))) instanceof LeafSchemaNode); assertNull(findNode(context, ImmutableList.of(bar("augment-target"), foo("mandatory-leaf")))); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java index b08c141c95..12897ae68a 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6880Test.java @@ -13,8 +13,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -23,9 +21,7 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6880Test { @@ -33,7 +29,7 @@ public class Bug6880Test { private static final String FOO_REV = "1970-01-01"; @Test - public void valid10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void valid10Test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6880/foo.yang"); assertNotNull(schemaContext); @@ -48,7 +44,7 @@ public class Bug6880Test { } @Test - public void invalid10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6880/invalid10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java index 1e052068fb..6f410dcb7c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6883Test.java @@ -14,8 +14,6 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.AnyDataSchemaNode; @@ -24,8 +22,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6883Test { @@ -33,7 +29,7 @@ public class Bug6883Test { private static final String FOO_REV = "1970-01-01"; @Test - public void test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/bug6883"); assertNotNull(schemaContext); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java index 090788836a..99a78730dc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6884Test.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableList; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -20,8 +18,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6884Test { @@ -29,21 +25,23 @@ public class Bug6884Test { private static final String FOO_REV = "1970-01-01"; @Test - public void testYang11() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void testYang11() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/bug6884/yang1-1"); assertNotNull(schemaContext); - assertTrue(findNode(schemaContext, ImmutableList.of(foo("sub-root"), foo("sub-foo-2-con"))) instanceof ContainerSchemaNode); + assertTrue(findNode(schemaContext, ImmutableList.of(foo("sub-root"), foo("sub-foo-2-con"))) + instanceof ContainerSchemaNode); } @Test - public void testCircularIncludesYang10() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void testCircularIncludesYang10() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/rfc7950/bug6884/circular-includes"); assertNotNull(schemaContext); - assertTrue(findNode(schemaContext, ImmutableList.of(foo("sub-root"), foo("sub-foo-2-con"))) instanceof ContainerSchemaNode); - assertTrue(findNode(schemaContext, ImmutableList.of(foo("sub-root-2"), foo("sub-foo-con"))) instanceof ContainerSchemaNode); + assertTrue(findNode(schemaContext, ImmutableList.of(foo("sub-root"), foo("sub-foo-2-con"))) + instanceof ContainerSchemaNode); + assertTrue(findNode(schemaContext, ImmutableList.of(foo("sub-root-2"), foo("sub-foo-con"))) + instanceof ContainerSchemaNode); } private static SchemaNode findNode(final SchemaContext context, final Iterable qNames) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java index 72970144da..be34f7cbec 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6885Test.java @@ -12,10 +12,11 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; +import java.io.IOException; import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; @@ -23,7 +24,7 @@ import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6885Test { @Test - public void validYang10Test() throws ReactorException, FileNotFoundException, URISyntaxException { + public void validYang10Test() throws Exception { // Yang 1.0 allows "if-feature" and "when" on list keys final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/list-keys-test/correct-list-keys-test.yang"); @@ -31,49 +32,49 @@ public class Bug6885Test { } @Test - public void invalidListLeafKeyTest1() throws FileNotFoundException, URISyntaxException { + public void invalidListLeafKeyTest1() throws Exception { final String exceptionMessage = "(urn:ietf:params:xml:ns:yang:yin:1)when statement is not allowed in " + "(incorrect-list-keys-test?revision=2017-02-06)a2 leaf statement which is specified as a list key."; testForWhen("/rfc7950/list-keys-test/incorrect-list-keys-test.yang", exceptionMessage); } @Test - public void invalidListLeafKeyTest2() throws FileNotFoundException, URISyntaxException { + public void invalidListLeafKeyTest2() throws Exception { final String exceptionMessage = "(urn:ietf:params:xml:ns:yang:yin:1)if-feature statement is not allowed in " + "(incorrect-list-keys-test1?revision=2017-02-06)b leaf statement which is specified as a list key."; testForIfFeature("/rfc7950/list-keys-test/incorrect-list-keys-test1.yang", exceptionMessage); } @Test - public void invalidListUsesLeafKeyTest() throws FileNotFoundException, URISyntaxException { + public void invalidListUsesLeafKeyTest() throws Exception { final String exceptionMessage = "(urn:ietf:params:xml:ns:yang:yin:1)if-feature statement is not allowed in " + "(incorrect-list-keys-test2?revision=2017-02-06)a1 leaf statement which is specified as a list key."; testForIfFeature("/rfc7950/list-keys-test/incorrect-list-keys-test2.yang", exceptionMessage); } @Test - public void invalidListUsesLeafKeyTest1() throws FileNotFoundException, URISyntaxException { + public void invalidListUsesLeafKeyTest1() throws Exception { final String exceptionMessage = "(urn:ietf:params:xml:ns:yang:yin:1)when statement is not allowed in " + "(incorrect-list-keys-test3?revision=2017-02-06)a2 leaf statement which is specified as a list key."; testForWhen("/rfc7950/list-keys-test/incorrect-list-keys-test3.yang", exceptionMessage); } @Test - public void invalidListUsesLeafKeyTest2() throws FileNotFoundException, URISyntaxException { + public void invalidListUsesLeafKeyTest2() throws Exception { final String exceptionMessage = "(urn:ietf:params:xml:ns:yang:yin:1)if-feature statement is not allowed in " + "(incorrect-list-keys-test4?revision=2017-02-06)a1 leaf statement which is specified as a list key."; testForIfFeature("/rfc7950/list-keys-test/incorrect-list-keys-test4.yang", exceptionMessage); } @Test - public void invalidListUsesRefineLeafKeyTest() throws FileNotFoundException, URISyntaxException { + public void invalidListUsesRefineLeafKeyTest() throws Exception { final String exceptionMessage = "(urn:ietf:params:xml:ns:yang:yin:1)if-feature statement is not allowed in " + "(incorrect-list-keys-test5?revision=2017-02-06)a1 leaf statement which is specified as a list key."; testForIfFeature("/rfc7950/list-keys-test/incorrect-list-keys-test5.yang", exceptionMessage); } - private void testForIfFeature(final String yangSrcPath, final String exMsg) throws FileNotFoundException, - URISyntaxException { + private static void testForIfFeature(final String yangSrcPath, final String exMsg) throws URISyntaxException, + SourceException, IOException, YangSyntaxErrorException { try { StmtTestUtils.parseYangSource(yangSrcPath); fail("Test must fail: IF-FEATURE substatement is not allowed in LIST keys"); @@ -84,8 +85,8 @@ public class Bug6885Test { } } - private void testForWhen(final String yangSrcPath, final String exMsg) throws FileNotFoundException, - URISyntaxException { + private static void testForWhen(final String yangSrcPath, final String exMsg) throws URISyntaxException, + SourceException, IOException, YangSyntaxErrorException { try { StmtTestUtils.parseYangSource(yangSrcPath); fail("Test must fail: WHEN substatement is not allowed in LIST keys"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java index c19277ec57..6242659e75 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6887Test.java @@ -15,9 +15,6 @@ import static org.junit.Assert.fail; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.List; import org.junit.Test; @@ -43,8 +40,7 @@ import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6887Test { @Test - public void testRestrictedEnumeration() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void testRestrictedEnumeration() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo.yang"); assertNotNull(schemaContext); @@ -88,7 +84,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedEnumeration() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedEnumeration() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo-invalid.yang"); fail("An exception should have been thrown."); @@ -101,7 +97,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedEnumeration2() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedEnumeration2() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo-invalid-2.yang"); fail("An exception should have been thrown."); @@ -114,7 +110,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedEnumeration3() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedEnumeration3() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo-invalid-3.yang"); fail("An exception should have been thrown."); @@ -128,7 +124,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedEnumeration4() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedEnumeration4() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo-invalid-4.yang"); fail("An exception should have been thrown."); @@ -142,14 +138,13 @@ public class Bug6887Test { } @Test - public void testValidYang10EnumerationWithUnknownStatements() throws ReactorException, FileNotFoundException, - URISyntaxException { + public void testValidYang10EnumerationWithUnknownStatements() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo10-valid.yang"); assertNotNull(schemaContext); } @Test - public void testInvalidYang10RestrictedEnumeration() throws FileNotFoundException, URISyntaxException { + public void testInvalidYang10RestrictedEnumeration() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo10-invalid.yang"); fail("An exception should have been thrown."); @@ -161,7 +156,7 @@ public class Bug6887Test { } @Test - public void testInvalidYang10RestrictedEnumeration2() throws FileNotFoundException, URISyntaxException { + public void testInvalidYang10RestrictedEnumeration2() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/foo10-invalid-2.yang"); fail("An exception should have been thrown."); @@ -173,8 +168,7 @@ public class Bug6887Test { } @Test - public void testRestrictedBits() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void testRestrictedBits() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar.yang"); assertNotNull(schemaContext); @@ -238,7 +232,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedBits() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedBits() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar-invalid.yang"); fail("An exception should have been thrown."); @@ -251,7 +245,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedBits2() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedBits2() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar-invalid-2.yang"); fail("An exception should have been thrown."); @@ -264,7 +258,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedBits3() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedBits3() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar-invalid-3.yang"); fail("An exception should have been thrown."); @@ -277,7 +271,7 @@ public class Bug6887Test { } @Test - public void testInvalidRestrictedBits4() throws FileNotFoundException, URISyntaxException { + public void testInvalidRestrictedBits4() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar-invalid-4.yang"); fail("An exception should have been thrown."); @@ -290,14 +284,13 @@ public class Bug6887Test { } @Test - public void testValidYang10BitsWithUnknownStatements() throws ReactorException, FileNotFoundException, - URISyntaxException { + public void testValidYang10BitsWithUnknownStatements() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar10-valid.yang"); assertNotNull(schemaContext); } @Test - public void testInvalidYang10RestrictedBits() throws FileNotFoundException, URISyntaxException { + public void testInvalidYang10RestrictedBits() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar10-invalid.yang"); fail("An exception should have been thrown."); @@ -309,7 +302,7 @@ public class Bug6887Test { } @Test - public void testInvalidYang10RestrictedBits2() throws FileNotFoundException, URISyntaxException { + public void testInvalidYang10RestrictedBits2() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6887/bar10-invalid-2.yang"); fail("An exception should have been thrown."); @@ -320,7 +313,7 @@ public class Bug6887Test { } } - private static EnumPair createEnumPair(final String name, int value) { + private static EnumPair createEnumPair(final String name, final int value) { return EnumPairBuilder.create(name, value).build(); } @@ -330,7 +323,7 @@ public class Bug6887Test { } } - private static Bit createBit(final SchemaPath path, long position) { + private static Bit createBit(final SchemaPath path, final long position) { return BitBuilder.create(path, position).build(); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java index 7d8db72848..3331f5325f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6897Test.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.HashSet; import java.util.Set; import org.junit.Test; @@ -25,9 +23,7 @@ import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.NotificationNodeContainer; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6897Test { @@ -35,8 +31,7 @@ public class Bug6897Test { private static final String FOO_REV = "1970-01-01"; @Test - public void notificationsInDataContainersTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void notificationsInDataContainersTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils .parseYangSource("/rfc7950/notifications-in-data-nodes/foo.yang"); assertNotNull(schemaContext); @@ -79,7 +74,7 @@ public class Bug6897Test { } @Test - public void invalid10Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid10Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/notifications-in-data-nodes/foo10.yang"); fail("Test should fail due to invalid Yang 1.0"); @@ -89,7 +84,7 @@ public class Bug6897Test { } @Test - public void invalid11Test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void invalid11Test() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/notifications-in-data-nodes/foo-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -104,7 +99,7 @@ public class Bug6897Test { } @Test - public void testNotificationWithinListWithoutKey() throws ReactorException, FileNotFoundException, URISyntaxException { + public void testNotificationWithinListWithoutKey() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/notifications-in-data-nodes/bar-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); @@ -116,7 +111,7 @@ public class Bug6897Test { } @Test - public void testNotificationInUsedGroupingWithinCase() throws ReactorException, FileNotFoundException, URISyntaxException { + public void testNotificationInUsedGroupingWithinCase() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/notifications-in-data-nodes/baz-invalid.yang"); fail("Test should fail due to invalid Yang 1.1"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java index 195634eea9..52c85e867f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/Bug6901Test.java @@ -13,120 +13,89 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import com.google.common.collect.ImmutableSet; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -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.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug6901Test { @Test - public void ifFeature11EnumBitTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeature11EnumBitTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/bug6901/foo.yang"); assertNotNull(schemaContext); } @Test - public void ifFeatureOnDefaultValueEnumTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeatureOnDefaultValueEnumTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-enum.yang"); fail("Test should fail due to invalid Yang 1.1"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e - .getCause() - .getMessage() - .startsWith( - "Leaf '(foo?revision=1970-01-01)enum-leaf' has default value 'two' marked with an if-feature statement.")); + assertTrue(e.getCause().getMessage().startsWith( + "Leaf '(foo?revision=1970-01-01)enum-leaf' has default value 'two' marked with an if-feature statement.")); } } @Test - public void ifFeatureOnDefaultValueEnumTest2() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeatureOnDefaultValueEnumTest2() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-enum-2.yang"); fail("Test should fail due to invalid Yang 1.1"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e - .getCause() - .getMessage() - .startsWith( - "Leaf '(foo?revision=1970-01-01)enum-leaf' has default value 'two' marked with an if-feature statement.")); + assertTrue(e.getCause().getMessage().startsWith( + "Leaf '(foo?revision=1970-01-01)enum-leaf' has default value 'two' marked with an if-feature statement.")); } } @Test - public void ifFeatureOnDefaultValueEnumTest3() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeatureOnDefaultValueEnumTest3() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-enum-3.yang"); fail("Test should fail due to invalid Yang 1.1"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e - .getCause() - .getMessage() - .startsWith( - "Leaf '(foo?revision=1970-01-01)enum-leaf' has default value 'two' marked with an if-feature statement.")); + assertTrue(e.getCause().getMessage().startsWith( + "Leaf '(foo?revision=1970-01-01)enum-leaf' has default value 'two' marked with an if-feature statement.")); } } @Test - public void ifFeatureOnDefaultValueBitTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeatureOnDefaultValueBitTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-bit.yang"); fail("Test should fail due to invalid Yang 1.1"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e - .getCause() - .getMessage() - .startsWith( - "Typedef '(foo?revision=1970-01-01)bits-typedef-2' has default value 'two' marked with an if-feature statement.")); + assertTrue(e.getCause().getMessage().startsWith( + "Typedef '(foo?revision=1970-01-01)bits-typedef-2' has default value 'two' marked with an if-feature statement.")); } } @Test - public void ifFeatureOnDefaultValueUnionTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeatureOnDefaultValueUnionTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-union.yang"); fail("Test should fail due to invalid Yang 1.1"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e - .getCause() - .getMessage() - .startsWith( - "Leaf '(foo?revision=1970-01-01)union-leaf' has default value 'two' marked with an if-feature statement.")); + assertTrue(e.getCause().getMessage().startsWith( + "Leaf '(foo?revision=1970-01-01)union-leaf' has default value 'two' marked with an if-feature statement.")); } } @Test - public void unsupportedFeatureTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void unsupportedFeatureTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-enum.yang", ImmutableSet.of()); fail("Test should fail due to invalid Yang 1.1"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e - .getCause() - .getMessage() + assertTrue(e.getCause().getMessage() .startsWith("Unable to find a default value for leaf '(foo?revision=1970-01-01)enum-leaf'")); - assertTrue(e - .getCause().getCause() - .getMessage() + assertTrue(e.getCause().getCause().getMessage() .startsWith("Unable to find following default values [two]")); } } @Test - public void ifFeature10EnumTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeature10EnumTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-10-enum.yang"); fail("Test should fail due to invalid Yang 1.0"); @@ -136,8 +105,7 @@ public class Bug6901Test { } @Test - public void ifFeature10BitTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void ifFeature10BitTest() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/bug6901/invalid-foo-10-bit.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java index fe90d1bbaa..a7e6f6cf5c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityStatementTest.java @@ -13,9 +13,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.Set; import org.junit.Test; @@ -29,8 +26,7 @@ import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class IdentityStatementTest { @Test - public void testMultipleBaseIdentities() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void testMultipleBaseIdentities() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/identity-stmt/foo.yang"); assertNotNull(schemaContext); @@ -49,7 +45,7 @@ public class IdentityStatementTest { } @Test - public void testInvalidYang10() throws FileNotFoundException, URISyntaxException { + public void testInvalidYang10() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/identity-stmt/foo10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java index 7af9663500..58dd5bc8d7 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/IdentityrefStatementTest.java @@ -13,9 +13,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.Set; import org.junit.Test; @@ -32,8 +29,7 @@ import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class IdentityrefStatementTest { @Test - public void testIdentityrefWithMultipleBaseIdentities() throws ReactorException, FileNotFoundException, - URISyntaxException, ParseException { + public void testIdentityrefWithMultipleBaseIdentities() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/identityref-stmt/foo.yang"); assertNotNull(schemaContext); @@ -57,7 +53,7 @@ public class IdentityrefStatementTest { } @Test - public void testInvalidYang10() throws ReactorException, FileNotFoundException, URISyntaxException { + public void testInvalidYang10() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/identityref-stmt/foo10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java index 82dc51167f..3857385a4e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/stmt/rfc7950/LeafrefStatementTest.java @@ -13,9 +13,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.Set; import org.junit.Test; @@ -32,8 +29,7 @@ import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class LeafrefStatementTest { @Test - public void testRequireInstanceInLeafrefs() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void testRequireInstanceInLeafrefs() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/rfc7950/leafref-stmt/foo.yang"); assertNotNull(schemaContext); @@ -71,7 +67,7 @@ public class LeafrefStatementTest { } @Test - public void testInvalidYang10() throws ReactorException, FileNotFoundException, URISyntaxException, ParseException { + public void testInvalidYang10() throws Exception { try { StmtTestUtils.parseYangSource("/rfc7950/leafref-stmt/foo10.yang"); fail("Test should fail due to invalid Yang 1.0"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java index d72b1ed9c6..9c6790027e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentArgumentParsingTest.java @@ -12,40 +12,41 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Ignore; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class AugmentArgumentParsingTest { - private static final YangStatementSourceImpl IMPORTED = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/imported.yang", false); - private static final YangStatementSourceImpl VALID_ARGS = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-valid-aug-args.yang", false); - private static final YangStatementSourceImpl INVALID_REL1 = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-invalid-rel1.yang", false); - private static final YangStatementSourceImpl INVALID_REL2 = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-invalid-rel2.yang", false); - private static final YangStatementSourceImpl INVALID_ABS = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-invalid-abs.yang", false); - private static final YangStatementSourceImpl INVALID_ABS_PREFIXED_NO_IMP = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-invalid-abs-no-imp.yang", false); - private static final YangStatementSourceImpl INVALID_EMPTY = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-invalid-empty.yang", false); - private static final YangStatementSourceImpl INVALID_XPATH = new YangStatementSourceImpl( - "/semantic-statement-parser/augment-arg-parsing/root-invalid-xpath.yang", false); + private static final StatementStreamSource IMPORTED = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/imported.yang"); + private static final StatementStreamSource VALID_ARGS = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-valid-aug-args.yang"); + private static final StatementStreamSource INVALID_REL1 = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-invalid-rel1.yang"); + private static final StatementStreamSource INVALID_REL2 = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-invalid-rel2.yang"); + private static final StatementStreamSource INVALID_ABS = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-invalid-abs.yang"); + private static final StatementStreamSource INVALID_ABS_PREFIXED_NO_IMP = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-invalid-abs-no-imp.yang"); + private static final StatementStreamSource INVALID_EMPTY = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-invalid-empty.yang"); + private static final StatementStreamSource INVALID_XPATH = sourceForResource( + "/semantic-statement-parser/augment-arg-parsing/root-invalid-xpath.yang"); @Test public void validAugAbsTest() throws ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, IMPORTED, VALID_ARGS); + reactor.addSources(IMPORTED, VALID_ARGS); final EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -55,7 +56,7 @@ public class AugmentArgumentParsingTest { public void invalidAugRel1Test() { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, INVALID_REL1); + reactor.addSources(INVALID_REL1); try { reactor.build(); @@ -69,7 +70,7 @@ public class AugmentArgumentParsingTest { public void invalidAugRel2Test() { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, INVALID_REL2); + reactor.addSources(INVALID_REL2); try { reactor.build(); @@ -83,7 +84,7 @@ public class AugmentArgumentParsingTest { public void invalidAugAbs() { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, INVALID_ABS); + reactor.addSources(INVALID_ABS); try { reactor.build(); @@ -97,7 +98,7 @@ public class AugmentArgumentParsingTest { public void invalidAugAbsPrefixedNoImp() { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, INVALID_ABS_PREFIXED_NO_IMP); + reactor.addSources(INVALID_ABS_PREFIXED_NO_IMP); try { reactor.build(); @@ -112,7 +113,7 @@ public class AugmentArgumentParsingTest { public void invalidAugEmptyTest() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, INVALID_EMPTY); + reactor.addSources(INVALID_EMPTY); try { reactor.build(); @@ -127,7 +128,7 @@ public class AugmentArgumentParsingTest { public void invalidAugXPathTest() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, INVALID_XPATH); + reactor.addSources(INVALID_XPATH); try { reactor.build(); @@ -142,10 +143,4 @@ public class AugmentArgumentParsingTest { assertTrue(cause instanceof SourceException); assertTrue(cause.getMessage().startsWith(start)); } - - private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java index f75e1f3d20..472409e27b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentProcessTest.java @@ -13,11 +13,9 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import com.google.common.collect.ImmutableList; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -27,34 +25,27 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; 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.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.meta.ModelStatement; 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.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class AugmentProcessTest { - private static final YangStatementSourceImpl AUGMENTED = new YangStatementSourceImpl( - "/stmt-test/augments/augmented.yang", false); - private static final YangStatementSourceImpl ROOT = new YangStatementSourceImpl( - "/stmt-test/augments/aug-root.yang", false); + private static final StatementStreamSource AUGMENTED = sourceForResource("/stmt-test/augments/augmented.yang"); + private static final StatementStreamSource ROOT = sourceForResource("/stmt-test/augments/aug-root.yang"); private static final QNameModule ROOT_QNAME_MODULE = QNameModule.create( URI.create("root"), SimpleDateFormatUtil.DEFAULT_DATE_REV); private static final QNameModule AUGMENTED_QNAME_MODULE = QNameModule .create(URI.create("aug"), SimpleDateFormatUtil.DEFAULT_DATE_REV); - private static GroupingDefinition grp2Def; - private final QName augParent1 = QName.create(AUGMENTED_QNAME_MODULE, "aug-parent1"); private final QName augParent2 = QName.create(AUGMENTED_QNAME_MODULE, @@ -83,21 +74,21 @@ public class AugmentProcessTest { "grp-cont22"); private final QName grpAdd = QName.create(ROOT_QNAME_MODULE, "grp-add"); - private static final YangStatementSourceImpl MULTIPLE_AUGMENT = new YangStatementSourceImpl( - "/stmt-test/augments/multiple-augment-test.yang",false); + private static final StatementStreamSource MULTIPLE_AUGMENT = sourceForResource( + "/stmt-test/augments/multiple-augment-test.yang"); - private static final YangStatementSourceImpl MULTIPLE_AUGMENT_ROOT = new YangStatementSourceImpl( - "/stmt-test/augments/multiple-augment-root.yang",false); - private static final YangStatementSourceImpl MULTIPLE_AUGMENT_IMPORTED = new YangStatementSourceImpl( - "/stmt-test/augments/multiple-augment-imported.yang",false); - private static final YangStatementSourceImpl MULTIPLE_AUGMENT_SUBMODULE = new YangStatementSourceImpl( - "/stmt-test/augments/multiple-augment-submodule.yang",false); + private static final StatementStreamSource MULTIPLE_AUGMENT_ROOT = sourceForResource( + "/stmt-test/augments/multiple-augment-root.yang"); + private static final StatementStreamSource MULTIPLE_AUGMENT_IMPORTED = sourceForResource( + "/stmt-test/augments/multiple-augment-imported.yang"); + private static final StatementStreamSource MULTIPLE_AUGMENT_SUBMODULE = sourceForResource( + "/stmt-test/augments/multiple-augment-submodule.yang"); - private static final YangStatementSourceImpl MULTIPLE_AUGMENT_INCORRECT = new YangStatementSourceImpl( - "/stmt-test/augments/multiple-augment-incorrect.yang",false); + private static final StatementStreamSource MULTIPLE_AUGMENT_INCORRECT = sourceForResource( + "/stmt-test/augments/multiple-augment-incorrect.yang"); - private static final YangStatementSourceImpl MULTIPLE_AUGMENT_INCORRECT2 = new YangStatementSourceImpl( - "/stmt-test/augments/multiple-augment-incorrect2.yang",false); + private static final StatementStreamSource MULTIPLE_AUGMENT_INCORRECT2 = sourceForResource( + "/stmt-test/augments/multiple-augment-incorrect2.yang"); @Test public void multipleAugmentsAndMultipleModulesTest() throws SourceException, ReactorException { @@ -204,19 +195,6 @@ public class AugmentProcessTest { assertNotNull(grpAddNode); } - private static > T findInStatements(final QName target, - final ImmutableList statements) { - - for (final T statement : statements) { - if (target - .equals(statement.statementDefinition().getArgumentName())) { - return statement; - } - } - - return null; - } - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { for (final StatementStreamSource source : sources) { @@ -225,9 +203,7 @@ public class AugmentProcessTest { } @Test - public void caseShortHandAugmentingTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { - + public void caseShortHandAugmentingTest() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/choice-case-type-test-models"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java index 51d0d0b5cb..ce8c541d5d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentSimplestTest.java @@ -9,6 +9,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -17,25 +18,19 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class AugmentSimplestTest { - private static final YangStatementSourceImpl AUGMENTED = new YangStatementSourceImpl("/semantic-statement-parser/augmented.yang", false); - private static final YangStatementSourceImpl ROOT = new YangStatementSourceImpl("/semantic-statement-parser/root.yang", false); + private static final StatementStreamSource AUGMENTED = sourceForResource( + "/semantic-statement-parser/augmented.yang"); + private static final StatementStreamSource ROOT = sourceForResource("/semantic-statement-parser/root.yang"); @Test public void readAndParseYangFileTest() throws SourceException, ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, AUGMENTED, ROOT); + reactor.addSources(AUGMENTED, ROOT); EffectiveModelContext result = reactor.build(); assertNotNull(result); } - - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { - for (StatementStreamSource source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java index 071c6f51ed..3872378faa 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/AugmentToExtensionTest.java @@ -9,7 +9,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertTrue; -import java.net.URISyntaxException; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -17,17 +16,14 @@ import org.opendaylight.yangtools.yang.model.api.AugmentationSchema; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.UsesNode; -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.SourceException; public class AugmentToExtensionTest { private Set modules; @Test(expected = SomeModifiersUnresolvedException.class) - public void testIncorrectPath() throws URISyntaxException, SourceException, ReactorException { + public void testIncorrectPath() throws Exception { modules = TestUtils.loadModules(getClass().getResource("/augment-to-extension-test/incorrect-path").toURI()); - } /* @@ -35,7 +31,7 @@ public class AugmentToExtensionTest { * */ @Test - public void testCorrectPathIntoUnsupportedTarget() throws URISyntaxException, SourceException, ReactorException { + public void testCorrectPathIntoUnsupportedTarget() throws Exception { try { modules = TestUtils.loadModules(getClass().getResource( @@ -58,7 +54,7 @@ public class AugmentToExtensionTest { @Test - public void testCorrectAugment() throws URISyntaxException, SourceException, ReactorException { + public void testCorrectAugment() throws Exception { modules = TestUtils.loadModules(getClass().getResource("/augment-to-extension-test/correct-augment").toURI()); final Module devicesModule = TestUtils.findModule(modules, "augment-module"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java index d4f5bffeb7..0404c50f2d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug2872Test.java @@ -11,10 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -27,12 +24,11 @@ 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; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class Bug2872Test { @Test - public void test() throws ReactorException, FileNotFoundException, URISyntaxException, ParseException { + public void test() throws Exception { final SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug2872"); assertNotNull(schema); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java index c322fed9f5..0c5a40ed00 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3799Test.java @@ -11,24 +11,20 @@ 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 org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; + import java.util.Collection; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import java.util.Set; +import org.junit.Test; +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.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import java.io.IOException; -import java.net.URISyntaxException; -import org.junit.Test; public class Bug3799Test { @Test - public void test() throws IOException, URISyntaxException, SourceException, - ReactorException { + public void test() throws Exception { SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug3799"); assertNotNull(schema); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java index 1ce5dc397f..17f7a3bd8c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug3874ExtensionTest.java @@ -9,10 +9,8 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; + import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.List; import org.junit.Test; @@ -26,8 +24,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.SupportedExtensionsMapping; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AnyxmlSchemaLocationEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangModeledAnyXmlEffectiveStatementImpl; @@ -35,7 +31,7 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.YangModeled public class Bug3874ExtensionTest { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, ParseException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug3874"); Date revision = SimpleDateFormatUtil.getRevisionFormat().parse("1970-01-01"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java index 3840f86ddf..ed8fdccd07 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4231Test.java @@ -9,10 +9,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; -import java.io.IOException; import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.QNameModule; @@ -21,12 +18,11 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class Bug4231Test { @Test - public void test() throws IOException, URISyntaxException, ParseException, ReactorException { + public void test() throws Exception { SchemaContext context = TestUtils.parseYangSources("/bugs/bug4231"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java index c281af8311..389f9b2fdf 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4410Test.java @@ -11,18 +11,14 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import com.google.common.base.Throwables; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; -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.SourceException; public class Bug4410Test { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { try { StmtTestUtils.parseYangSources("/bugs/bug4410"); fail("SomeModifiersUnresolvedException should be thrown."); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java index 01cea68b48..7ca47737fc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4456Test.java @@ -11,9 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.fail; -import java.io.IOException; import java.net.URI; -import java.net.URISyntaxException; import java.util.List; import java.util.Set; import org.junit.Test; @@ -21,12 +19,10 @@ 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.UnknownSchemaNode; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug4456Test { @Test - public void test() throws IOException, URISyntaxException, SourceException, ReactorException { + public void test() throws Exception { SchemaContext schema = StmtTestUtils.parseYangSources("/bugs/bug4456"); assertNotNull(schema); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java index 948f4e3ed1..2019d64c05 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug4933Test.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.Deviation; @@ -24,7 +22,7 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug4933Test { @Test - public void test() throws ReactorException, FileNotFoundException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug4933/correct"); assertNotNull(context); @@ -33,7 +31,7 @@ public class Bug4933Test { } @Test - public void incorrectKeywordTest() throws FileNotFoundException, URISyntaxException { + public void incorrectKeywordTest() throws Exception { try { StmtTestUtils.parseYangSources("/bugs/bug4933/incorrect"); fail("ReactorException should be thrown."); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java index 7b959dff2a..a931e1b61e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5059Test.java @@ -9,16 +9,12 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5059Test { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5059"); assertNotNull(context); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java index 0b2cbf01e2..6e62bf2444 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5101Test.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -21,15 +19,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5101Test { private static final String NS = "foo"; private static final String REV = "2016-01-29"; @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5101"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java index ccaab3750b..d9e866b9e1 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5335Test.java @@ -13,10 +13,8 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.io.ByteArrayOutputStream; -import java.io.FileNotFoundException; import java.io.PrintStream; import java.io.UnsupportedEncodingException; -import java.net.URISyntaxException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -26,8 +24,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5335Test { private static final String FOO = "foo"; @@ -55,7 +51,7 @@ public class Bug5335Test { } @Test - public void incorrectTest1() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void incorrectTest1() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/incorrect/case-1"); assertNotNull(context); @@ -69,7 +65,7 @@ public class Bug5335Test { } @Test - public void incorrectTest2() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void incorrectTest2() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/incorrect/case-2"); assertNotNull(context); @@ -83,7 +79,7 @@ public class Bug5335Test { } @Test - public void incorrectTest3() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void incorrectTest3() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/incorrect/case-2"); assertNotNull(context); @@ -98,7 +94,7 @@ public class Bug5335Test { } @Test - public void correctTest1() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void correctTest1() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/correct/case-1"); assertNotNull(context); @@ -108,7 +104,7 @@ public class Bug5335Test { } @Test - public void correctTest2() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void correctTest2() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/correct/case-2"); assertNotNull(context); @@ -119,7 +115,7 @@ public class Bug5335Test { } @Test - public void correctTest3() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void correctTest3() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/correct/case-3"); assertNotNull(context); @@ -130,7 +126,7 @@ public class Bug5335Test { } @Test - public void correctTest4() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void correctTest4() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5335/correct/case-4"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java index 58d3a7d718..816aa58bb8 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5396Test.java @@ -13,8 +13,6 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.List; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -27,12 +25,10 @@ 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; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5396Test { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5396"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5437Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5437Test.java index d667a545df..d9065b36ef 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5437Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5437Test.java @@ -10,8 +10,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -23,15 +21,13 @@ import org.opendaylight.yangtools.yang.model.api.type.BinaryTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.IntegerTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.LeafrefTypeDefinition; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5437Test { private static final String NS = "foo"; private static final String REV = "2016-03-01"; @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5437"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java index 4c2dc5ce5c..6d09dfe008 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5481Test.java @@ -12,8 +12,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; + import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; @@ -23,12 +22,10 @@ import org.opendaylight.yangtools.yang.model.api.RevisionAwareXPath; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5481Test { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5481"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java index e0e6783d76..0b63b0669b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5518Test.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -20,12 +18,10 @@ 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; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5518Test { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5518"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java index 9a53cf754d..c673952ba8 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5550Test.java @@ -10,8 +10,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -19,15 +17,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5550Test { private static final String NS = "foo"; private static final String REV = "2016-03-18"; @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5550"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java index 99566f8d0d..9df7aa9dc6 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5712Test.java @@ -10,21 +10,17 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; + 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; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5712Test { @Test - public void testTypedefWithNewStatementParser() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void testTypedefWithNewStatementParser() throws Exception { SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug5712"); assertNotNull(schemaContext); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java index 4669a4e3cd..28b29ae8c9 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5884Test.java @@ -10,9 +10,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.Iterator; import java.util.Set; @@ -26,15 +23,13 @@ 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; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5884Test { private static final String NS = "urn:yang.foo"; private static final String REV = "2016-01-01"; @Test - public void testBug5884() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, ParseException { + public void testBug5884() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5884"); assertNotNull(context); @@ -44,7 +39,8 @@ public class Bug5884Test { final Date date = SimpleDateFormatUtil.getRevisionFormat().parse("2016-01-01"); final Module foo = context.findModuleByName("foo", date); final ContainerSchemaNode rootContainer = (ContainerSchemaNode) context.getDataChildByName(root); - final ContainerSchemaNode testContainer = (ContainerSchemaNode) rootContainer.getDataChildByName(testContainerQname); + final ContainerSchemaNode testContainer = (ContainerSchemaNode) rootContainer.getDataChildByName( + testContainerQname); final ChoiceSchemaNode dataChildByName = (ChoiceSchemaNode) testContainer.getDataChildByName(choice); final Set augmentations = foo.getAugmentations(); final Set availableAugmentations = dataChildByName.getAvailableAugmentations(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java index 248fc21b6c..a9bf847bdd 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5899Test.java @@ -10,18 +10,13 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5899Test { @Test - public void testBug5899() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void testBug5899() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug5899"); assertNotNull(schemaContext); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java index fe30d5a15c..05a80e1017 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5942Test.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.List; import java.util.Set; import org.junit.Test; @@ -25,12 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5942Test { @Test - public void test() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void test() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug5942"); assertNotNull(schemaContext); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java index 827c0a52d6..a062e3b20c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug5946Test.java @@ -13,8 +13,6 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.File; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.Collection; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -25,7 +23,6 @@ import org.opendaylight.yangtools.yang.model.api.UniqueConstraint; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier; import org.opendaylight.yangtools.yang.model.api.stmt.SchemaNodeIdentifier.Relative; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug5946Test { private static final String NS = "foo"; @@ -42,7 +39,7 @@ public class Bug5946Test { private static final SchemaNodeIdentifier C_L3_ID = SchemaNodeIdentifier.create(false, C, L3); @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources(new File(getClass() .getResource("/bugs/bug5946/foo.yang").toURI())); assertNotNull(context); @@ -78,7 +75,7 @@ public class Bug5946Test { } @Test - public void testInvalid() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void testInvalid() throws Exception { try { StmtTestUtils.parseYangSources(new File(getClass().getResource("/bugs/bug5946/foo-invalid.yang").toURI())); fail("Should fail due to invalid argument of unique constraint"); @@ -89,7 +86,7 @@ public class Bug5946Test { } } - private static Collection getListConstraints(SchemaContext context, QName listQName) { + private static Collection getListConstraints(final SchemaContext context, final QName listQName) { DataSchemaNode dataChildByName = context.getDataChildByName(listQName); assertTrue(dataChildByName instanceof ListSchemaNode); return ((ListSchemaNode) dataChildByName).getUniqueConstraints(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java index 18c91a4260..fa286903d4 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6150Test.java @@ -5,37 +5,28 @@ * 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 static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class Bug6150Test { - private static final YangStatementSourceImpl TARGET = new YangStatementSourceImpl( - "/bugs/bug6150/target.yang", false); - private static final YangStatementSourceImpl AUGMENT_FIRST = new YangStatementSourceImpl( - "/bugs/bug6150/aug-first.yang", false); - private static final YangStatementSourceImpl AUGMENT_SECOND = new YangStatementSourceImpl( - "/bugs/bug6150/aug-second.yang", false); - - private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } + private static final StatementStreamSource TARGET = sourceForResource("/bugs/bug6150/target.yang"); + private static final StatementStreamSource AUGMENT_FIRST = sourceForResource("/bugs/bug6150/aug-first.yang"); + private static final StatementStreamSource AUGMENT_SECOND = sourceForResource("/bugs/bug6150/aug-second.yang"); @Test public void effectiveAugmentFirstTest() throws ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, TARGET, AUGMENT_FIRST); + reactor.addSources(TARGET, AUGMENT_FIRST); final SchemaContext result = reactor.buildEffective(); assertNotNull(result); } @@ -43,7 +34,7 @@ public class Bug6150Test { @Test public void effectiveAugmentSecondTest() throws ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, TARGET, AUGMENT_SECOND); + reactor.addSources(TARGET, AUGMENT_SECOND); final SchemaContext result = reactor.buildEffective(); assertNotNull(result); } @@ -51,7 +42,7 @@ public class Bug6150Test { @Test public void effectiveAugmentBothTest() throws ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, TARGET, AUGMENT_FIRST, AUGMENT_SECOND); + reactor.addSources(TARGET, AUGMENT_FIRST, AUGMENT_SECOND); final SchemaContext result = reactor.buildEffective(); assertNotNull(result); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java index 51977dffba..05f2288f12 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6180Test.java @@ -13,8 +13,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import java.io.File; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.List; import java.util.Set; import java.util.regex.Pattern; @@ -28,13 +26,11 @@ 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.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug6180Test { @Test - public void stringTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void stringTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources(new File(getClass().getResource( "/bugs/bug6180/string-test.yang").toURI())); assertNotNull(schemaContext); @@ -47,7 +43,7 @@ public class Bug6180Test { } @Test - public void doubleQuotesTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void doubleQuotesTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources(new File(getClass().getResource( "/bugs/bug6180/double-quotes.yang").toURI())); assertNotNull(schemaContext); @@ -55,8 +51,7 @@ public class Bug6180Test { } @Test - public void doubleQuotesSinbleInsideTest() throws ReactorException, SourceException, FileNotFoundException, - URISyntaxException { + public void doubleQuotesSinbleInsideTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources(new File(getClass().getResource( "/bugs/bug6180/double-quotes-single-inside.yang").toURI())); assertNotNull(schemaContext); @@ -64,7 +59,7 @@ public class Bug6180Test { } @Test - public void singleQuotesTest() throws ReactorException, SourceException, FileNotFoundException, URISyntaxException { + public void singleQuotesTest() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources(new File(getClass().getResource( "/bugs/bug6180/single-quotes.yang").toURI())); assertNotNull(schemaContext); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java index dda220cd79..73673e1958 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6240Test.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -20,16 +18,14 @@ 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; -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.SourceException; public class Bug6240Test { private static final String NS = "bar"; private static final String REV = "2016-07-19"; @Test - public void testModels() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void testModels() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6240/correct"); assertNotNull(context); @@ -59,12 +55,12 @@ public class Bug6240Test { } @Test - public void testInvalidModels() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void testInvalidModels() throws Exception { try { StmtTestUtils.parseYangSources("/bugs/bug6240/incorrect"); } catch (final SomeModifiersUnresolvedException e) { - assertTrue(e.getCause().getCause().getMessage() - .startsWith("Grouping '(bar?revision=2016-07-19)foo-imp-grp' was not resolved.")); + assertTrue(e.getCause().getCause().getMessage().startsWith( + "Grouping '(bar?revision=2016-07-19)foo-imp-grp' was not resolved.")); } } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java index 8f52e5138d..a4a5dac031 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6316Test.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.List; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -25,12 +23,10 @@ import org.opendaylight.yangtools.yang.model.api.type.BitsTypeDefinition; 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; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug6316Test { @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6316"); assertNotNull(context); verifyEnumTypedefinition(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java index c6fa2c33fb..e9bce70f9d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6410Test.java @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Set; import org.junit.Test; @@ -20,14 +21,12 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class Bug6410Test { @Test public void testTypedefsInRpc() throws ReactorException { - final SchemaContext schemaContext = StmtTestUtils.parseYangSources( - new YangStatementSourceImpl("/bugs/bug6410/foo.yang", false)); + final SchemaContext schemaContext = StmtTestUtils.parseYangSources(sourceForResource("/bugs/bug6410/foo.yang")); final Set modules = schemaContext.getModules(); assertEquals(1, modules.size()); @@ -44,7 +43,7 @@ public class Bug6410Test { @Test public void shouldFailOnDuplicateTypedefs() { try { - StmtTestUtils.parseYangSources(new YangStatementSourceImpl("/bugs/bug6410/bar.yang", false)); + StmtTestUtils.parseYangSources(sourceForResource("/bugs/bug6410/bar.yang")); fail("A ReactorException should have been thrown."); } catch (ReactorException ex) { final Throwable cause = ex.getCause(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java index 44ccdfb934..12e75c81aa 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6491Test.java @@ -12,8 +12,6 @@ import static org.junit.Assert.assertNotNull; import static org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil.DEFAULT_DATE_REV; import static org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil.getRevisionFormat; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.text.ParseException; import java.util.Date; import java.util.Set; @@ -22,7 +20,6 @@ import org.junit.Test; 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.parser.spi.meta.ReactorException; public class Bug6491Test { private Date date; @@ -33,15 +30,15 @@ public class Bug6491Test { } @Test - public void tetststs() throws ReactorException, FileNotFoundException, URISyntaxException { + public void tetststs() throws Exception { testRevision("withoutRevision", DEFAULT_DATE_REV, DEFAULT_DATE_REV); testRevision("withRevision", date, date); testRevision("importedModuleRevisionOnly", DEFAULT_DATE_REV, date); testRevision("moduleRevisionOnly", date, DEFAULT_DATE_REV); } - private void testRevision(final String path, final Date moduleRevision, final Date importedRevision) throws - ReactorException, FileNotFoundException, URISyntaxException { + private static void testRevision(final String path, final Date moduleRevision, final Date importedRevision) + throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6491/".concat(path)); assertNotNull(context); final Module module = context.findModuleByName("bar", moduleRevision); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java index 8254cd419d..2e520c20db 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6669Test.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -21,8 +19,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug6669Test { private static final String REV = "2016-09-08"; @@ -36,8 +32,7 @@ public class Bug6669Test { private static final QName L = QName.create(BAR_NS, REV, "l"); @Test - public void testInvalidAugment() throws SourceException, ReactorException, FileNotFoundException, - URISyntaxException { + public void testInvalidAugment() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/invalid/test1"); assertNotNull(context); @@ -47,8 +42,7 @@ public class Bug6669Test { } @Test - public void testInvalidAugment2() throws SourceException, ReactorException, FileNotFoundException, - URISyntaxException { + public void testInvalidAugment2() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/invalid/test2"); assertNotNull(context); @@ -58,8 +52,7 @@ public class Bug6669Test { } @Test - public void testInvalidAugment3() throws SourceException, ReactorException, FileNotFoundException, - URISyntaxException { + public void testInvalidAugment3() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/invalid/test3"); assertNotNull(context); @@ -69,7 +62,7 @@ public class Bug6669Test { } @Test - public void testValidAugment() throws SourceException, ReactorException, FileNotFoundException, URISyntaxException { + public void testValidAugment() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/valid/test1"); assertNotNull(context); @@ -79,7 +72,7 @@ public class Bug6669Test { } @Test - public void testValidAugment2() throws SourceException, ReactorException, FileNotFoundException, URISyntaxException { + public void testValidAugment2() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/valid/test2"); assertNotNull(context); @@ -89,7 +82,7 @@ public class Bug6669Test { } @Test - public void testValidAugment3() throws SourceException, ReactorException, FileNotFoundException, URISyntaxException { + public void testValidAugment3() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6669/valid/test3"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java index 4408306779..411383f101 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6771Test.java @@ -10,8 +10,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; @@ -20,8 +18,6 @@ import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug6771Test { private static final String NS = "http://www.example.com/typedef-bug"; @@ -32,7 +28,7 @@ public class Bug6771Test { private static final QName INNER_CONTAINER = QName.create(NS, REV, "inner-container"); @Test - public void augmentTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void augmentTest() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6771/augment"); assertNotNull(context); @@ -43,7 +39,7 @@ public class Bug6771Test { } @Test - public void choiceCaseTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void choiceCaseTest() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6771/choice-case"); assertNotNull(context); @@ -64,7 +60,7 @@ public class Bug6771Test { } @Test - public void groupingTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void groupingTest() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug6771/grouping"); assertNotNull(context); verifyLeafType(SchemaContextUtil @@ -75,5 +71,4 @@ public class Bug6771Test { assertTrue(schemaNode instanceof LeafSchemaNode); assertTrue(((LeafSchemaNode) schemaNode).getType() instanceof UnsignedIntegerTypeDefinition); } - } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java index 45556f3e05..0d5f760e96 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug6972Test.java @@ -12,9 +12,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Collection; import java.util.Date; import org.junit.Ignore; @@ -26,7 +23,6 @@ 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.meta.EffectiveStatement; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.UnitsEffectiveStatementImpl; @@ -34,8 +30,7 @@ public class Bug6972Test { @Ignore @Test - public void allUnitsShouldBeTheSameInstance() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void allUnitsShouldBeTheSameInstance() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources("/bugs/bug6972"); assertNotNull(schemaContext); assertEquals(3, schemaContext.getModules().size()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java index 70f8c61462..147a81a497 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7146Test.java @@ -10,18 +10,18 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class Bug7146Test { @Test public void shouldFailOnSyntaxError() throws ReactorException { try { - StmtTestUtils.parseYangSources(new YangStatementSourceImpl("/bugs/bug7146/foo.yang", false)); + StmtTestUtils.parseYangSources(sourceForResource("/bugs/bug7146/foo.yang")); fail("RuntimeException should have been thrown because of an unknown character in yang module."); } catch (RuntimeException ex) { final Throwable cause = ex.getCause(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java index 5629cf053d..d09a80b9d6 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7440Test.java @@ -11,9 +11,6 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import java.util.List; import java.util.Set; @@ -26,13 +23,11 @@ import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class Bug7440Test { @Test - public void testRestrictedTypeParentSchemaPathInDeviate() throws ReactorException, FileNotFoundException, - URISyntaxException, ParseException { + public void testRestrictedTypeParentSchemaPathInDeviate() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource("/bugs/bug7440/foo.yang"); assertNotNull(schemaContext); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java index 17f194c445..55e9f04532 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug7480Test.java @@ -12,23 +12,17 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; 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; import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class Bug7480Test { @Test - public void libSourcesTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, - ParseException { + public void libSourcesTest() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug7480/files", "/bugs/bug7480/lib"); assertNotNull(context); @@ -50,8 +44,7 @@ public class Bug7480Test { } @Test - public void missingRelevantImportTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException, ParseException { + public void missingRelevantImportTest() throws Exception { try { StmtTestUtils.parseYangSources("/bugs/bug7480/files-2", "/bugs/bug7480/lib-2"); fail("Test should fail due to missing import of required yang source from library"); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java index be6c02b0c7..25b6130445 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java @@ -12,10 +12,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import org.junit.Before; @@ -43,7 +40,7 @@ public class CaseStmtTest { public ExpectedException expectedEx = ExpectedException.none(); @Before - public void setup() throws ReactorException, FileNotFoundException, URISyntaxException, ParseException { + public void setup() throws Exception { schema = StmtTestUtils.parseYangSources("/case-test"); String date_s = "2015-09-09 00:00:00.0"; SimpleDateFormat dt = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); @@ -533,13 +530,13 @@ public class CaseStmtTest { } @Test - public void InferenceExceptionChoiceTest() throws ReactorException, FileNotFoundException, URISyntaxException { + public void InferenceExceptionChoiceTest() throws Exception { expectedEx.expect(ReactorException.class); schema = StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/choice"); } @Test - public void InferenceExceptionCaseTest() throws ReactorException, FileNotFoundException, URISyntaxException { + public void InferenceExceptionCaseTest() throws Exception { expectedEx.expect(ReactorException.class); schema = StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/case"); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java index 146dcb580a..9d154fcffc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ChoiceStmtTest.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -18,25 +19,22 @@ import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class ChoiceStmtTest { - private static final YangStatementSourceImpl CHOICE_MODULE = new YangStatementSourceImpl("/model/foo.yang", false); - private static final YangStatementSourceImpl IMPORTED_MODULE1 = new YangStatementSourceImpl("/model/bar.yang", - false); - private static final YangStatementSourceImpl IMPORTED_MODULE2 = new YangStatementSourceImpl("/model/baz.yang", - false); - private static final YangStatementSourceImpl INCLUDED_MODULE = new YangStatementSourceImpl("/model/subfoo.yang", - false); + private static final StatementStreamSource CHOICE_MODULE = sourceForResource("/model/foo.yang"); + private static final StatementStreamSource IMPORTED_MODULE1 = sourceForResource("/model/bar.yang"); + private static final StatementStreamSource IMPORTED_MODULE2 = sourceForResource("/model/baz.yang"); + private static final StatementStreamSource INCLUDED_MODULE = sourceForResource("/model/subfoo.yang"); @Test public void choiceAndCaseTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, CHOICE_MODULE, IMPORTED_MODULE1, IMPORTED_MODULE2, INCLUDED_MODULE); + reactor.addSources(CHOICE_MODULE, IMPORTED_MODULE1, IMPORTED_MODULE2, INCLUDED_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java index f0f11878ee..f797f347d0 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ControllerStmtParserTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; @@ -32,16 +31,12 @@ import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class ControllerStmtParserTest { @Test - public void test() throws SourceException, FileNotFoundException, - ReactorException, URISyntaxException, ParseException { - final SchemaContext context = StmtTestUtils - .parseYangSources("/sal-broker-impl"); + public void test() throws Exception { + final SchemaContext context = StmtTestUtils.parseYangSources("/sal-broker-impl"); assertNotNull(context); salDomBrokerImplModuleTest(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java index 3aa9d229c2..b9a4eb2d37 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeclaredStatementsTest.java @@ -12,6 +12,7 @@ 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 static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.text.ParseException; import java.util.Collection; @@ -64,7 +65,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.TypedefStatement; import org.opendaylight.yangtools.yang.model.api.stmt.WhenStatement; import org.opendaylight.yangtools.yang.model.api.stmt.YangVersionStatement; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AnyXmlEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.AugmentEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.ChoiceEffectiveStatementImpl; @@ -76,8 +77,8 @@ public class DeclaredStatementsTest { @Test public void testDeclaredAnyXml() throws ReactorException { - final YangStatementSourceImpl anyxmlStmtModule = - new YangStatementSourceImpl("/declared-statements-test/anyxml-declared-test.yang", false); + final StatementStreamSource anyxmlStmtModule = + sourceForResource("/declared-statements-test/anyxml-declared-test.yang"); final SchemaContext schemaContext = StmtTestUtils.parseYangSources(anyxmlStmtModule); assertNotNull(schemaContext); @@ -146,8 +147,8 @@ public class DeclaredStatementsTest { @Test public void testDeclaredChoice() throws ReactorException { - final YangStatementSourceImpl choiceStmtModule = - new YangStatementSourceImpl("/declared-statements-test/choice-declared-test.yang", false); + final StatementStreamSource choiceStmtModule = + sourceForResource("/declared-statements-test/choice-declared-test.yang"); final SchemaContext schemaContext = StmtTestUtils.parseYangSources(choiceStmtModule); assertNotNull(schemaContext); @@ -213,8 +214,8 @@ public class DeclaredStatementsTest { @Test public void testDeclaredAugment() throws ReactorException { - final YangStatementSourceImpl augmentStmtModule = - new YangStatementSourceImpl("/declared-statements-test/augment-declared-test.yang", false); + final StatementStreamSource augmentStmtModule = + sourceForResource("/declared-statements-test/augment-declared-test.yang"); final SchemaContext schemaContext = StmtTestUtils.parseYangSources(augmentStmtModule); assertNotNull(schemaContext); @@ -240,11 +241,11 @@ public class DeclaredStatementsTest { @Test public void testDeclaredModuleAndSubmodule() throws ReactorException { - final YangStatementSourceImpl parentModule = - new YangStatementSourceImpl("/declared-statements-test/parent-module-declared-test.yang", false); + final StatementStreamSource parentModule = + sourceForResource("/declared-statements-test/parent-module-declared-test.yang"); - final YangStatementSourceImpl childModule = - new YangStatementSourceImpl("/declared-statements-test/child-module-declared-test.yang", false); + final StatementStreamSource childModule = + sourceForResource("/declared-statements-test/child-module-declared-test.yang"); final SchemaContext schemaContext = StmtTestUtils.parseYangSources(parentModule, childModule); assertNotNull(schemaContext); @@ -294,11 +295,11 @@ public class DeclaredStatementsTest { @Test public void testDeclaredModule() throws ReactorException, ParseException { - final YangStatementSourceImpl rootModule = - new YangStatementSourceImpl("/declared-statements-test/root-module-declared-test.yang", false); + final StatementStreamSource rootModule = + sourceForResource("/declared-statements-test/root-module-declared-test.yang"); - final YangStatementSourceImpl importedModule = - new YangStatementSourceImpl("/declared-statements-test/imported-module-declared-test.yang", false); + final StatementStreamSource importedModule = + sourceForResource("/declared-statements-test/imported-module-declared-test.yang"); final SchemaContext schemaContext = StmtTestUtils.parseYangSources(rootModule, importedModule); assertNotNull(schemaContext); @@ -370,8 +371,8 @@ public class DeclaredStatementsTest { @Test public void testDeclaredContainer() throws ReactorException { - final YangStatementSourceImpl containerStmtModule = - new YangStatementSourceImpl("/declared-statements-test/container-declared-test.yang", false); + final StatementStreamSource containerStmtModule = + sourceForResource("/declared-statements-test/container-declared-test.yang"); final SchemaContext schemaContext = StmtTestUtils.parseYangSources(containerStmtModule); assertNotNull(schemaContext); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java index 8ddabfe610..4f716aa4c0 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationResolutionTest.java @@ -16,11 +16,7 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; -import java.io.FileNotFoundException; import java.io.PrintStream; -import java.io.UnsupportedEncodingException; -import java.net.URISyntaxException; -import java.text.ParseException; import java.util.Date; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -35,7 +31,6 @@ import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.NotificationDefinition; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.InferenceException; import org.opendaylight.yangtools.yang.parser.spi.meta.InvalidSubstatementException; @@ -44,8 +39,7 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; public class DeviationResolutionTest { @Test - public void testDeviateNotSupported() throws ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void testDeviateNotSupported() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSources( "/deviation-resolution-test/deviation-not-supported"); assertNotNull(schemaContext); @@ -79,7 +73,7 @@ public class DeviationResolutionTest { } @Test - public void testDeviateAdd() throws ReactorException, FileNotFoundException, URISyntaxException, ParseException { + public void testDeviateAdd() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource( "/deviation-resolution-test/deviation-add/foo.yang"); assertNotNull(schemaContext); @@ -126,7 +120,7 @@ public class DeviationResolutionTest { } @Test - public void testDeviateReplace() throws ReactorException, FileNotFoundException, URISyntaxException, ParseException { + public void testDeviateReplace() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource( "/deviation-resolution-test/deviation-replace/foo.yang"); assertNotNull(schemaContext); @@ -190,7 +184,7 @@ public class DeviationResolutionTest { } @Test - public void testDeviateDelete() throws ReactorException, FileNotFoundException, URISyntaxException, ParseException { + public void testDeviateDelete() throws Exception { final SchemaContext schemaContext = StmtTestUtils.parseYangSource( "/deviation-resolution-test/deviation-delete/foo.yang"); assertNotNull(schemaContext); @@ -244,7 +238,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidYang10Model() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidYang10Model() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-add/foo10-invalid.yang"); fail("An exception should have been thrown."); @@ -256,7 +250,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidYang10Model2() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidYang10Model2() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-delete/foo10-invalid.yang"); fail("An exception should have been thrown."); @@ -268,7 +262,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviationTarget() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviationTarget() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/foo-invalid-deviation-target.yang"); fail("An exception should have been thrown."); @@ -281,7 +275,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviationPath() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviationPath() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/foo-invalid-deviation-path.yang"); fail("An exception should have been thrown."); @@ -294,7 +288,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateAdd() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateAdd() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-add/foo-invalid.yang"); fail("An exception should have been thrown."); @@ -308,7 +302,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateAdd2() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateAdd2() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-add/foo-invalid-2.yang"); fail("An exception should have been thrown."); @@ -322,7 +316,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateAdd3() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateAdd3() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-add/foo-invalid-4.yang"); fail("An exception should have been thrown."); @@ -336,7 +330,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateReplace() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateReplace() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-replace/foo-invalid.yang"); fail("An exception should have been thrown."); @@ -350,8 +344,7 @@ public class DeviationResolutionTest { } @Test - public void shouldLogInvalidDeviateReplaceAttempt() throws FileNotFoundException, URISyntaxException, - UnsupportedEncodingException, ReactorException { + public void shouldLogInvalidDeviateReplaceAttempt() throws Exception { final PrintStream stdout = System.out; final ByteArrayOutputStream output = new ByteArrayOutputStream(); final String testLog; @@ -368,8 +361,7 @@ public class DeviationResolutionTest { } @Test - public void shouldLogInvalidDeviateDeleteAttempt() throws FileNotFoundException, URISyntaxException, - UnsupportedEncodingException, ReactorException { + public void shouldLogInvalidDeviateDeleteAttempt() throws Exception { final PrintStream stdout = System.out; final ByteArrayOutputStream output = new ByteArrayOutputStream(); final String testLog; @@ -386,7 +378,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateAddSubstatement() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateAddSubstatement() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-add/foo-invalid-3.yang"); fail("An exception should have been thrown."); @@ -398,7 +390,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateReplaceSubstatement() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateReplaceSubstatement() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-replace/foo-invalid-3.yang"); fail("An exception should have been thrown."); @@ -410,7 +402,7 @@ public class DeviationResolutionTest { } @Test - public void shouldFailOnInvalidDeviateDeleteSubstatement() throws FileNotFoundException, URISyntaxException { + public void shouldFailOnInvalidDeviateDeleteSubstatement() throws Exception { try { StmtTestUtils.parseYangSource("/deviation-resolution-test/deviation-delete/foo-invalid-2.yang"); fail("An exception should have been thrown."); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java index 6929d981f7..a7f9658595 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/DeviationStmtTest.java @@ -12,6 +12,7 @@ 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 static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.text.ParseException; import java.util.Date; @@ -29,14 +30,11 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class DeviationStmtTest { - private static final StatementStreamSource FOO_MODULE = - new YangStatementSourceImpl("/deviation-stmt-test/foo.yang", false); - private static final StatementStreamSource BAR_MODULE = - new YangStatementSourceImpl("/deviation-stmt-test/bar.yang", false); + private static final StatementStreamSource FOO_MODULE = sourceForResource("/deviation-stmt-test/foo.yang"); + private static final StatementStreamSource BAR_MODULE = sourceForResource("/deviation-stmt-test/bar.yang"); @Test public void testDeviationAndDeviate() throws ReactorException, ParseException { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java index 8371a46de4..a2df19df4e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveBuildTest.java @@ -11,6 +11,8 @@ 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.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; + import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; @@ -29,24 +31,24 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class EffectiveBuildTest { - private static final YangStatementSourceImpl SIMPLE_MODULE = new YangStatementSourceImpl( - "/stmt-test/effective-build/simple-module.yang", false); + private static final StatementStreamSource SIMPLE_MODULE = sourceForResource( + "/stmt-test/effective-build/simple-module.yang"); private static final QNameModule SIMPLE_MODULE_QNAME = QNameModule.create( URI.create("simple.yang"), SimpleDateFormatUtil.DEFAULT_DATE_REV); - private static final YangStatementSourceImpl YANG_EXT = new YangStatementSourceImpl( - "/stmt-test/extensions/yang-ext.yang", false); + private static final StatementStreamSource YANG_EXT = sourceForResource( + "/stmt-test/extensions/yang-ext.yang"); @Test public void effectiveBuildTest() throws SourceException, ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, SIMPLE_MODULE); + reactor.addSources(SIMPLE_MODULE); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -108,7 +110,7 @@ public class EffectiveBuildTest { @Test public void extensionsTest() throws SourceException, ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, YANG_EXT); + reactor.addSources(YANG_EXT); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -135,10 +137,4 @@ public class EffectiveBuildTest { SchemaContext result = reactor.buildEffective(); assertNotNull(result); } - - private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java index c62354933e..506ee7b1f9 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveIdentityTest.java @@ -13,29 +13,29 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import org.opendaylight.yangtools.yang.parser.spi.meta.SomeModifiersUnresolvedException; - +import java.net.URISyntaxException; import java.util.Set; +import org.junit.Test; +import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.common.SimpleDateFormatUtil; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; -import java.net.URISyntaxException; 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.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; -import org.junit.Test; +import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class EffectiveIdentityTest { - private static final YangStatementSourceImpl IDENTITY_TEST = new YangStatementSourceImpl( - "/stmt-test/identity/identity-test.yang", false); + private static final StatementStreamSource IDENTITY_TEST = sourceForResource( + "/stmt-test/identity/identity-test.yang"); - private static final YangStatementSourceImpl CYCLIC_IDENTITY_TEST = new YangStatementSourceImpl( - "/stmt-test/identity/cyclic-identity-test.yang", false); + private static final StatementStreamSource CYCLIC_IDENTITY_TEST = sourceForResource( + "/stmt-test/identity/cyclic-identity-test.yang"); @Test(expected = SomeModifiersUnresolvedException.class) public void cyclicefineTest() throws SourceException, ReactorException, @@ -43,7 +43,7 @@ public class EffectiveIdentityTest { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); - StmtTestUtils.addSources(reactor, CYCLIC_IDENTITY_TEST); + reactor.addSources(CYCLIC_IDENTITY_TEST); try { EffectiveSchemaContext result = reactor.buildEffective(); } catch (SomeModifiersUnresolvedException e) { @@ -58,7 +58,7 @@ public class EffectiveIdentityTest { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); - StmtTestUtils.addSources(reactor, IDENTITY_TEST); + reactor.addSources(IDENTITY_TEST); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java index ceefbd3867..0a6bcd876d 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModuleTest.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.net.URI; import java.text.ParseException; @@ -37,19 +38,19 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.Status; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class EffectiveModuleTest { - private static final YangStatementSourceImpl ROOT_MODULE = new YangStatementSourceImpl( - "/semantic-statement-parser/effective-module/root.yang", false); - private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl( - "/semantic-statement-parser/effective-module/imported.yang", false); - private static final YangStatementSourceImpl SUBMODULE = new YangStatementSourceImpl( - "/semantic-statement-parser/effective-module/submod.yang", false); + private static final StatementStreamSource ROOT_MODULE = sourceForResource( + "/semantic-statement-parser/effective-module/root.yang"); + private static final StatementStreamSource IMPORTED_MODULE = sourceForResource( + "/semantic-statement-parser/effective-module/imported.yang"); + private static final StatementStreamSource SUBMODULE = sourceForResource( + "/semantic-statement-parser/effective-module/submod.yang"); private static final QNameModule ROOT_MODULE_QNAME = QNameModule.create(URI.create("root-ns"), SimpleDateFormatUtil.DEFAULT_DATE_REV); @@ -74,7 +75,7 @@ public class EffectiveModuleTest { @Test public void effectiveBuildTest() throws SourceException, ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, ROOT_MODULE, IMPORTED_MODULE, SUBMODULE); + reactor.addSources(ROOT_MODULE, IMPORTED_MODULE, SUBMODULE); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -140,10 +141,4 @@ public class EffectiveModuleTest { assertEquals(1, extensionSchemaNodes.size()); assertEquals("ext1", extensionSchemaNodes.iterator().next().getQName().getLocalName()); } - - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java index a0c9a75f7b..bd2bcc26fe 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveModulesAndSubmodulesTest.java @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.net.URI; import java.net.URISyntaxException; @@ -24,30 +25,30 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class EffectiveModulesAndSubmodulesTest { - private static final YangStatementSourceImpl ROOT_MODULE = new YangStatementSourceImpl( - "/stmt-test/submodules/root-module.yang",false); - private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl( - "/stmt-test/submodules/imported-module.yang",false); - private static final YangStatementSourceImpl SUBMODULE_1 = new YangStatementSourceImpl( - "/stmt-test/submodules/submodule-1.yang",false); - private static final YangStatementSourceImpl SUBMODULE_2 = new YangStatementSourceImpl( - "/stmt-test/submodules/submodule-2.yang",false); - private static final YangStatementSourceImpl SUBMODULE_TO_SUBMODULE_1 = new YangStatementSourceImpl( - "/stmt-test/submodules/submodule-to-submodule-1.yang",false); + private static final StatementStreamSource ROOT_MODULE = sourceForResource( + "/stmt-test/submodules/root-module.yang"); + private static final StatementStreamSource IMPORTED_MODULE = sourceForResource( + "/stmt-test/submodules/imported-module.yang"); + private static final StatementStreamSource SUBMODULE_1 = sourceForResource( + "/stmt-test/submodules/submodule-1.yang"); + private static final StatementStreamSource SUBMODULE_2 = sourceForResource( + "/stmt-test/submodules/submodule-2.yang"); + private static final StatementStreamSource SUBMODULE_TO_SUBMODULE_1 = sourceForResource( + "/stmt-test/submodules/submodule-to-submodule-1.yang"); @Test public void modulesAndSubmodulesSimpleReferencesTest() throws SourceException, ReactorException, URISyntaxException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); - StmtTestUtils.addSources(reactor, ROOT_MODULE, IMPORTED_MODULE, + reactor.addSources(ROOT_MODULE, IMPORTED_MODULE, SUBMODULE_1, SUBMODULE_2, SUBMODULE_TO_SUBMODULE_1); final EffectiveSchemaContext result = reactor.buildEffective(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java index 81e60db930..669e7d3d6b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveStatementTypeTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.List; import org.junit.Before; @@ -36,9 +37,9 @@ import org.opendaylight.yangtools.yang.model.api.type.LengthConstraint; import org.opendaylight.yangtools.yang.model.api.type.StringTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.LeafEffectiveStatementImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.BitsSpecificationEffectiveStatementImpl; @@ -51,8 +52,7 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.type.UnionS public class EffectiveStatementTypeTest { - private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl( - "/type-tests/types.yang", false); + private static final StatementStreamSource IMPORTED_MODULE = sourceForResource("/type-tests/types.yang"); private static EffectiveSchemaContext effectiveSchemaContext; private static LeafSchemaNode currentLeaf; private static Module types; diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java index 51a07ba69d..03ddd7cdfc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/EffectiveUsesRefineAndConstraintsTest.java @@ -13,6 +13,8 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; + import java.net.URISyntaxException; import java.util.Set; import org.junit.Test; @@ -28,15 +30,14 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class EffectiveUsesRefineAndConstraintsTest { - private static final YangStatementSourceImpl REFINE_TEST = new YangStatementSourceImpl( - "/stmt-test/uses/refine-test.yang",false); + private static final StatementStreamSource REFINE_TEST = sourceForResource("/stmt-test/uses/refine-test.yang"); @Test public void refineTest() throws SourceException, ReactorException, @@ -44,7 +45,7 @@ public class EffectiveUsesRefineAndConstraintsTest { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); - StmtTestUtils.addSources(reactor, REFINE_TEST); + reactor.addSources(REFINE_TEST); EffectiveSchemaContext result = reactor.buildEffective(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java index 3868fcdd2f..5c08b4fcea 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ExtensionStmtTest.java @@ -11,6 +11,7 @@ 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.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.List; import org.junit.Test; @@ -20,26 +21,23 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class ExtensionStmtTest { - private static final YangStatementSourceImpl EXT_DEF_MODULE = new YangStatementSourceImpl("/model/bar.yang", - false); - private static final YangStatementSourceImpl EXT_DEF_MODULE2 = new YangStatementSourceImpl - ("/semantic-statement-parser/ext-typedef.yang", - false); - private static final YangStatementSourceImpl EXT_USE_MODULE = new YangStatementSourceImpl - ("/semantic-statement-parser/ext-use.yang", - false); + private static final StatementStreamSource EXT_DEF_MODULE = sourceForResource("/model/bar.yang"); + private static final StatementStreamSource EXT_DEF_MODULE2 = sourceForResource( + "/semantic-statement-parser/ext-typedef.yang"); + private static final StatementStreamSource EXT_USE_MODULE = sourceForResource( + "/semantic-statement-parser/ext-use.yang"); @Test public void testExtensionDefinition() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, EXT_DEF_MODULE); + reactor.addSources(EXT_DEF_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -59,7 +57,7 @@ public class ExtensionStmtTest { @Test public void testExtensionUsage() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, EXT_DEF_MODULE2, EXT_USE_MODULE); + reactor.addSources(EXT_DEF_MODULE2, EXT_USE_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java index 651e2755d4..3a54668098 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingAndUsesStmtTest.java @@ -13,6 +13,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Iterator; import java.util.List; @@ -32,23 +33,22 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.UnknownSchemaNode; import org.opendaylight.yangtools.yang.model.api.UsesNode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class GroupingAndUsesStmtTest { - private static final YangStatementSourceImpl MODULE = new YangStatementSourceImpl("/model/bar.yang", false); - private static final YangStatementSourceImpl SUBMODULE = new YangStatementSourceImpl("/model/subfoo.yang", false); - private static final YangStatementSourceImpl GROUPING_MODULE = new YangStatementSourceImpl("/model/baz.yang", - false); - private static final YangStatementSourceImpl USES_MODULE = new YangStatementSourceImpl("/model/foo.yang", false); + private static final StatementStreamSource MODULE = sourceForResource("/model/bar.yang"); + private static final StatementStreamSource SUBMODULE = sourceForResource("/model/subfoo.yang"); + private static final StatementStreamSource GROUPING_MODULE = sourceForResource("/model/baz.yang"); + private static final StatementStreamSource USES_MODULE = sourceForResource("/model/foo.yang"); @Test public void groupingTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, MODULE, GROUPING_MODULE); + reactor.addSources(MODULE, GROUPING_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -90,7 +90,7 @@ public class GroupingAndUsesStmtTest { @Test public void usesAndRefinesTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, MODULE, SUBMODULE, GROUPING_MODULE, USES_MODULE); + reactor.addSources(MODULE, SUBMODULE, GROUPING_MODULE, USES_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java index 087ab6ae80..21afacdcfc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/GroupingTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import java.net.URI; -import java.net.URISyntaxException; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Collection; @@ -49,7 +48,7 @@ public class GroupingTest { private Set modules; @Before - public void init() throws URISyntaxException, ReactorException { + public void init() throws Exception { modules = TestUtils.loadModules(getClass().getResource("/model").toURI()); assertEquals(3, modules.size()); } @@ -607,7 +606,7 @@ public class GroupingTest { } @Test - public void testAddedByUsesLeafTypeQName() throws URISyntaxException, ReactorException { + public void testAddedByUsesLeafTypeQName() throws Exception { final Set loadModules = TestUtils.loadModules(getClass().getResource("/added-by-uses-leaf-test") .toURI()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java index 8703c20c8d..a995be56f9 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IdentityStmtTest.java @@ -13,6 +13,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Iterator; import java.util.Set; @@ -21,32 +22,33 @@ import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; 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.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class IdentityStmtTest { - private static final YangStatementSourceImpl ILLEGAL_IDENTITY_MODULE = new YangStatementSourceImpl - ("/identity/identitytest.yang", false); - private static final YangStatementSourceImpl ILLEGAL_IDENTITY_MODULE2 = new YangStatementSourceImpl - ("/identity/prefixidentitytest.yang", false); - private static final YangStatementSourceImpl LEGAL_IDENTITY_MODULE = new YangStatementSourceImpl - ("/identity/import/dummy.yang", false); - private static final YangStatementSourceImpl LEGAL_IDENTITY_MODULE2 = new YangStatementSourceImpl - ("/identity/import/prefiximportidentitytest.yang", false); - private static final YangStatementSourceImpl ILLEGAL_IDENTITY_MODULE3 = new YangStatementSourceImpl - ("/identity/illegal-chained-identity-test.yang", false); - private static final YangStatementSourceImpl LEGAL_IDENTITY_MODULE3 = new YangStatementSourceImpl - ("/identity/legal-chained-identity-test.yang", false); - private static final YangStatementSourceImpl DUPLICATE_IDENTITY_MODULE = new YangStatementSourceImpl - ("/identity/duplicate-identity-test.yang", false); + private static final StatementStreamSource ILLEGAL_IDENTITY_MODULE = + sourceForResource("/identity/identitytest.yang"); + + private static final StatementStreamSource ILLEGAL_IDENTITY_MODULE2 = sourceForResource( + "/identity/prefixidentitytest.yang"); + private static final StatementStreamSource LEGAL_IDENTITY_MODULE = sourceForResource( + "/identity/import/dummy.yang"); + private static final StatementStreamSource LEGAL_IDENTITY_MODULE2 = sourceForResource( + "/identity/import/prefiximportidentitytest.yang"); + private static final StatementStreamSource ILLEGAL_IDENTITY_MODULE3 = sourceForResource( + "/identity/illegal-chained-identity-test.yang"); + private static final StatementStreamSource LEGAL_IDENTITY_MODULE3 = sourceForResource( + "/identity/legal-chained-identity-test.yang"); + private static final StatementStreamSource DUPLICATE_IDENTITY_MODULE = sourceForResource( + "/identity/duplicate-identity-test.yang"); @Test(expected = SomeModifiersUnresolvedException.class) public void selfReferencingIdentityTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ILLEGAL_IDENTITY_MODULE); + reactor.addSources(ILLEGAL_IDENTITY_MODULE); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -55,7 +57,7 @@ public class IdentityStmtTest { @Test(expected = SomeModifiersUnresolvedException.class) public void selfReferencingIdentityWithPrefixTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ILLEGAL_IDENTITY_MODULE2); + reactor.addSources(ILLEGAL_IDENTITY_MODULE2); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -64,7 +66,7 @@ public class IdentityStmtTest { @Test public void importedIdentityTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, LEGAL_IDENTITY_MODULE, LEGAL_IDENTITY_MODULE2); + reactor.addSources(LEGAL_IDENTITY_MODULE, LEGAL_IDENTITY_MODULE2); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -73,7 +75,7 @@ public class IdentityStmtTest { @Test(expected = SomeModifiersUnresolvedException.class) public void selfReferencingIdentityThroughChaining() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ILLEGAL_IDENTITY_MODULE3); + reactor.addSources(ILLEGAL_IDENTITY_MODULE3); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -82,7 +84,7 @@ public class IdentityStmtTest { @Test public void chainedIdentityTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, LEGAL_IDENTITY_MODULE3); + reactor.addSources(LEGAL_IDENTITY_MODULE3); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -114,7 +116,7 @@ public class IdentityStmtTest { @Test public void duplicateIdentityTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, DUPLICATE_IDENTITY_MODULE); + reactor.addSources(DUPLICATE_IDENTITY_MODULE); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java index 5a2a5f9d0e..f1f16df8a3 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IfFeatureResolutionTest.java @@ -11,6 +11,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import com.google.common.collect.ImmutableSet; import java.util.Set; @@ -25,14 +26,11 @@ import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class IfFeatureResolutionTest { - private static final StatementStreamSource FOO_MODULE = - new YangStatementSourceImpl("/if-feature-resolution-test/foo.yang", false); - private static final StatementStreamSource BAR_MODULE = - new YangStatementSourceImpl("/if-feature-resolution-test/bar.yang", false); + private static final StatementStreamSource FOO_MODULE = sourceForResource("/if-feature-resolution-test/foo.yang"); + private static final StatementStreamSource BAR_MODULE = sourceForResource("/if-feature-resolution-test/bar.yang"); @Test public void testSomeFeaturesSupported() throws ReactorException { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java index f1003b8252..c272b4b63e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportResolutionBasicTest.java @@ -12,42 +12,43 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; 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.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class ImportResolutionBasicTest { - private static final YangStatementSourceImpl ROOT_WITHOUT_IMPORT = new YangStatementSourceImpl( - "/semantic-statement-parser/import-arg-parsing/nature.yang", false); - private static final YangStatementSourceImpl IMPORT_ROOT = new YangStatementSourceImpl( - "/semantic-statement-parser/import-arg-parsing/mammal.yang", false); - private static final YangStatementSourceImpl IMPORT_DERIVED = new YangStatementSourceImpl( - "/semantic-statement-parser/import-arg-parsing/human.yang", false); - private static final YangStatementSourceImpl IMPORT_SELF = new YangStatementSourceImpl( - "/semantic-statement-parser/import-arg-parsing/egocentric.yang", false); - private static final YangStatementSourceImpl CYCLE_YIN = new YangStatementSourceImpl( - "/semantic-statement-parser/import-arg-parsing/cycle-yin.yang", false); - private static final YangStatementSourceImpl CYCLE_YANG = new YangStatementSourceImpl( - "/semantic-statement-parser/import-arg-parsing/cycle-yang.yang", false); - private static final YangStatementSourceImpl FOO = new YangStatementSourceImpl( - "/semantic-statement-parser/bug2649/foo.yang", false); - private static final YangStatementSourceImpl IMPORT = new YangStatementSourceImpl( - "/semantic-statement-parser/bug2649/import-module.yang", false); + private static final StatementStreamSource ROOT_WITHOUT_IMPORT = sourceForResource( + "/semantic-statement-parser/import-arg-parsing/nature.yang"); + private static final StatementStreamSource IMPORT_ROOT = sourceForResource( + "/semantic-statement-parser/import-arg-parsing/mammal.yang"); + private static final StatementStreamSource IMPORT_DERIVED = sourceForResource( + "/semantic-statement-parser/import-arg-parsing/human.yang"); + private static final StatementStreamSource IMPORT_SELF = sourceForResource( + "/semantic-statement-parser/import-arg-parsing/egocentric.yang"); + private static final StatementStreamSource CYCLE_YIN = sourceForResource( + "/semantic-statement-parser/import-arg-parsing/cycle-yin.yang"); + private static final StatementStreamSource CYCLE_YANG = sourceForResource( + "/semantic-statement-parser/import-arg-parsing/cycle-yang.yang"); + private static final StatementStreamSource FOO = sourceForResource( + "/semantic-statement-parser/bug2649/foo.yang"); + private static final StatementStreamSource IMPORT = sourceForResource( + "/semantic-statement-parser/bug2649/import-module.yang"); @Test public void inImportOrderTest() throws SourceException, ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, ROOT_WITHOUT_IMPORT, IMPORT_ROOT, IMPORT_DERIVED); + reactor.addSources(ROOT_WITHOUT_IMPORT, IMPORT_ROOT, IMPORT_DERIVED); EffectiveModelContext result = reactor.build(); assertNotNull(result); } @@ -55,7 +56,7 @@ public class ImportResolutionBasicTest { @Test public void inInverseOfImportOrderTest() throws SourceException, ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, IMPORT_DERIVED, IMPORT_ROOT, ROOT_WITHOUT_IMPORT); + reactor.addSources(IMPORT_DERIVED, IMPORT_ROOT, ROOT_WITHOUT_IMPORT); EffectiveModelContext result = reactor.build(); assertNotNull(result); } @@ -63,7 +64,7 @@ public class ImportResolutionBasicTest { @Test public void missingImportedSourceTest() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, IMPORT_DERIVED, ROOT_WITHOUT_IMPORT); + reactor.addSources(IMPORT_DERIVED, ROOT_WITHOUT_IMPORT); try { reactor.build(); fail("reactor.process should fail due to missing imported source"); @@ -77,7 +78,7 @@ public class ImportResolutionBasicTest { @Test public void circularImportsTest() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, CYCLE_YIN, CYCLE_YANG); + reactor.addSources(CYCLE_YIN, CYCLE_YANG); try { reactor.build(); fail("reactor.process should fail due to circular import"); @@ -90,7 +91,7 @@ public class ImportResolutionBasicTest { @Test public void selfImportTest() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, IMPORT_SELF, IMPORT_ROOT, ROOT_WITHOUT_IMPORT); + reactor.addSources(IMPORT_SELF, IMPORT_ROOT, ROOT_WITHOUT_IMPORT); try { reactor.build(); fail("reactor.process should fail due to self import"); @@ -103,16 +104,9 @@ public class ImportResolutionBasicTest { @Test public void bug2649Test() throws SourceException, ReactorException{ BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, FOO, IMPORT); + reactor.addSources(FOO, IMPORT); EffectiveSchemaContext buildEffective = reactor.buildEffective(); assertNotNull(buildEffective); } - - private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } - } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java index 57058b5b01..8b306941b9 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ImportRevisionsTest.java @@ -9,44 +9,45 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; 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.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class ImportRevisionsTest { - private static final YangStatementSourceImpl ROOT_WITH_EQUAL_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/root-with-equal-revision-date.yang", false); - private static final YangStatementSourceImpl IMPORTED_WITH_EQUAL_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/imported-module-with-equal-revision-date.yang", false); - private static final YangStatementSourceImpl ROOT_WITH_UNEQUAL_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/root-with-unequal-revision-date.yang", false); - private static final YangStatementSourceImpl IMPORTED_WITH_UNEQUAL_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/imported-module-with-unequal-revision-date.yang", false); - private static final YangStatementSourceImpl ROOT_WITH_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/root-with-revision-date.yang", false); - private static final YangStatementSourceImpl IMPORTED_WITHOUT_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/imported-module-without-revision-date.yang", false); - private static final YangStatementSourceImpl ROOT_WITHOUT_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/root-without-revision-date.yang", false); - private static final YangStatementSourceImpl IMPORTED_WITH_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/imported-module-with-revision-date.yang", false); - private static final YangStatementSourceImpl ROOT_WITH_1970_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/root-with-1970-revision-date.yang", false); - private static final YangStatementSourceImpl ROOT_WITH_NO_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/root-with-no-revision-date.yang", false); - private static final YangStatementSourceImpl IMPORTED_WITH_NO_DATE = new YangStatementSourceImpl - ("/import-revision-date-test/imported-module-with-no-revision-date.yang", false); + private static final StatementStreamSource ROOT_WITH_EQUAL_DATE = sourceForResource( + "/import-revision-date-test/root-with-equal-revision-date.yang"); + private static final StatementStreamSource IMPORTED_WITH_EQUAL_DATE = sourceForResource( + "/import-revision-date-test/imported-module-with-equal-revision-date.yang"); + private static final StatementStreamSource ROOT_WITH_UNEQUAL_DATE = sourceForResource( + "/import-revision-date-test/root-with-unequal-revision-date.yang"); + private static final StatementStreamSource IMPORTED_WITH_UNEQUAL_DATE = sourceForResource( + "/import-revision-date-test/imported-module-with-unequal-revision-date.yang"); + private static final StatementStreamSource ROOT_WITH_DATE = sourceForResource( + "/import-revision-date-test/root-with-revision-date.yang"); + private static final StatementStreamSource IMPORTED_WITHOUT_DATE = sourceForResource( + "/import-revision-date-test/imported-module-without-revision-date.yang"); + private static final StatementStreamSource ROOT_WITHOUT_DATE = sourceForResource( + "/import-revision-date-test/root-without-revision-date.yang"); + private static final StatementStreamSource IMPORTED_WITH_DATE = sourceForResource( + "/import-revision-date-test/imported-module-with-revision-date.yang"); + private static final StatementStreamSource ROOT_WITH_1970_DATE = sourceForResource( + "/import-revision-date-test/root-with-1970-revision-date.yang"); + private static final StatementStreamSource ROOT_WITH_NO_DATE = sourceForResource( + "/import-revision-date-test/root-with-no-revision-date.yang"); + private static final StatementStreamSource IMPORTED_WITH_NO_DATE = sourceForResource( + "/import-revision-date-test/imported-module-with-no-revision-date.yang"); @Test public void equalRevisionDatesTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_WITH_EQUAL_DATE, IMPORTED_WITH_EQUAL_DATE); + reactor.addSources(ROOT_WITH_EQUAL_DATE, IMPORTED_WITH_EQUAL_DATE); EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -55,7 +56,7 @@ public class ImportRevisionsTest { @Test(expected = SomeModifiersUnresolvedException.class) public void unequalRevisionDatesTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_WITH_UNEQUAL_DATE, IMPORTED_WITH_UNEQUAL_DATE); + reactor.addSources(ROOT_WITH_UNEQUAL_DATE, IMPORTED_WITH_UNEQUAL_DATE); EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -65,7 +66,7 @@ public class ImportRevisionsTest { @Test(expected = SomeModifiersUnresolvedException.class) public void revisionDatesInRootOnlyTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_WITH_DATE, IMPORTED_WITHOUT_DATE); + reactor.addSources(ROOT_WITH_DATE, IMPORTED_WITHOUT_DATE); EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -74,7 +75,7 @@ public class ImportRevisionsTest { @Test public void revisionDatesInImportedOnlyTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_WITHOUT_DATE, IMPORTED_WITH_DATE); + reactor.addSources( ROOT_WITHOUT_DATE, IMPORTED_WITH_DATE); EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -83,7 +84,7 @@ public class ImportRevisionsTest { @Test public void revision1970InRootOnlyTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_WITH_1970_DATE, IMPORTED_WITHOUT_DATE); + reactor.addSources(ROOT_WITH_1970_DATE, IMPORTED_WITHOUT_DATE); EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -92,7 +93,7 @@ public class ImportRevisionsTest { @Test public void noRevisionInRootAndImportedTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_WITH_NO_DATE, IMPORTED_WITH_NO_DATE); + reactor.addSources(ROOT_WITH_NO_DATE, IMPORTED_WITH_NO_DATE); EffectiveModelContext result = reactor.build(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java index 745f71f22d..40f7f92388 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeResolutionTest.java @@ -12,39 +12,41 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; + import java.util.logging.Logger; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; 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.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class IncludeResolutionTest { private static final Logger log = Logger.getLogger(IncludeResolutionTest.class.getName()); - private static final YangStatementSourceImpl ROOT = new YangStatementSourceImpl( - "/semantic-statement-parser/include-arg-parsing/root-module.yang", false); - private static final YangStatementSourceImpl SUBMODULE1 = new YangStatementSourceImpl( - "/semantic-statement-parser/include-arg-parsing/submodule-1.yang", false); - private static final YangStatementSourceImpl SUBMODULE2 = new YangStatementSourceImpl( - "/semantic-statement-parser/include-arg-parsing/submodule-2.yang", false); - private static final YangStatementSourceImpl ERROR_MODULE = new YangStatementSourceImpl( - "/semantic-statement-parser/include-arg-parsing/error-module.yang", false); - private static final YangStatementSourceImpl ERROR_SUBMODULE = new YangStatementSourceImpl( - "/semantic-statement-parser/include-arg-parsing/error-submodule.yang", false); + private static final StatementStreamSource ROOT = sourceForResource( + "/semantic-statement-parser/include-arg-parsing/root-module.yang"); + private static final StatementStreamSource SUBMODULE1 = sourceForResource( + "/semantic-statement-parser/include-arg-parsing/submodule-1.yang"); + private static final StatementStreamSource SUBMODULE2 = sourceForResource( + "/semantic-statement-parser/include-arg-parsing/submodule-2.yang"); + private static final StatementStreamSource ERROR_MODULE = sourceForResource( + "/semantic-statement-parser/include-arg-parsing/error-module.yang"); + private static final StatementStreamSource ERROR_SUBMODULE = sourceForResource( + "/semantic-statement-parser/include-arg-parsing/error-submodule.yang"); - private static final YangStatementSourceImpl MISSING_PARENT_MODULE = new YangStatementSourceImpl( - "/semantic-statement-parser/include-arg-parsing/missing-parent.yang", false); + private static final StatementStreamSource MISSING_PARENT_MODULE = sourceForResource( + "/semantic-statement-parser/include-arg-parsing/missing-parent.yang"); @Test public void includeTest() throws SourceException, ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, ROOT, SUBMODULE1, SUBMODULE2); + reactor.addSources(ROOT, SUBMODULE1, SUBMODULE2); EffectiveModelContext result = reactor.build(); assertNotNull(result); } @@ -52,7 +54,7 @@ public class IncludeResolutionTest { @Test public void missingIncludedSourceTest() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, ERROR_MODULE); + reactor.addSources(ERROR_MODULE); try { reactor.build(); fail("reactor.process should fail due to missing included source"); @@ -67,7 +69,7 @@ public class IncludeResolutionTest { @Test public void missingIncludedSourceTest2() throws SourceException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, ERROR_SUBMODULE); + reactor.addSources(ERROR_SUBMODULE); try { reactor.build(); fail("reactor.process should fail due to missing included source"); @@ -82,7 +84,7 @@ public class IncludeResolutionTest { @Test public void missingIncludedSourceTest3() throws SourceException, ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, MISSING_PARENT_MODULE); + reactor.addSources(MISSING_PARENT_MODULE); try { reactor.build(); fail("reactor.process should fail due to missing belongsTo source"); @@ -91,10 +93,4 @@ public class IncludeResolutionTest { } } - - private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java index cfc5e89e63..efe2107c96 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludeRevisionsTest.java @@ -12,6 +12,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; + import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ModelProcessingPhase; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -21,34 +23,21 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class IncludeRevisionsTest { - private static final YangStatementSourceImpl EQUAL_ROOT = new YangStatementSourceImpl("/revisions/equal-root.yang", - false); - private static final YangStatementSourceImpl EQUAL_REV = new YangStatementSourceImpl("/revisions/equal-rev.yang", - false); - private static final YangStatementSourceImpl UNEQUAL_ROOT = new YangStatementSourceImpl( - "/revisions/unequal-root.yang", false); - private static final YangStatementSourceImpl UNEQUAL_REV = new YangStatementSourceImpl( - "/revisions/unequal-rev.yang", false); - private static final YangStatementSourceImpl SUBMOD_ONLY_ROOT = new YangStatementSourceImpl( - "/revisions/submod-only-root.yang", false); - private static final YangStatementSourceImpl SUBMOD_ONLY_REV = new YangStatementSourceImpl( - "/revisions/submod-only-rev.yang", false); - private static final YangStatementSourceImpl MOD_ONLY_ROOT = new YangStatementSourceImpl( - "/revisions/mod-only-root.yang", false); - private static final YangStatementSourceImpl MOD_ONLY_REV = new YangStatementSourceImpl( - "/revisions/mod-only-rev.yang", false); - private static final YangStatementSourceImpl MOD_ONLY_1970_ROOT = new YangStatementSourceImpl( - "/revisions/mod-1970-root.yang", false); - private static final YangStatementSourceImpl MOD_ONLY_1970_REV = new YangStatementSourceImpl( - "/revisions/mod-1970-rev.yang", false); - private static final YangStatementSourceImpl NOWHERE_ROOT = new YangStatementSourceImpl( - "/revisions/nowhere-root.yang", false); - private static final YangStatementSourceImpl NOWHERE_REV = new YangStatementSourceImpl( - "/revisions/nowhere-rev.yang", false); + private static final StatementStreamSource EQUAL_ROOT = sourceForResource("/revisions/equal-root.yang"); + private static final StatementStreamSource EQUAL_REV = sourceForResource("/revisions/equal-rev.yang"); + private static final StatementStreamSource UNEQUAL_ROOT = sourceForResource("/revisions/unequal-root.yang"); + private static final StatementStreamSource UNEQUAL_REV = sourceForResource("/revisions/unequal-rev.yang"); + private static final StatementStreamSource SUBMOD_ONLY_ROOT = sourceForResource("/revisions/submod-only-root.yang"); + private static final StatementStreamSource SUBMOD_ONLY_REV = sourceForResource("/revisions/submod-only-rev.yang"); + private static final StatementStreamSource MOD_ONLY_ROOT = sourceForResource("/revisions/mod-only-root.yang"); + private static final StatementStreamSource MOD_ONLY_REV = sourceForResource("/revisions/mod-only-rev.yang"); + private static final StatementStreamSource MOD_ONLY_1970_ROOT = sourceForResource("/revisions/mod-1970-root.yang"); + private static final StatementStreamSource MOD_ONLY_1970_REV = sourceForResource("/revisions/mod-1970-rev.yang"); + private static final StatementStreamSource NOWHERE_ROOT = sourceForResource("/revisions/nowhere-root.yang"); + private static final StatementStreamSource NOWHERE_REV = sourceForResource("/revisions/nowhere-rev.yang"); @Test public void revsEqualTest() throws SourceException, ReactorException { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java index f9f172ad9d..7f8849b8d7 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/IncludedStmtsTest.java @@ -13,6 +13,7 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Iterator; import java.util.Set; @@ -24,22 +25,22 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class IncludedStmtsTest { - private static final YangStatementSourceImpl ROOT_MODULE = new YangStatementSourceImpl - ("/included-statements-test/root-module.yang", false); - private static final YangStatementSourceImpl CHILD_MODULE = new YangStatementSourceImpl - ("/included-statements-test/child-module.yang", false); + private static final StatementStreamSource ROOT_MODULE = sourceForResource( + "/included-statements-test/root-module.yang"); + private static final StatementStreamSource CHILD_MODULE = sourceForResource( + "/included-statements-test/child-module.yang"); @Test public void includedTypedefsTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_MODULE, CHILD_MODULE); + reactor.addSources(ROOT_MODULE, CHILD_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -62,7 +63,7 @@ public class IncludedStmtsTest { @Test public void includedFeaturesTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_MODULE, CHILD_MODULE); + reactor.addSources(ROOT_MODULE, CHILD_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -83,7 +84,7 @@ public class IncludedStmtsTest { @Test public void includedContainersAndListsTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_MODULE, CHILD_MODULE); + reactor.addSources(ROOT_MODULE, CHILD_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -106,7 +107,7 @@ public class IncludedStmtsTest { @Test public void submoduleNamespaceTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, ROOT_MODULE, CHILD_MODULE); + reactor.addSources(ROOT_MODULE, CHILD_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java index 3d2a772ab1..c75ff64ddc 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/KeyTest.java @@ -11,27 +11,28 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor.BuildAction; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class KeyTest { - private static final YangStatementSourceImpl KEY_SIMPLE_AND_COMP = new YangStatementSourceImpl( - "/semantic-statement-parser/key-arg-parsing/key-simple-and-comp.yang", false); - private static final YangStatementSourceImpl KEY_COMP_DUPLICATE = new YangStatementSourceImpl( - "/semantic-statement-parser/key-arg-parsing/key-comp-duplicate.yang", false); + private static final StatementStreamSource KEY_SIMPLE_AND_COMP = sourceForResource( + "/semantic-statement-parser/key-arg-parsing/key-simple-and-comp.yang"); + private static final StatementStreamSource KEY_COMP_DUPLICATE = sourceForResource( + "/semantic-statement-parser/key-arg-parsing/key-comp-duplicate.yang"); @Test public void keySimpleTest() throws ReactorException { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, KEY_SIMPLE_AND_COMP); + reactor.addSources(KEY_SIMPLE_AND_COMP); EffectiveModelContext result = reactor.build(); assertNotNull(result); @@ -41,7 +42,7 @@ public class KeyTest { public void keyCompositeInvalid() { BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, KEY_COMP_DUPLICATE); + reactor.addSources(KEY_COMP_DUPLICATE); try { reactor.build(); @@ -52,11 +53,4 @@ public class KeyTest { assertTrue(cause.getMessage().startsWith("Key argument 'key1 key2 key2' contains duplicates")); } } - - private static void addSources(final BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } - } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java index e1fab4e099..0afba1b61f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListKeysTest.java @@ -10,15 +10,16 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.io.IOException; import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class ListKeysTest { @@ -26,11 +27,10 @@ public class ListKeysTest { @Test public void correctListKeysTest() throws ReactorException { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/list-keys-test/correct-list-keys-test.yang", false); + final StatementStreamSource yangFile = sourceForResource("/list-keys-test/correct-list-keys-test.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -39,11 +39,10 @@ public class ListKeysTest { @Test public void incorrectListKeysTest1() throws IOException, YangSyntaxErrorException, URISyntaxException { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/list-keys-test/incorrect-list-keys-test.yang", false); + final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); try { reactor.buildEffective(); @@ -57,11 +56,10 @@ public class ListKeysTest { @Test public void incorrectListKeysTest2() throws IOException, YangSyntaxErrorException, URISyntaxException { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/list-keys-test/incorrect-list-keys-test2.yang", false); + final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test2.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); try { reactor.buildEffective(); @@ -75,11 +73,10 @@ public class ListKeysTest { @Test public void incorrectListKeysTest3() throws IOException, YangSyntaxErrorException, URISyntaxException { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/list-keys-test/incorrect-list-keys-test3.yang", false); + final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test3.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); try { reactor.buildEffective(); @@ -93,11 +90,10 @@ public class ListKeysTest { @Test public void incorrectListKeysTest4() throws IOException, YangSyntaxErrorException, URISyntaxException { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/list-keys-test/incorrect-list-keys-test4.yang", false); + final StatementStreamSource yangFile = sourceForResource("/list-keys-test/incorrect-list-keys-test4.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); try { reactor.buildEffective(); @@ -108,11 +104,4 @@ public class ListKeysTest { assertTrue(e.getCause().getMessage().startsWith("Key 'grp_leaf' misses node 'grp_leaf'")); } } - - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, - final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java index cbd7085070..d35a208173 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/ListTest.java @@ -12,6 +12,7 @@ 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 static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.List; import org.junit.Test; @@ -21,20 +22,19 @@ import org.opendaylight.yangtools.yang.model.api.LeafSchemaNode; import org.opendaylight.yangtools.yang.model.api.ListSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class ListTest { - private static final YangStatementSourceImpl LIST_MODULE = new YangStatementSourceImpl("/list-test/list-test.yang", - false); + private static final StatementStreamSource LIST_MODULE = sourceForResource("/list-test/list-test.yang"); @Test public void listAndLeavesTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, LIST_MODULE); + reactor.addSources(LIST_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java index 1603262daa..e0dbbae074 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MoreRevisionsTest.java @@ -12,8 +12,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; -import java.io.FileNotFoundException; import java.net.URI; import java.net.URISyntaxException; import java.text.ParseException; @@ -35,49 +35,42 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class MoreRevisionsTest { - private static final YangStatementSourceImpl REVFILE = new YangStatementSourceImpl( - "/semantic-statement-parser/revisions/more-revisions-test.yang", - false); + private static final StatementStreamSource REVFILE = sourceForResource( + "/semantic-statement-parser/revisions/more-revisions-test.yang"); - private static final YangStatementSourceImpl TED_20130712 = new YangStatementSourceImpl( - "/semantic-statement-parser/two-revisions/ted@2013-07-12.yang", - false); + private static final StatementStreamSource TED_20130712 = sourceForResource( + "/semantic-statement-parser/two-revisions/ted@2013-07-12.yang"); - private static final YangStatementSourceImpl TED_20131021 = new YangStatementSourceImpl( - "/semantic-statement-parser/two-revisions/ted@2013-10-21.yang", - false); + private static final StatementStreamSource TED_20131021 = sourceForResource( + "/semantic-statement-parser/two-revisions/ted@2013-10-21.yang"); - private static final YangStatementSourceImpl IETF_TYPES = new YangStatementSourceImpl( - "/ietf/ietf-inet-types@2010-09-24.yang", false); + private static final StatementStreamSource IETF_TYPES = sourceForResource( + "/ietf/ietf-inet-types@2010-09-24.yang"); - private static final YangStatementSourceImpl NETWORK_TOPOLOGY_20130712 = new YangStatementSourceImpl( - "/ietf/network-topology@2013-07-12.yang", false); + private static final StatementStreamSource NETWORK_TOPOLOGY_20130712 = sourceForResource( + "/ietf/network-topology@2013-07-12.yang"); - private static final YangStatementSourceImpl NETWORK_TOPOLOGY_20131021 = new YangStatementSourceImpl( - "/ietf/network-topology@2013-10-21.yang", false); + private static final StatementStreamSource NETWORK_TOPOLOGY_20131021 = sourceForResource( + "/ietf/network-topology@2013-10-21.yang"); - private static final YangStatementSourceImpl ISIS_20130712 = new YangStatementSourceImpl( - "/semantic-statement-parser/two-revisions/isis-topology@2013-07-12.yang", - false); + private static final StatementStreamSource ISIS_20130712 = sourceForResource( + "/semantic-statement-parser/two-revisions/isis-topology@2013-07-12.yang"); - private static final YangStatementSourceImpl ISIS_20131021 = new YangStatementSourceImpl( - "/semantic-statement-parser/two-revisions/isis-topology@2013-10-21.yang", - false); + private static final StatementStreamSource ISIS_20131021 = sourceForResource( + "/semantic-statement-parser/two-revisions/isis-topology@2013-10-21.yang"); - private static final YangStatementSourceImpl L3_20130712 = new YangStatementSourceImpl( - "/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-07-12.yang", - false); + private static final StatementStreamSource L3_20130712 = sourceForResource( + "/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-07-12.yang"); - private static final YangStatementSourceImpl L3_20131021 = new YangStatementSourceImpl( - "/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-10-21.yang", - false); + private static final StatementStreamSource L3_20131021 = sourceForResource( + "/semantic-statement-parser/two-revisions/l3-unicast-igp-topology@2013-10-21.yang"); @Test public void readAndParseYangFileTest() throws SourceException, @@ -137,8 +130,7 @@ public class MoreRevisionsTest { } @Test - public void multipleRevisionsTest() throws SourceException, - ReactorException, FileNotFoundException, URISyntaxException { + public void multipleRevisionsTest() throws Exception { for (int i = 0; i < 100; i++) { SchemaContext context = StmtTestUtils .parseYangSources("/semantic-statement-parser/multiple-revisions"); @@ -147,8 +139,7 @@ public class MoreRevisionsTest { } @Test - public void multipleRevisionsFullTest() throws SourceException, - ReactorException, FileNotFoundException, URISyntaxException, + public void multipleRevisionsFullTest() throws Exception, ParseException { for (int i = 0; i < 100; i++) { SchemaContext context = StmtTestUtils @@ -159,8 +150,7 @@ public class MoreRevisionsTest { } } - private static void checkContentFullTest(final SchemaContext context) throws ParseException, - URISyntaxException { + private static void checkContentFullTest(final SchemaContext context) throws ParseException, URISyntaxException { String yangTypesNSStr = "urn:ietf:params:xml:ns:yang:ietf-yang-types"; URI yangTypesNS = new URI(yangTypesNSStr); @@ -248,12 +238,10 @@ public class MoreRevisionsTest { } @Test - public void multipleRevisionsSimpleTest() throws SourceException, - ReactorException, FileNotFoundException, URISyntaxException, - ParseException { + public void multipleRevisionsSimpleTest() throws Exception { for (int i = 0; i < 1000; i++) { - SchemaContext context = StmtTestUtils - .parseYangSources("/semantic-statement-parser/multiple-revisions/simple"); + SchemaContext context = StmtTestUtils.parseYangSources( + "/semantic-statement-parser/multiple-revisions/simple"); assertNotNull(context); assertEquals(5, context.getModules().size()); checkContentSimpleTest(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java index f6094cb8a4..9a48f25f56 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/MustAndWhenStmtTest.java @@ -14,6 +14,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Iterator; import java.util.Set; @@ -23,22 +24,20 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.MustDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class MustAndWhenStmtTest { - private static final YangStatementSourceImpl MUST_MODULE = new YangStatementSourceImpl - ("/must-when-stmt-test/must-test.yang", false); - private static final YangStatementSourceImpl WHEN_MODULE = new YangStatementSourceImpl("/must-when-stmt-test/" + - "when-test.yang", false); + private static final StatementStreamSource MUST_MODULE = sourceForResource("/must-when-stmt-test/must-test.yang"); + private static final StatementStreamSource WHEN_MODULE = sourceForResource("/must-when-stmt-test/when-test.yang"); @Test public void mustStmtTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, MUST_MODULE); + reactor.addSources(MUST_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -71,7 +70,7 @@ public class MustAndWhenStmtTest { @Test public void whenStmtTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, WHEN_MODULE); + reactor.addSources(WHEN_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java index 430d13ddc1..cdfbe170ae 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/NotificationStmtTest.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Set; import org.junit.Test; @@ -19,22 +20,20 @@ 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.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class NotificationStmtTest { - private static final YangStatementSourceImpl NOTIFICATION_MODULE = new YangStatementSourceImpl("/model/baz.yang", - false); - private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl("/model/bar.yang", - false); + private static final StatementStreamSource NOTIFICATION_MODULE = sourceForResource("/model/baz.yang"); + private static final StatementStreamSource IMPORTED_MODULE = sourceForResource("/model/bar.yang"); @Test public void notificationTest() throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, NOTIFICATION_MODULE, IMPORTED_MODULE); + reactor.addSources(NOTIFICATION_MODULE, IMPORTED_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java index 5f0b36d3b9..bd44ddb545 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/OrderingTest.java @@ -11,7 +11,6 @@ import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import java.net.URISyntaxException; import java.util.Collection; import java.util.Set; import org.junit.Test; @@ -22,16 +21,12 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; import org.opendaylight.yangtools.yang.model.api.GroupingDefinition; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class OrderingTest { @Test - public void testOrderingTypedef() throws URISyntaxException, - SourceException, ReactorException { - final Set modules = TestUtils.loadModules(getClass().getResource( - "/model").toURI()); + public void testOrderingTypedef() throws Exception { + final Set modules = TestUtils.loadModules(getClass().getResource("/model").toURI()); final Module bar = TestUtils.findModule(modules, "bar"); final Set> typedefs = bar.getTypeDefinitions(); final String[] expectedOrder = new String[] { "int32-ext1", "int32-ext2", @@ -49,10 +44,8 @@ public class OrderingTest { } @Test - public void testOrderingChildNodes() throws URISyntaxException, - SourceException, ReactorException { - final Set modules = TestUtils.loadModules(getClass().getResource( - "/model").toURI()); + public void testOrderingChildNodes() throws Exception { + final Set modules = TestUtils.loadModules(getClass().getResource("/model").toURI()); final Module foo = TestUtils.findModule(modules, "foo"); AugmentationSchema augment1 = null; for (final AugmentationSchema as : foo.getAugmentations()) { @@ -77,10 +70,8 @@ public class OrderingTest { } @Test - public void testOrderingNestedChildNodes1() throws URISyntaxException, - SourceException, ReactorException { - final Set modules = TestUtils.loadModules(getClass().getResource( - "/model").toURI()); + public void testOrderingNestedChildNodes1() throws Exception { + final Set modules = TestUtils.loadModules(getClass().getResource("/model").toURI()); final Module foo = TestUtils.findModule(modules, "foo"); final Collection childNodes = foo.getChildNodes(); @@ -104,10 +95,8 @@ public class OrderingTest { } @Test - public void testOrderingNestedChildNodes2() throws URISyntaxException, - SourceException, ReactorException { - final Set modules = TestUtils.loadModules(getClass().getResource( - "/model").toURI()); + public void testOrderingNestedChildNodes2() throws Exception { + final Set modules = TestUtils.loadModules(getClass().getResource("/model").toURI()); final Module baz = TestUtils.findModule(modules, "baz"); final Set groupings = baz.getGroupings(); assertEquals(1, groupings.size()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java index 01b565ce79..85e09a6fe2 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/RpcStmtTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.text.ParseException; import java.util.Set; @@ -24,23 +25,21 @@ import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.RpcDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class RpcStmtTest { - private static final YangStatementSourceImpl RPC_MODULE = new YangStatementSourceImpl("/model/baz.yang", false); - private static final YangStatementSourceImpl IMPORTED_MODULE = new YangStatementSourceImpl("/model/bar.yang", - false); - private static final YangStatementSourceImpl FOO_MODULE = new YangStatementSourceImpl("/rpc-stmt-test/foo.yang", - false); + private static final StatementStreamSource RPC_MODULE = sourceForResource("/model/baz.yang"); + private static final StatementStreamSource IMPORTED_MODULE = sourceForResource("/model/bar.yang"); + private static final StatementStreamSource FOO_MODULE = sourceForResource("/rpc-stmt-test/foo.yang"); @Test public void rpcTest() throws ReactorException, ParseException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, RPC_MODULE, IMPORTED_MODULE, FOO_MODULE); + reactor.addSources(RPC_MODULE, IMPORTED_MODULE, FOO_MODULE); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java index fac0e811e2..c9dca5f858 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/StmtTestUtils.java @@ -11,9 +11,11 @@ package org.opendaylight.yangtools.yang.stmt; import java.io.File; import java.io.FileFilter; import java.io.FileNotFoundException; +import java.io.IOException; import java.net.URISyntaxException; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collection; import java.util.List; import java.util.Set; @@ -24,13 +26,15 @@ import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; 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.parser.api.YangSyntaxErrorException; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; +import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YangStatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YinStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream; import org.slf4j.Logger; @@ -69,9 +73,11 @@ public class StmtTestUtils { return result; } - public static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final YangStatementSourceImpl... sources) { - for (final YangStatementSourceImpl source : sources) { - reactor.addSource(source); + public static StatementStreamSource sourceForResource(final String resourceName) { + try { + return YangStatementStreamSource.create(YangTextSchemaSource.forResource(resourceName)); + } catch (IOException | YangSyntaxErrorException e) { + throw new IllegalArgumentException("Failed to create source", e); } } @@ -99,60 +105,67 @@ public class StmtTestUtils { return parseYangSources(StatementParserMode.DEFAULT_MODE, null, sources); } - public static SchemaContext parseYangSources(final StatementParserMode statementParserMode, final Set supportedFeatures, final StatementStreamSource... sources) + public static SchemaContext parseYangSources(final StatementParserMode statementParserMode, + final Set supportedFeatures, final StatementStreamSource... sources) throws SourceException, ReactorException { + return parseYangSources(statementParserMode, supportedFeatures, Arrays.asList(sources)); + } - final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(statementParserMode, supportedFeatures); + public static SchemaContext parseYangSources(final StatementParserMode statementParserMode, + final Set supportedFeatures, final Collection sources) + throws SourceException, ReactorException { + final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild( + statementParserMode, supportedFeatures); reactor.addSources(sources); return reactor.buildEffective(); } public static SchemaContext parseYangSources(final File... files) throws SourceException, ReactorException, - FileNotFoundException { + IOException, YangSyntaxErrorException { return parseYangSources(StatementParserMode.DEFAULT_MODE, null, files); } - public static SchemaContext parseYangSources(final StatementParserMode statementParserMode, final Set supportedFeatures, final File... files) throws SourceException, - ReactorException, FileNotFoundException { - - final StatementStreamSource[] sources = new StatementStreamSource[files.length]; + public static SchemaContext parseYangSources(final StatementParserMode statementParserMode, + final Set supportedFeatures, final File... files) throws SourceException, + ReactorException, IOException, YangSyntaxErrorException { - for (int i = 0; i < files.length; i++) { - sources[i] = new YangStatementSourceImpl(new NamedFileInputStream(files[i], files[i].getPath())); + final Collection sources = new ArrayList<>(files.length); + for (File file : files) { + sources.add(YangStatementStreamSource.create(YangTextSchemaSource.forFile(file))); } return parseYangSources(statementParserMode, supportedFeatures, sources); } public static SchemaContext parseYangSources(final Collection files) throws SourceException, ReactorException, - FileNotFoundException { + IOException, YangSyntaxErrorException { return parseYangSources(files, StatementParserMode.DEFAULT_MODE); } public static SchemaContext parseYangSources(final Collection files, final StatementParserMode statementParserMode) - throws SourceException, ReactorException, FileNotFoundException { + throws SourceException, ReactorException, IOException, YangSyntaxErrorException { return parseYangSources(statementParserMode, null, files.toArray(new File[files.size()])); } public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath) throws SourceException, - ReactorException, FileNotFoundException, URISyntaxException { + ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { return parseYangSources(yangSourcesDirectoryPath, StatementParserMode.DEFAULT_MODE); } public static SchemaContext parseYangSource(final String yangSourcePath) throws SourceException, ReactorException, - FileNotFoundException, URISyntaxException { + URISyntaxException, IOException, YangSyntaxErrorException { return parseYangSource(yangSourcePath, StatementParserMode.DEFAULT_MODE, null); } public static SchemaContext parseYangSource(final String yangSourcePath, final Set supportedFeatures) - throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + throws SourceException, ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { return parseYangSource(yangSourcePath, StatementParserMode.DEFAULT_MODE, supportedFeatures); } public static SchemaContext parseYangSource(final String yangSourcePath, final StatementParserMode statementParserMode, final Set supportedFeatures) - throws SourceException, ReactorException, FileNotFoundException, URISyntaxException { + throws SourceException, ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { final URL source = StmtTestUtils.class.getResource(yangSourcePath); final File sourceFile = new File(source.toURI()); return parseYangSources(statementParserMode, supportedFeatures, sourceFile); @@ -160,13 +173,13 @@ public class StmtTestUtils { public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath, final StatementParserMode statementParserMode) throws SourceException, ReactorException, - FileNotFoundException, URISyntaxException { + URISyntaxException, IOException, YangSyntaxErrorException { return parseYangSources(yangSourcesDirectoryPath, null, statementParserMode); } public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath, final Set supportedFeatures, final StatementParserMode statementParserMode) throws SourceException, - ReactorException, FileNotFoundException, URISyntaxException { + ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { final URL resourceDir = StmtTestUtils.class.getResource(yangSourcesDirectoryPath); final File testSourcesDir = new File(resourceDir.toURI()); @@ -183,8 +196,8 @@ public class StmtTestUtils { return parseYinSources(statementParserMode, testSourcesDir.listFiles(YIN_FILE_FILTER)); } - public static SchemaContext parseYinSources(final StatementParserMode statementParserMode, final File... files) throws SourceException, - ReactorException, FileNotFoundException { + public static SchemaContext parseYinSources(final StatementParserMode statementParserMode, final File... files) + throws SourceException, ReactorException, FileNotFoundException { final StatementStreamSource[] sources = new StatementStreamSource[files.length]; @@ -220,13 +233,13 @@ public class StmtTestUtils { } public static SchemaContext parseYangSources(final String yangFilesDirectoryPath, final String yangLibsDirectoryPath) - throws URISyntaxException, FileNotFoundException, ReactorException { + throws URISyntaxException, ReactorException, IOException, YangSyntaxErrorException { return parseYangSources(yangFilesDirectoryPath, yangLibsDirectoryPath, null); } public static SchemaContext parseYangSources(final String yangFilesDirectoryPath, final String yangLibsDirectoryPath, final Set supportedFeatures) throws URISyntaxException, - FileNotFoundException, ReactorException { + ReactorException, IOException, YangSyntaxErrorException { final File yangsDir = new File(StmtTestUtils.class.getResource(yangFilesDirectoryPath).toURI()); final File libsDir = new File(StmtTestUtils.class.getResource(yangLibsDirectoryPath).toURI()); @@ -234,22 +247,22 @@ public class StmtTestUtils { supportedFeatures); } - public static SchemaContext parseYangSources(final File[] yangFiles, final File[] libFiles, - final Set supportedFeatures) throws FileNotFoundException, ReactorException { + private static SchemaContext parseYangSources(final File[] yangFiles, final File[] libFiles, + final Set supportedFeatures) throws ReactorException, IOException, YangSyntaxErrorException { final StatementStreamSource[] yangSources = new StatementStreamSource[yangFiles.length]; for (int i = 0; i < yangFiles.length; i++) { - yangSources[i] = new YangStatementSourceImpl(new NamedFileInputStream(yangFiles[i], yangFiles[i].getPath())); + yangSources[i] = YangStatementStreamSource.create(YangTextSchemaSource.forFile(yangFiles[i])); } final StatementStreamSource[] libSources = new StatementStreamSource[libFiles.length]; for (int i = 0; i < libFiles.length; i++) { - libSources[i] = new YangStatementSourceImpl(new NamedFileInputStream(libFiles[i], libFiles[i].getPath())); + libSources[i] = YangStatementStreamSource.create(YangTextSchemaSource.forFile(libFiles[i])); } return parseYangSources(yangSources, libSources, supportedFeatures); } - public static SchemaContext parseYangSources(final StatementStreamSource[] yangSources, + private static SchemaContext parseYangSources(final StatementStreamSource[] yangSources, final StatementStreamSource[] libSources, final Set supportedFeatures) throws ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java index b4a2417718..9beb2b9e29 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/SubstatementValidatorTest.java @@ -16,7 +16,6 @@ import static org.junit.Assert.fail; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import java.io.UnsupportedEncodingException; -import java.net.URISyntaxException; import java.util.Set; import org.junit.After; import org.junit.Before; @@ -31,7 +30,6 @@ public class SubstatementValidatorTest { private final PrintStream stdout = System.out; private final ByteArrayOutputStream output = new ByteArrayOutputStream(); - private String testLog; @Rule public ExpectedException expectedEx = ExpectedException.none(); @@ -47,14 +45,14 @@ public class SubstatementValidatorTest { } @Test - public void noException() throws URISyntaxException, ReactorException { + public void noException() throws Exception { final Set modules = TestUtils.loadModules(getClass().getResource("/augment-test/augment-in-augment") .toURI()); assertNotNull(modules); } @Test - public void undesirableElementException() throws URISyntaxException { + public void undesirableElementException() throws Exception { try { TestUtils.loadModules(getClass().getResource("/substatement-validator/undesirable-element").toURI()); fail("Unexpected success"); @@ -65,7 +63,7 @@ public class SubstatementValidatorTest { } @Test - public void maximalElementCountException() throws URISyntaxException, ReactorException { + public void maximalElementCountException() throws Exception { try { TestUtils.loadModules(getClass().getResource("/substatement-validator/maximal-element").toURI()); fail("Unexpected success"); @@ -76,21 +74,21 @@ public class SubstatementValidatorTest { } @Test - public void missingElementException() throws URISyntaxException, ReactorException { + public void missingElementException() throws Exception { expectedEx.expect(SomeModifiersUnresolvedException.class); TestUtils.loadModules(getClass().getResource("/substatement-validator/missing-element").toURI()); } @Test - public void bug6173Test() throws ReactorException, URISyntaxException { + public void bug6173Test() throws Exception { final Set loadModules = TestUtils.loadModules(getClass().getResource( "/substatement-validator/empty-element").toURI()); assertEquals(1, loadModules.size()); } @Test - public void bug4310test() throws URISyntaxException, ReactorException { + public void bug4310test() throws Exception { expectedEx.expect(SomeModifiersUnresolvedException.class); TestUtils.loadModules(getClass().getResource("/substatement-validator/bug-4310").toURI()); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java index 74e80301b6..8506d1dc55 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java @@ -10,7 +10,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import java.io.File; -import java.io.FileNotFoundException; +import java.io.IOException; import java.io.InputStream; import java.net.URI; import java.net.URISyntaxException; @@ -24,6 +24,7 @@ import java.util.Date; import java.util.List; import java.util.Set; import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.YangConstants; import org.opendaylight.yangtools.yang.model.api.ChoiceCaseNode; import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; @@ -34,6 +35,9 @@ import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; +import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; +import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YangStatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; @@ -42,7 +46,6 @@ import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YinStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; -import org.opendaylight.yangtools.yang.parser.util.NamedFileInputStream; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -53,14 +56,14 @@ public final class TestUtils { } public static Set loadModules(final URI resourceDirectory) - throws SourceException, ReactorException { + throws SourceException, ReactorException, IOException, YangSyntaxErrorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); File[] files = new File(resourceDirectory).listFiles(); for (File file : files) { - if (file.getName().endsWith(".yang")) { - addSources(reactor, new YangStatementSourceImpl(file.getPath(), true)); + if (file.getName().endsWith(YangConstants.RFC6020_YANG_FILE_EXTENSION)) { + reactor.addSource(YangStatementStreamSource.create(YangTextSchemaSource.forFile(file))); } else { LOG.info("Ignoring non-yang file {}", file); } @@ -75,7 +78,7 @@ public final class TestUtils { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); for (InputStream inputStream : streams) { - addSources(reactor, new YangStatementSourceImpl(inputStream)); + reactor.addSource(new YangStatementSourceImpl(inputStream)); } EffectiveSchemaContext ctx = reactor.buildEffective(); @@ -86,7 +89,7 @@ public final class TestUtils { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); for (File file : new File(resourceDirectory).listFiles()) { - addYinSources(reactor, new YinStatementSourceImpl(file.getPath(), true)); + reactor.addSource(new YinStatementSourceImpl(file.getPath(), true)); } EffectiveSchemaContext ctx = reactor.buildEffective(); @@ -96,7 +99,7 @@ public final class TestUtils { public static Set loadYinModules(final List streams) throws SourceException, ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); for (InputStream inputStream : streams) { - addYinSources(reactor, new YinStatementSourceImpl(inputStream)); + reactor.addSource(new YinStatementSourceImpl(inputStream)); } EffectiveSchemaContext ctx = reactor.buildEffective(); @@ -107,14 +110,14 @@ public final class TestUtils { throws SourceException, ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR .newBuild(); - addSources(reactor, new YangStatementSourceImpl(stream)); + reactor.addSource(new YangStatementSourceImpl(stream)); EffectiveSchemaContext ctx = reactor.buildEffective(); return ctx.getModules().iterator().next(); } public static Module loadYinModule(final InputStream stream) throws SourceException, ReactorException { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addYinSources(reactor, new YinStatementSourceImpl(stream)); + reactor.addSources(new YinStatementSourceImpl(stream)); EffectiveSchemaContext ctx = reactor.buildEffective(); return ctx.getModules().iterator().next(); } @@ -232,8 +235,7 @@ public final class TestUtils { } } - public static List findModules(final Set modules, - final String moduleName) { + public static List findModules(final Set modules, final String moduleName) { List result = new ArrayList<>(); for (Module module : modules) { if (module.getName().equals(moduleName)) { @@ -243,16 +245,7 @@ public final class TestUtils { return result; } - private static void addSources( - final CrossSourceStatementReactor.BuildAction reactor, - final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } - - public static SchemaContext parseYangSources( - final StatementStreamSource... sources) throws SourceException, + public static SchemaContext parseYangSources(final StatementStreamSource... sources) throws SourceException, ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR @@ -263,25 +256,24 @@ public final class TestUtils { } public static SchemaContext parseYangSources(final File... files) - throws SourceException, ReactorException, FileNotFoundException { + throws SourceException, ReactorException, IOException, YangSyntaxErrorException { StatementStreamSource[] sources = new StatementStreamSource[files.length]; for (int i = 0; i < files.length; i++) { - sources[i] = new YangStatementSourceImpl(new NamedFileInputStream(files[i], files[i].getPath())); + sources[i] = YangStatementStreamSource.create(YangTextSchemaSource.forFile(files[i])); } return parseYangSources(sources); } public static SchemaContext parseYangSources(final Collection files) - throws SourceException, ReactorException, FileNotFoundException { + throws SourceException, ReactorException, IOException, YangSyntaxErrorException { return parseYangSources(files.toArray(new File[files.size()])); } public static SchemaContext parseYangSources(final String yangSourcesDirectoryPath) - throws SourceException, ReactorException, FileNotFoundException, - URISyntaxException { + throws SourceException, ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { URL resourceDir = StmtTestUtils.class .getResource(yangSourcesDirectoryPath); @@ -291,21 +283,11 @@ public final class TestUtils { } public static SchemaContext parseYangSource(final String yangSourceFilePath) - throws SourceException, ReactorException, FileNotFoundException, - URISyntaxException { + throws SourceException, ReactorException, URISyntaxException, IOException, YangSyntaxErrorException { - URL resourceFile = StmtTestUtils.class - .getResource(yangSourceFilePath); + URL resourceFile = StmtTestUtils.class.getResource(yangSourceFilePath); File testSourcesFile = new File(resourceFile.toURI()); return parseYangSources(testSourcesFile); } - - private static void addYinSources(final CrossSourceStatementReactor.BuildAction reactor, - final YinStatementSourceImpl... sources) { - for (YinStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } - } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java index fcba8ac3b2..905b22125f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefConstraintsTest.java @@ -13,9 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; import java.math.BigDecimal; -import java.net.URISyntaxException; import java.util.List; import java.util.Set; import org.junit.Test; @@ -26,17 +24,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.DecimalTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.RangeConstraint; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.TypeUtils; public class TypedefConstraintsTest { @Test - public void decimalRangeConstraintsTest() throws SourceException, - FileNotFoundException, ReactorException, URISyntaxException { - final SchemaContext context = StmtTestUtils - .parseYangSources("/stmt-test/constraints"); + public void decimalRangeConstraintsTest() throws Exception { + final SchemaContext context = StmtTestUtils.parseYangSources("/stmt-test/constraints"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java index 075a3846cc..677eccbf0c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypedefSubStmtsTest.java @@ -10,25 +10,26 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; +import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class TypedefSubStmtsTest { - private static final YangStatementSourceImpl FOOBAR = new YangStatementSourceImpl - ("/typedef-substmts-test/typedef-substmts-test.yang", false); + private static final StatementStreamSource FOOBAR = sourceForResource( + "/typedef-substmts-test/typedef-substmts-test.yang"); @Test public void typedefSubStmtsTest() throws ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - StmtTestUtils.addSources(reactor, FOOBAR); + reactor.addSources(FOOBAR); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java index 76fe1e4dc7..63914f5add 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/TypesResolutionTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.net.URI; import java.util.List; @@ -41,7 +42,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class TypesResolutionTest { @@ -49,14 +49,10 @@ public class TypesResolutionTest { @Before public void init() throws Exception { - final StatementStreamSource yangFile = - new YangStatementSourceImpl("/types/custom-types-test@2012-4-4.yang", false); - final StatementStreamSource yangFileDependency1 = - new YangStatementSourceImpl ("/ietf/iana-timezones@2012-07-09.yang", false); - final StatementStreamSource yangFileDependency2 = - new YangStatementSourceImpl ("/ietf/ietf-inet-types@2010-09-24.yang", false); - final StatementStreamSource yangFileDependency3 = - new YangStatementSourceImpl ("/ietf/ietf-yang-types@2010-09-24.yang", false); + final StatementStreamSource yangFile = sourceForResource("/types/custom-types-test@2012-4-4.yang"); + final StatementStreamSource yangFileDependency1 = sourceForResource("/ietf/iana-timezones@2012-07-09.yang"); + final StatementStreamSource yangFileDependency2 = sourceForResource("/ietf/ietf-inet-types@2010-09-24.yang"); + final StatementStreamSource yangFileDependency3 = sourceForResource("/ietf/ietf-yang-types@2010-09-24.yang"); testedModules = TestUtils.parseYangSources(yangFile, yangFileDependency1, yangFileDependency2, yangFileDependency3).getModules(); @@ -353,15 +349,12 @@ public class TypesResolutionTest { @Test public void testUnionWithExt() throws ReactorException { - final YangStatementSourceImpl yangFile1 = new YangStatementSourceImpl("/types/union-with-ext/extdef.yang", - false); - final YangStatementSourceImpl yangFile2 = new YangStatementSourceImpl("/types/union-with-ext/unionbug.yang", - false); - final YangStatementSourceImpl yangFile3 = new YangStatementSourceImpl("/ietf/ietf-inet-types@2010-09-24.yang", - false); + final StatementStreamSource yangFile1 = sourceForResource("/types/union-with-ext/extdef.yang"); + final StatementStreamSource yangFile2 = sourceForResource("/types/union-with-ext/unionbug.yang"); + final StatementStreamSource yangFile3 = sourceForResource("/ietf/ietf-inet-types@2010-09-24.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile1, yangFile2, yangFile3); + reactor.addSources(yangFile1, yangFile2, yangFile3); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -370,11 +363,10 @@ public class TypesResolutionTest { @Test public void testUnionWithBits() throws ReactorException { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/types/union-with-bits/union-bits-model.yang", false); + final StatementStreamSource yangFile = sourceForResource("/types/union-with-bits/union-bits-model.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -382,11 +374,10 @@ public class TypesResolutionTest { @Test public void testUnionInList() { - final YangStatementSourceImpl yangFile = new YangStatementSourceImpl( - "/types/union-in-list/unioninlisttest.yang", false); + final StatementStreamSource yangFile = sourceForResource("/types/union-in-list/unioninlisttest.yang"); CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile); + reactor.addSources(yangFile); try { final EffectiveSchemaContext result = reactor.buildEffective(); @@ -397,10 +388,4 @@ public class TypesResolutionTest { assertTrue(e.getCause().getMessage().startsWith("union is not a YANG statement or use of extension")); } } - - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final YangStatementSourceImpl... sources) { - for (YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java index 4f21d2fb96..21f472fa7f 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/UsesAugmentTest.java @@ -14,7 +14,6 @@ import static org.junit.Assert.assertTrue; import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -38,8 +37,6 @@ import org.opendaylight.yangtools.yang.model.api.TypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnionTypeDefinition; import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinition; import org.opendaylight.yangtools.yang.model.util.type.BaseTypes; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; public class UsesAugmentTest { private static final URI UG_NS = URI.create("urn:opendaylight:params:xml:ns:yang:uses-grouping"); @@ -643,7 +640,7 @@ public class UsesAugmentTest { } @Test - public void testTypedefs() throws URISyntaxException, SourceException, ReactorException { + public void testTypedefs() throws Exception { modules = TestUtils.loadModules(getClass().getResource("/grouping-test").toURI()); final Module testModule = TestUtils.findModule(modules, "grouping-definitions"); final Set> types = testModule.getTypeDefinitions(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java index 9cf23810b5..3280abd40e 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangFileStmtTest.java @@ -8,6 +8,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; @@ -16,35 +17,37 @@ import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.reactor.EffectiveModelContext; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class YangFileStmtTest { //basic statements to parse and write - private static final YangStatementSourceImpl YANGFILE = new YangStatementSourceImpl("/semantic-statement-parser/test.yang", false); - private static final YangStatementSourceImpl IMPORTEDYANGFILE = new YangStatementSourceImpl("/semantic-statement-parser/importedtest.yang", false); - private static final YangStatementSourceImpl SIMPLENODES = new YangStatementSourceImpl("/semantic-statement-parser/simple-nodes-semantic.yang", false); - private static final YangStatementSourceImpl FOOBAR = new YangStatementSourceImpl("/semantic-statement-parser/foobar.yang", false); + private static final StatementStreamSource YANGFILE = sourceForResource("/semantic-statement-parser/test.yang"); + private static final StatementStreamSource IMPORTEDYANGFILE = sourceForResource( + "/semantic-statement-parser/importedtest.yang"); + private static final StatementStreamSource SIMPLENODES = sourceForResource( + "/semantic-statement-parser/simple-nodes-semantic.yang"); + private static final StatementStreamSource FOOBAR = sourceForResource("/semantic-statement-parser/foobar.yang"); //extension statement to parse and write - private static final YangStatementSourceImpl EXTFILE = new YangStatementSourceImpl("/semantic-statement-parser/ext-typedef.yang", false); - private static final YangStatementSourceImpl EXTUSE = new YangStatementSourceImpl("/semantic-statement-parser/ext-use.yang", false); + private static final StatementStreamSource EXTFILE = sourceForResource( + "/semantic-statement-parser/ext-typedef.yang"); + private static final StatementStreamSource EXTUSE = sourceForResource("/semantic-statement-parser/ext-use.yang"); - private static final YangStatementSourceImpl BAR = new YangStatementSourceImpl("/model-new/bar.yang", false); - private static final YangStatementSourceImpl BAZ = new YangStatementSourceImpl("/model-new/baz.yang", false); - private static final YangStatementSourceImpl FOO = new YangStatementSourceImpl("/model-new/foo.yang", false); - private static final YangStatementSourceImpl SUBFOO = new YangStatementSourceImpl("/model-new/subfoo.yang", false); + private static final StatementStreamSource BAR = sourceForResource("/model-new/bar.yang"); + private static final StatementStreamSource BAZ = sourceForResource("/model-new/baz.yang"); + private static final StatementStreamSource FOO = sourceForResource("/model-new/foo.yang"); + private static final StatementStreamSource SUBFOO = sourceForResource("/model-new/subfoo.yang"); - private static final YangStatementSourceImpl BAR2 = new YangStatementSourceImpl("/model/bar.yang",false); - private static final YangStatementSourceImpl BAZ2 = new YangStatementSourceImpl("/model/baz.yang",false); - private static final YangStatementSourceImpl FOO2 = new YangStatementSourceImpl("/model/foo.yang",false); - private static final YangStatementSourceImpl SUBFOO2 = new YangStatementSourceImpl("/model/subfoo.yang",false); + private static final StatementStreamSource BAR2 = sourceForResource("/model/bar.yang"); + private static final StatementStreamSource BAZ2 = sourceForResource("/model/baz.yang"); + private static final StatementStreamSource FOO2 = sourceForResource("/model/foo.yang"); + private static final StatementStreamSource SUBFOO2 = sourceForResource("/model/subfoo.yang"); @Test public void readAndParseYangFileTestModel() throws SourceException, ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, BAZ,FOO,BAR,SUBFOO); + reactor.addSources(BAZ,FOO,BAR,SUBFOO); EffectiveModelContext result = reactor.build(); assertNotNull(result); } @@ -53,7 +56,7 @@ public class YangFileStmtTest { public void readAndParseYangFileTestModel2() throws SourceException, ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, BAZ2,FOO2,BAR2,SUBFOO2); + reactor.addSources(BAZ2,FOO2,BAR2,SUBFOO2); EffectiveModelContext result = reactor.build(); assertNotNull(result); } @@ -61,15 +64,9 @@ public class YangFileStmtTest { @Test public void readAndParseYangFileTest() throws SourceException, ReactorException { CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, YANGFILE, SIMPLENODES, IMPORTEDYANGFILE, FOOBAR); - addSources(reactor, EXTFILE, EXTUSE); + reactor.addSources(YANGFILE, SIMPLENODES, IMPORTEDYANGFILE, FOOBAR); + reactor.addSources(EXTFILE, EXTUSE); EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); } - - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final StatementStreamSource... sources) { - for (StatementStreamSource source : sources) { - reactor.addSource(source); - } - } } \ No newline at end of file diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java index 17899d1aa7..a432b85a3b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserIdentityTest.java @@ -10,6 +10,7 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; + import java.io.File; import java.io.FileNotFoundException; import java.io.InputStream; @@ -26,8 +27,7 @@ public class YangParserIdentityTest { // base identity name equals identity name @Test(expected = SomeModifiersUnresolvedException.class) - public void testParsingIdentityTestModule() throws URISyntaxException, - ReactorException, FileNotFoundException { + public void testParsingIdentityTestModule() throws URISyntaxException, ReactorException, FileNotFoundException { File yang = new File(getClass().getResource("/identity/identitytest.yang").toURI()); InputStream stream = new NamedFileInputStream(yang, yang.getPath()); try { @@ -55,8 +55,7 @@ public class YangParserIdentityTest { // imported module prefixed base identity name equals identity name, but // prefix differs @Test - public void testParsingImportPrefixIdentityTestModule() throws URISyntaxException, - ReactorException { + public void testParsingImportPrefixIdentityTestModule() throws Exception { Set modules = TestUtils.loadModules(getClass().getResource("/identity/import").toURI()); Module module = TestUtils.findModule(modules, "prefiximportidentitytest"); Set imports = module.getImports(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java index d7189d0089..2a9754d59b 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserTest.java @@ -13,6 +13,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.io.File; import java.io.IOException; @@ -67,7 +68,6 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; import org.opendaylight.yangtools.yang.parser.util.YangParseException; @@ -804,9 +804,8 @@ public class YangParserTest { @Test public void unknownStatementInSubmoduleHeaderTest() throws IOException, URISyntaxException, ReactorException { - final StatementStreamSource yang1 = new YangStatementSourceImpl("/yang-grammar-test/revisions-extension.yang", false); - final StatementStreamSource yang2 = new YangStatementSourceImpl("/yang-grammar-test/submodule-header-extension.yang", - false); + final StatementStreamSource yang1 = sourceForResource("/yang-grammar-test/revisions-extension.yang"); + final StatementStreamSource yang2 = sourceForResource("/yang-grammar-test/submodule-header-extension.yang"); try { TestUtils.parseYangSources(yang1, yang2); @@ -820,13 +819,12 @@ public class YangParserTest { @Test public void unknownStatementBetweenRevisionsTest() throws ReactorException { - final YangStatementSourceImpl yangModule = new YangStatementSourceImpl( - "/yang-grammar-test/revisions-extension.yang", false); - final YangStatementSourceImpl yangSubmodule = new YangStatementSourceImpl( - "/yang-grammar-test/submodule-header-extension.yang", false); + final StatementStreamSource yangModule = sourceForResource("/yang-grammar-test/revisions-extension.yang"); + final StatementStreamSource yangSubmodule = sourceForResource( + "/yang-grammar-test/submodule-header-extension.yang"); final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangModule, yangSubmodule); + reactor.addSources(yangModule, yangSubmodule); final EffectiveSchemaContext result = reactor.buildEffective(); assertNotNull(result); @@ -835,15 +833,15 @@ public class YangParserTest { @Test public void unknownStatementsInStatementsTest() throws ReactorException { - final YangStatementSourceImpl yangFile1 = new YangStatementSourceImpl( - "/yang-grammar-test/stmtsep-in-statements.yang", false); - final YangStatementSourceImpl yangFile2 = new YangStatementSourceImpl( - "/yang-grammar-test/stmtsep-in-statements2.yang", false); - final YangStatementSourceImpl yangFile3 = new YangStatementSourceImpl( - "/yang-grammar-test/stmtsep-in-statements-sub.yang", false); + final StatementStreamSource yangFile1 = sourceForResource( + "/yang-grammar-test/stmtsep-in-statements.yang"); + final StatementStreamSource yangFile2 = sourceForResource( + "/yang-grammar-test/stmtsep-in-statements2.yang"); + final StatementStreamSource yangFile3 = sourceForResource( + "/yang-grammar-test/stmtsep-in-statements-sub.yang"); final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - addSources(reactor, yangFile1, yangFile2, yangFile3); + reactor.addSources(yangFile1, yangFile2, yangFile3); // TODO: change test or create new module in order to respect new statement parser validations try { final EffectiveSchemaContext result = reactor.buildEffective(); @@ -854,9 +852,4 @@ public class YangParserTest { } } - private static void addSources(final CrossSourceStatementReactor.BuildAction reactor, final YangStatementSourceImpl... sources) { - for (final YangStatementSourceImpl source : sources) { - reactor.addSource(source); - } - } } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java index 1ef5203b20..6f65908263 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangParserWithContextTest.java @@ -11,6 +11,7 @@ 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 static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; import java.net.URI; import java.text.DateFormat; @@ -47,7 +48,6 @@ import org.opendaylight.yangtools.yang.model.api.type.UnsignedIntegerTypeDefinit import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; public class YangParserWithContextTest { private static final URI T1_NS = URI.create("urn:simple.demo.test1"); @@ -56,19 +56,19 @@ public class YangParserWithContextTest { private final DateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); private static Date rev; - private static final YangStatementSourceImpl BAR = new YangStatementSourceImpl("/model/bar.yang", false); - private static final YangStatementSourceImpl BAZ = new YangStatementSourceImpl("/model/baz.yang", false); - private static final YangStatementSourceImpl FOO = new YangStatementSourceImpl("/model/foo.yang", false); - private static final YangStatementSourceImpl SUBFOO = new YangStatementSourceImpl("/model/subfoo.yang", false); + private static final StatementStreamSource BAR = sourceForResource("/model/bar.yang"); + private static final StatementStreamSource BAZ = sourceForResource("/model/baz.yang"); + private static final StatementStreamSource FOO = sourceForResource("/model/foo.yang"); + private static final StatementStreamSource SUBFOO = sourceForResource("/model/subfoo.yang"); - private static final YangStatementSourceImpl[] IETF = new YangStatementSourceImpl[] { - new YangStatementSourceImpl("/ietf/iana-afn-safi@2012-06-04.yang", false), - new YangStatementSourceImpl("/ietf/iana-if-type@2012-06-05.yang", false), - new YangStatementSourceImpl("/ietf/iana-timezones@2012-07-09.yang", false), - new YangStatementSourceImpl("/ietf/ietf-inet-types@2010-09-24.yang", false), - new YangStatementSourceImpl("/ietf/ietf-yang-types@2010-09-24.yang", false), - new YangStatementSourceImpl("/ietf/network-topology@2013-07-12.yang", false), - new YangStatementSourceImpl("/ietf/network-topology@2013-10-21.yang", false) }; + private static final StatementStreamSource[] IETF = new StatementStreamSource[] { + sourceForResource("/ietf/iana-afn-safi@2012-06-04.yang"), + sourceForResource("/ietf/iana-if-type@2012-06-05.yang"), + sourceForResource("/ietf/iana-timezones@2012-07-09.yang"), + sourceForResource("/ietf/ietf-inet-types@2010-09-24.yang"), + sourceForResource("/ietf/ietf-yang-types@2010-09-24.yang"), + sourceForResource("/ietf/network-topology@2013-07-12.yang"), + sourceForResource("/ietf/network-topology@2013-10-21.yang") }; @BeforeClass public static void init() throws ParseException { @@ -81,12 +81,11 @@ public class YangParserWithContextTest { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final YangStatementSourceImpl types = new YangStatementSourceImpl("/types/custom-types-test@2012-4-4.yang", - false); - final YangStatementSourceImpl test1 = new YangStatementSourceImpl("/context-test/test1.yang", false); + final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-4-4.yang"); + final StatementStreamSource test1 = sourceForResource("/context-test/test1.yang"); - StmtTestUtils.addSources(reactor, IETF); - StmtTestUtils.addSources(reactor, types, test1); + reactor.addSources(IETF); + reactor.addSources(types, test1); final SchemaContext context = reactor.buildEffective(); @@ -123,8 +122,8 @@ public class YangParserWithContextTest { public void testUsesFromContext() throws Exception { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final YangStatementSourceImpl test2 = new YangStatementSourceImpl("/context-test/test2.yang", false); - StmtTestUtils.addSources(reactor, BAZ, FOO, BAR, SUBFOO, test2); + final StatementStreamSource test2 = sourceForResource("/context-test/test2.yang"); + reactor.addSources(BAZ, FOO, BAR, SUBFOO, test2); final SchemaContext context = reactor.buildEffective(); final Module testModule = context.findModuleByName("test2", @@ -234,8 +233,8 @@ public class YangParserWithContextTest { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final YangStatementSourceImpl test2 = new YangStatementSourceImpl("/context-test/test2.yang", false); - StmtTestUtils.addSources(reactor, BAZ, FOO, BAR, SUBFOO, test2); + final StatementStreamSource test2 = sourceForResource("/context-test/test2.yang"); + reactor.addSources(BAZ, FOO, BAR, SUBFOO, test2); final SchemaContext context = reactor.buildEffective(); final Module module = context.findModuleByName("test2", @@ -310,12 +309,11 @@ public class YangParserWithContextTest { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final YangStatementSourceImpl types = new YangStatementSourceImpl("/types/custom-types-test@2012-4-4.yang", - false); - final YangStatementSourceImpl test3 = new YangStatementSourceImpl("/context-test/test3.yang", false); + final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-4-4.yang"); + final StatementStreamSource test3 = sourceForResource("/context-test/test3.yang"); - StmtTestUtils.addSources(reactor, IETF); - StmtTestUtils.addSources(reactor, types, test3); + reactor.addSources(IETF); + reactor.addSources(types, test3); final SchemaContext context = reactor.buildEffective(); final Module module = context.findModuleByName("test3", @@ -343,12 +341,11 @@ public class YangParserWithContextTest { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final YangStatementSourceImpl types = new YangStatementSourceImpl("/types/custom-types-test@2012-4-4.yang", - false); - final YangStatementSourceImpl test3 = new YangStatementSourceImpl("/context-test/test3.yang", false); + final StatementStreamSource types = sourceForResource("/types/custom-types-test@2012-4-4.yang"); + final StatementStreamSource test3 = sourceForResource("/context-test/test3.yang"); - StmtTestUtils.addSources(reactor, IETF); - StmtTestUtils.addSources(reactor, types, test3); + reactor.addSources(IETF); + reactor.addSources(types, test3); final SchemaContext context = reactor.buildEffective(); @@ -372,10 +369,10 @@ public class YangParserWithContextTest { @Test public void testAugment() throws Exception { - final StatementStreamSource resource = new YangStatementSourceImpl("/context-augment-test/test4.yang", false); - final StatementStreamSource test1 = new YangStatementSourceImpl("/context-augment-test/test1.yang", false); - final StatementStreamSource test2 = new YangStatementSourceImpl("/context-augment-test/test2.yang", false); - final StatementStreamSource test3 = new YangStatementSourceImpl("/context-augment-test/test3.yang", false); + final StatementStreamSource resource = sourceForResource("/context-augment-test/test4.yang"); + final StatementStreamSource test1 = sourceForResource("/context-augment-test/test1.yang"); + final StatementStreamSource test2 = sourceForResource("/context-augment-test/test2.yang"); + final StatementStreamSource test3 = sourceForResource("/context-augment-test/test3.yang"); final SchemaContext context = TestUtils.parseYangSources(resource, test1, test2, test3); final Set modules = context.getModules(); @@ -414,11 +411,10 @@ public class YangParserWithContextTest { final CrossSourceStatementReactor.BuildAction reactor = YangInferencePipeline.RFC6020_REACTOR.newBuild(); - final YangStatementSourceImpl bar = new YangStatementSourceImpl("/model/bar.yang", false); - final YangStatementSourceImpl deviationTest = new YangStatementSourceImpl("/context-test/deviation-test.yang", - false); + final StatementStreamSource bar = sourceForResource("/model/bar.yang"); + final StatementStreamSource deviationTest = sourceForResource("/context-test/deviation-test.yang"); - StmtTestUtils.addSources(reactor, bar, deviationTest); + reactor.addSources(bar, deviationTest); final SchemaContext context = reactor.buildEffective(); final Module testModule = context.findModuleByName("deviation-test", SimpleDateFormatUtil.getRevisionFormat() diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java index 8df1d65a3d..a653275a59 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypes2StmtTest.java @@ -10,6 +10,8 @@ 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.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; + import java.net.URI; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -23,19 +25,16 @@ import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class YangTypes2StmtTest { - private static final YangStatementSourceImpl TYPEFILE1 = new YangStatementSourceImpl( - "/semantic-statement-parser/types2.yang", false); - private static final YangStatementSourceImpl TYPEFILE2 = new YangStatementSourceImpl( - "/semantic-statement-parser/types.yang", false); - private static final YangStatementSourceImpl TYPEFILE3 = new YangStatementSourceImpl( - "/semantic-statement-parser/simple-types.yang", false); - private static final YangStatementSourceImpl TYPEFILE4 = new YangStatementSourceImpl( - "/semantic-statement-parser/identityreftest.yang", false); + private static final StatementStreamSource TYPEFILE1 = sourceForResource("/semantic-statement-parser/types2.yang"); + private static final StatementStreamSource TYPEFILE2 = sourceForResource("/semantic-statement-parser/types.yang"); + private static final StatementStreamSource TYPEFILE3 = sourceForResource( + "/semantic-statement-parser/simple-types.yang"); + private static final StatementStreamSource TYPEFILE4 = sourceForResource( + "/semantic-statement-parser/identityreftest.yang"); private static final QNameModule types2Module = QNameModule.create(URI.create("types2"), SimpleDateFormatUtil.DEFAULT_DATE_REV); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java index 81ed21fdba..611ae6cf12 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/YangTypesStmtTest.java @@ -8,32 +8,29 @@ package org.opendaylight.yangtools.yang.stmt; import static org.junit.Assert.assertNotNull; +import static org.opendaylight.yangtools.yang.stmt.StmtTestUtils.sourceForResource; + import org.junit.Test; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.parser.spi.source.StatementStreamSource; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangInferencePipeline; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class YangTypesStmtTest { - private static final YangStatementSourceImpl TYPEFILE1 = new YangStatementSourceImpl - ("/semantic-statement-parser/types.yang",false); - private static final YangStatementSourceImpl TYPEFILE2 = new YangStatementSourceImpl - ("/semantic-statement-parser/simple-types.yang",false); - private static final YangStatementSourceImpl TYPEFILE3 = new YangStatementSourceImpl - ("/semantic-statement-parser/identityreftest.yang",false); + private static final StatementStreamSource TYPEFILE1 = sourceForResource("/semantic-statement-parser/types.yang"); + private static final StatementStreamSource TYPEFILE2 = sourceForResource( + "/semantic-statement-parser/simple-types.yang"); + private static final StatementStreamSource TYPEFILE3 = sourceForResource( + "/semantic-statement-parser/identityreftest.yang"); - private static final YangStatementSourceImpl FILE1 = new YangStatementSourceImpl - ("/semantic-statement-parser/model/bar.yang",false); - private static final YangStatementSourceImpl FILE2 = new YangStatementSourceImpl - ("/semantic-statement-parser/model/baz.yang",false); - private static final YangStatementSourceImpl FILE3 = new YangStatementSourceImpl - ("/semantic-statement-parser/model/subfoo.yang",false); - private static final YangStatementSourceImpl FILE4 = new YangStatementSourceImpl - ("/semantic-statement-parser/model/foo.yang",false); + private static final StatementStreamSource FILE1 = sourceForResource("/semantic-statement-parser/model/bar.yang"); + private static final StatementStreamSource FILE2 = sourceForResource("/semantic-statement-parser/model/baz.yang"); + private static final StatementStreamSource FILE3 = sourceForResource( + "/semantic-statement-parser/model/subfoo.yang"); + private static final StatementStreamSource FILE4 = sourceForResource("/semantic-statement-parser/model/foo.yang"); @Test public void readAndParseYangFileTest() throws SourceException, ReactorException { 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/semver/SemanticVersionBorderCaseTest.java index 86428b70f3..8c5e2f1130 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/semver/SemanticVersionBorderCaseTest.java @@ -12,23 +12,19 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionBorderCaseTest { @Test - public void borderCaseValidMajorTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void borderCaseValidMajorTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-valid-major", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -44,8 +40,7 @@ public class SemanticVersionBorderCaseTest { } @Test - public void borderCaseValidMinorTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void borderCaseValidMinorTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-valid-minor", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -61,8 +56,7 @@ public class SemanticVersionBorderCaseTest { } @Test - public void borderCaseValidPatchTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void borderCaseValidPatchTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-valid-patch", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -78,8 +72,7 @@ public class SemanticVersionBorderCaseTest { } @Test - public void borderCaseInvalidMajorTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void borderCaseInvalidMajorTest() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-invalid-major", StatementParserMode.SEMVER_MODE); @@ -91,8 +84,7 @@ public class SemanticVersionBorderCaseTest { } @Test - public void borderCaseInvalidMinorTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void borderCaseInvalidMinorTest() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-invalid-minor", StatementParserMode.SEMVER_MODE); @@ -104,8 +96,7 @@ public class SemanticVersionBorderCaseTest { } @Test - public void borderCaseInvalidPatchTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void borderCaseInvalidPatchTest() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/border-case/border-case-invalid-patch", StatementParserMode.SEMVER_MODE); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionComplexTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionComplexTest.java index 6a04bf1fdf..48b6efb80a 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionComplexTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionComplexTest.java @@ -11,10 +11,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; -import java.text.ParseException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.model.api.Module; @@ -22,34 +19,30 @@ import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.model.util.RevisionAwareXPathImpl; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionComplexTest { @Test - public void complexTest1() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, - ParseException { + public void complexTest1() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/complex/complex-1", StatementParserMode.SEMVER_MODE); verifySchemaContextTest1(context); } @Test - public void complexTest1Yang1_1() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, - ParseException { + public void complexTest1Yang1_1() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/rfc7950/semantic-version/complex-1", StatementParserMode.SEMVER_MODE); verifySchemaContextTest1(context); } - private void verifySchemaContextTest1(final SchemaContext context) throws URISyntaxException { + private static void verifySchemaContextTest1(final SchemaContext context) { assertNotNull(context); - final Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next(); - final Module semVer = context.findModuleByNamespace(new URI("urn:opendaylight:yang:extension:semantic-version")) - .iterator().next(); + final Module foo = context.findModuleByNamespace(URI.create("foo")).iterator().next(); + final Module semVer = context.findModuleByNamespace( + URI.create("urn:opendaylight:yang:extension:semantic-version")).iterator().next(); // check module versions assertEquals(SemVer.valueOf("1.3.95"), semVer.getSemanticVersion()); @@ -77,27 +70,25 @@ public class SemanticVersionComplexTest { } @Test - public void complexTest2() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, - ParseException { + public void complexTest2() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/complex/complex-2", StatementParserMode.SEMVER_MODE); verifySchemaContextTest2(context); } @Test - public void complexTest2Yang1_1() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException, - ParseException { + public void complexTest2Yang1_1() throws Exception { final SchemaContext context = StmtTestUtils.parseYangSources("/rfc7950/semantic-version/complex-2", StatementParserMode.SEMVER_MODE); verifySchemaContextTest2(context); } - private void verifySchemaContextTest2(final SchemaContext context) throws URISyntaxException { + private static void verifySchemaContextTest2(final SchemaContext context) { assertNotNull(context); - final Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next(); - final Module semVer = context.findModuleByNamespace(new URI("urn:opendaylight:yang:extension:semantic-version")) - .iterator().next(); + final Module foo = context.findModuleByNamespace(URI.create("foo")).iterator().next(); + final Module semVer = context.findModuleByNamespace(URI.create( + "urn:opendaylight:yang:extension:semantic-version")).iterator().next(); // check module versions assertEquals(SemVer.valueOf("2.5.50"), semVer.getSemanticVersion()); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionDefaultsTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionDefaultsTest.java index 2e1ddbc09e..6dea1b3525 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionDefaultsTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionDefaultsTest.java @@ -12,22 +12,19 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionDefaultsTest { @Test - public void defaultsTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void defaultsTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/defaults/defaults", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -40,8 +37,7 @@ public class SemanticVersionDefaultsTest { } @Test - public void defaultMajorValidTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void defaultMajorValidTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/defaults/default-major-valid", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -54,10 +50,10 @@ public class SemanticVersionDefaultsTest { } @Test - public void defaultMajorInvalidTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void defaultMajorInvalidTest() throws Exception { try { - StmtTestUtils.parseYangSources("/semantic-version/defaults/default-major-invalid", StatementParserMode.SEMVER_MODE); + StmtTestUtils.parseYangSources("/semantic-version/defaults/default-major-invalid", + StatementParserMode.SEMVER_MODE); fail("Test should fail due to invalid semantic version"); } catch (ReactorException e) { assertTrue(e.getCause().getMessage() diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionIgnoringRevisionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionIgnoringRevisionTest.java index 6d09201825..ee52231261 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionIgnoringRevisionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionIgnoringRevisionTest.java @@ -10,24 +10,18 @@ package org.opendaylight.yangtools.yang.stmt.semver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; - -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; 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; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionIgnoringRevisionTest { @Test - public void ignoringRevisionTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void ignoringRevisionTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/ignoring-revision", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -43,8 +37,7 @@ public class SemanticVersionIgnoringRevisionTest { } @Test - public void ignoringRevision2Test() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void ignoringRevision2Test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/ignoring-revision-2", StatementParserMode.SEMVER_MODE); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionImportTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionImportTest.java index 422ef7be08..7f37b2b01c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionImportTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionImportTest.java @@ -12,22 +12,19 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionImportTest { @Test - public void importValidTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void importValidTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/import/import-valid", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -39,8 +36,7 @@ public class SemanticVersionImportTest { } @Test - public void importInvalidDeprecatedTest1() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void importInvalidDeprecatedTest1() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/import/import-invalid-deprecated-1", StatementParserMode.SEMVER_MODE); @@ -52,8 +48,7 @@ public class SemanticVersionImportTest { } @Test - public void importInvalidDeprecatedTest2() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void importInvalidDeprecatedTest2() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/import/import-invalid-deprecated-2", StatementParserMode.SEMVER_MODE); @@ -65,8 +60,7 @@ public class SemanticVersionImportTest { } @Test - public void importInvalidNotsufficientTest1() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void importInvalidNotsufficientTest1() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/import/import-invalid-notsufficient-1", StatementParserMode.SEMVER_MODE); @@ -78,8 +72,7 @@ public class SemanticVersionImportTest { } @Test - public void importInvalidNotsufficientTest2() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void importInvalidNotsufficientTest2() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/import/import-invalid-notsufficient-2", StatementParserMode.SEMVER_MODE); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionMultipleImportTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionMultipleImportTest.java index 6264b8f56e..c8e4673ebb 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionMultipleImportTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionMultipleImportTest.java @@ -12,9 +12,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import java.util.Set; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; @@ -23,14 +21,12 @@ import org.opendaylight.yangtools.yang.model.api.ModuleImport; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionMultipleImportTest { @Test - public void multipleInvalidDeprecatedTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void multipleInvalidDeprecatedTest() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/multiple/multiple-invalid-deprecated", StatementParserMode.SEMVER_MODE); @@ -42,8 +38,7 @@ public class SemanticVersionMultipleImportTest { } @Test - public void multipleInvalidNosufficientTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void multipleInvalidNosufficientTest() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/multiple/multiple-invalid-nosufficient", StatementParserMode.SEMVER_MODE); @@ -55,8 +50,7 @@ public class SemanticVersionMultipleImportTest { } @Test - public void multipleValidDefaultsTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void multipleValidDefaultsTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/multiple/multiple-valid-defaults", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -72,8 +66,7 @@ public class SemanticVersionMultipleImportTest { } @Test - public void multipleValidSpecifiedTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void multipleValidSpecifiedTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/multiple/multiple-valid-specified", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -88,7 +81,8 @@ public class SemanticVersionMultipleImportTest { assertEquals(SemVer.valueOf("5.5.6"), bar.getSemanticVersion()); } - private static Module findImportedModule(SchemaContext context, Module rootModule, String importedModuleName) { + private static Module findImportedModule(final SchemaContext context, final Module rootModule, + final String importedModuleName) { ModuleImport requestedModuleImport = null; Set rootImports = rootModule.getImports(); for (ModuleImport moduleImport : rootImports) { diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionPositionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionPositionTest.java index a869ba50ad..0c817baf00 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionPositionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionPositionTest.java @@ -10,23 +10,18 @@ package org.opendaylight.yangtools.yang.stmt.semver; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; - -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; 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; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; +import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionPositionTest { @Test - public void positionHeadTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void positionHeadTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/position/position-head", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -42,8 +37,7 @@ public class SemanticVersionPositionTest { } @Test - public void positionMiddleTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void positionMiddleTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/position/position-middle", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -59,7 +53,7 @@ public class SemanticVersionPositionTest { } @Test - public void positiontailTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void positiontailTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/position/position-tail", StatementParserMode.SEMVER_MODE); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionTest.java index a7b667a35e..23c2b10466 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/semver/SemanticVersionTest.java @@ -13,9 +13,7 @@ import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -import java.io.FileNotFoundException; import java.net.URI; -import java.net.URISyntaxException; import org.junit.Test; import org.opendaylight.yangtools.concepts.SemVer; import org.opendaylight.yangtools.yang.common.QName; @@ -27,13 +25,13 @@ import org.opendaylight.yangtools.yang.model.api.SchemaPath; import org.opendaylight.yangtools.yang.model.repo.api.StatementParserMode; import org.opendaylight.yangtools.yang.model.util.SchemaContextUtil; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class SemanticVersionTest { @Test - public void basicTest() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { - SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic", StatementParserMode.SEMVER_MODE); + public void basicTest() throws Exception { + SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic", + StatementParserMode.SEMVER_MODE); assertNotNull(context); Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next(); @@ -47,8 +45,9 @@ public class SemanticVersionTest { } @Test - public void basicTest2() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { - SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic-2", StatementParserMode.SEMVER_MODE); + public void basicTest2() throws Exception { + SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic-2", + StatementParserMode.SEMVER_MODE); assertNotNull(context); Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next(); @@ -62,8 +61,9 @@ public class SemanticVersionTest { } @Test - public void basicTest3() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { - SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic-3", StatementParserMode.SEMVER_MODE); + public void basicTest3() throws Exception { + SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic-3", + StatementParserMode.SEMVER_MODE); assertNotNull(context); Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next(); @@ -75,7 +75,7 @@ public class SemanticVersionTest { } @Test - public void basicImportTest1() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void basicImportTest1() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/basic-import-1", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -91,8 +91,7 @@ public class SemanticVersionTest { } @Test - public void multipleModulesTest() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void multipleModulesTest() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/multiple-modules", StatementParserMode.SEMVER_MODE); assertNotNull(context); @@ -108,8 +107,7 @@ public class SemanticVersionTest { } @Test - public void basicImportErrTest1() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void basicImportErrTest1() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/basic-import-invalid-1", StatementParserMode.SEMVER_MODE); fail("Test should fail due to invalid semantic version"); @@ -120,8 +118,7 @@ public class SemanticVersionTest { } @Test - public void basicImportErrTest2() throws SourceException, FileNotFoundException, ReactorException, - URISyntaxException { + public void basicImportErrTest2() throws Exception { try { StmtTestUtils.parseYangSources("/semantic-version/basic-import-invalid-2", StatementParserMode.SEMVER_MODE); fail("Test should fail due to invalid semantic version"); @@ -133,7 +130,8 @@ public class SemanticVersionTest { @Test public void nodeTest() throws Exception { - SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/node-test", StatementParserMode.SEMVER_MODE); + SchemaContext context = StmtTestUtils.parseYangSources("/semantic-version/node-test", + StatementParserMode.SEMVER_MODE); assertNotNull(context); Module foo = context.findModuleByNamespace(new URI("foo")).iterator().next(); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java index 51ff94b7cb..f752c70e7c 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/test/Bug5200Test.java @@ -11,8 +11,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -import java.io.FileNotFoundException; -import java.net.URISyntaxException; import java.util.List; import org.junit.Test; import org.opendaylight.yangtools.yang.common.QName; @@ -27,8 +25,6 @@ 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.model.util.SchemaContextUtil; -import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; -import org.opendaylight.yangtools.yang.parser.spi.source.SourceException; import org.opendaylight.yangtools.yang.stmt.StmtTestUtils; public class Bug5200Test { @@ -36,7 +32,7 @@ public class Bug5200Test { private static final String REV = "2016-05-05"; @Test - public void test() throws SourceException, FileNotFoundException, ReactorException, URISyntaxException { + public void test() throws Exception { SchemaContext context = StmtTestUtils.parseYangSources("/bugs/bug5200"); assertNotNull(context); diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java index 912e0fe9a4..60a03fe035 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/stmt/yin/YinFileStmtTest.java @@ -29,15 +29,15 @@ import org.opendaylight.yangtools.yang.stmt.TestUtils; public class YinFileStmtTest { - private static final YinStatementSourceImpl YIN_FILE = createSource("test.yin"); - private static final YinStatementSourceImpl EXT_FILE = createSource("extension.yin"); - private static final YinStatementSourceImpl EXT_USE_FILE = createSource("extension-use.yin"); - private static final YinStatementSourceImpl INVALID_YIN_FILE = createSource("incorrect-foo.yin"); - private static final YinStatementSourceImpl INVALID_YIN_FILE_2 = createSource("incorrect-bar.yin"); + private static final StatementStreamSource YIN_FILE = createSource("test.yin"); + private static final StatementStreamSource EXT_FILE = createSource("extension.yin"); + private static final StatementStreamSource EXT_USE_FILE = createSource("extension-use.yin"); + private static final StatementStreamSource INVALID_YIN_FILE = createSource("incorrect-foo.yin"); + private static final StatementStreamSource INVALID_YIN_FILE_2 = createSource("incorrect-bar.yin"); private Set modules; - private static YinStatementSourceImpl createSource(final String name) { + private static StatementStreamSource createSource(final String name) { return new YinStatementSourceImpl("/semantic-statement-parser/yin/" + name, false); } diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java index 4aca084c27..1b0dc38613 100644 --- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java +++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/thirdparty/plugin/ThirdPartyExtensionPluginTest.java @@ -10,9 +10,7 @@ package org.opendaylight.yangtools.yang.thirdparty.plugin; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; +import java.io.IOException; import java.net.URISyntaxException; import java.util.List; import org.junit.Test; @@ -20,9 +18,11 @@ 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.UnknownSchemaNode; +import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; +import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.rfc6020.repo.YangStatementStreamSource; import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException; import org.opendaylight.yangtools.yang.parser.stmt.reactor.CrossSourceStatementReactor; -import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.YangStatementSourceImpl; import org.opendaylight.yangtools.yang.parser.stmt.rfc6020.effective.EffectiveSchemaContext; public class ThirdPartyExtensionPluginTest { @@ -30,11 +30,9 @@ public class ThirdPartyExtensionPluginTest { private static final String REV = "2016-06-09"; @Test - public void test() throws FileNotFoundException, URISyntaxException, ReactorException { + public void test() throws URISyntaxException, ReactorException, IOException, YangSyntaxErrorException { final CrossSourceStatementReactor.BuildAction reactor = CustomInferencePipeline.CUSTOM_REACTOR.newBuild(); - final FileInputStream yangFile = new FileInputStream(new File(getClass().getResource("/plugin-test/foo.yang") - .toURI())); - reactor.addSource(new YangStatementSourceImpl(yangFile)); + reactor.addSource(YangStatementStreamSource.create(YangTextSchemaSource.forResource("/plugin-test/foo.yang"))); final EffectiveSchemaContext schema = reactor.buildEffective(); final DataSchemaNode dataChildByName = schema.getDataChildByName(QName.create(NS, REV, "root")); -- 2.36.6