Consider submodule imports when sorting modules

[yangtools.git] / yang / yang-parser-impl / src / test / java / org / opendaylight / yangtools / yang / parser / util / TopologicalSortTest.java

diff --git a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java
index 72fb3ff8707e3368a4da63fdb07a20eb000e2a9d..6a7b00724e09914a36ca71bd78cdd59da16cd0a7 100644 (file)
--- a/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java
+++ b/yang/yang-parser-impl/src/test/java/org/opendaylight/yangtools/yang/parser/util/TopologicalSortTest.java
@@ -7,12 +7,13 @@
  */
 package org.opendaylight.yangtools.yang.parser.util;
 
-import static org.hamcrest.core.Is.is;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.Sets;
+
 import java.util.List;
 import java.util.Set;
+
 import org.junit.Test;
 import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.Node;
 import org.opendaylight.yangtools.yang.parser.util.TopologicalSort.NodeImpl;
@@ -34,11 +35,8 @@ public class TopologicalSortTest {
         node2.addEdge(node3);
         node3.addEdge(node1);
 
-        try {
-            TopologicalSort.sort(nodes);
-        } catch (IllegalStateException e) {
-            throw e;
-        }
+        // We expect an IllegalStateException here
+        TopologicalSort.sort(nodes);
     }
 
     @Test
@@ -61,10 +59,10 @@ public class TopologicalSortTest {
 
         List<Node> sorted = TopologicalSort.sort(nodes);
 
-        assertThat(sorted.get(0), is(node4));
-        assertThat(sorted.get(1), is(node2));
-        assertThat(sorted.get(2), is(node3));
-        assertThat(sorted.get(3), is(node1));
+        assertEquals(node4, sorted.get(0));
+        assertEquals(node2, sorted.get(1));
+        assertEquals(node3, sorted.get(2));
+        assertEquals(node1, sorted.get(3));
     }
 
 }