From e574256a007906a0a7b37f524e58da2d84827861 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 2 Oct 2021 20:32:31 +0200
Subject: [PATCH] Improve {Bug394,TwoRevisions}Test

Improved loading and layout.

Change-Id: I12c617e70c9da1af0ecfbab370007ebfc3a4b416
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../yangtools/yang/stmt/Bug394Test.java           |  4 ++--
 .../yangtools/yang/stmt/TestUtils.java            | 10 ----------
 .../yangtools/yang/stmt/TwoRevisionsTest.java     | 15 +++++++++------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java
index ea62d12be8..bda951ba73 100644
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/Bug394Test.java
@@ -18,9 +18,9 @@ import java.util.stream.Collectors;
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.model.api.ContainerSchemaNode;
+import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext;
 import org.opendaylight.yangtools.yang.model.api.ExtensionDefinition;
 import org.opendaylight.yangtools.yang.model.api.Module;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
 import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
 
 /**
@@ -29,7 +29,7 @@ import org.opendaylight.yangtools.yang.model.api.stmt.UnrecognizedStatement;
 public class Bug394Test {
     @Test
     public void testParseList() throws Exception {
-        final SchemaContext context = TestUtils.loadModules("/bugs/bug394-retest");
+        final EffectiveModelContext context = TestUtils.loadModules("/bugs/bug394-retest");
         final Module bug394 = context.findModules("bug394").iterator().next();
         final Module bug394_ext = context.findModules("bug394-ext").iterator().next();
 
diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
index 475836996d..65378f78da 100644
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TestUtils.java
@@ -163,16 +163,6 @@ public final class TestUtils {
         }
     }
 
-    public static List<Module> findModules(final Collection<? extends Module> modules, final String moduleName) {
-        List<Module> result = new ArrayList<>();
-        for (Module module : modules) {
-            if (module.getName().equals(moduleName)) {
-                result.add(module);
-            }
-        }
-        return result;
-    }
-
     public static EffectiveModelContext parseYangSources(final StatementStreamSource... sources)
             throws ReactorException {
         return RFC7950Reactors.defaultReactor().newBuild().addSources(sources).buildEffective();
diff --git a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java
index 1a1eee60d5..8046fec265 100644
--- a/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java
+++ b/parser/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/TwoRevisionsTest.java
@@ -8,17 +8,20 @@
 package org.opendaylight.yangtools.yang.stmt;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
-import java.util.Collection;
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.model.api.Module;
+import org.opendaylight.yangtools.yang.common.Revision;
 
 public class TwoRevisionsTest {
     @Test
     public void testTwoRevisions() throws Exception {
-        Collection<? extends Module> modules = TestUtils.loadModules(getClass().getResource("/ietf").toURI())
-                .getModules();
-        //FIXME: following assert needs module revisions .equals() solution first
-        assertEquals(2, TestUtils.findModules(modules, "network-topology").size());
+        var it = TestUtils.loadModules("/ietf").findModuleStatements("network-topology").iterator();
+        assertTrue(it.hasNext());
+        assertEquals(Revision.ofNullable("2013-10-21"), it.next().localQNameModule().getRevision());
+        assertTrue(it.hasNext());
+        assertEquals(Revision.ofNullable("2013-07-12"), it.next().localQNameModule().getRevision());
+        assertFalse(it.hasNext());
     }
 }
-- 
2.36.6