Add DataNodeContainer.dataChildByName()

[yangtools.git] / yang / yang-parser-rfc7950 / src / test / java / org / opendaylight / yangtools / yang / stmt / CaseStmtTest.java

diff --git a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java
index bea2781f90ae3f94bb8011651e5af6db5b0e6879..db083b8fe1adfe7bd9a9155ca9d0c97665cd3634 100644 (file)
--- a/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java
+++ b/yang/yang-parser-rfc7950/src/test/java/org/opendaylight/yangtools/yang/stmt/CaseStmtTest.java
@@ -5,18 +5,16 @@
  * 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.assertFalse;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertThrows;
 import static org.junit.Assert.assertTrue;
 
 import java.net.URI;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.common.QNameModule;
 import org.opendaylight.yangtools.yang.common.Revision;
@@ -39,9 +37,6 @@ public class CaseStmtTest {
     private DataSchemaNode tempThirdChild;
     private CaseSchemaNode tempChoice;
 
-    @Rule
-    public ExpectedException expectedEx = ExpectedException.none();
-
     @Before
     public void setup() throws Exception {
         schema = StmtTestUtils.parseYangSources("/case-test");
@@ -64,7 +59,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -77,7 +72,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -90,7 +85,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -103,7 +98,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -116,7 +111,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -129,7 +124,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -142,7 +137,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -155,7 +150,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -168,7 +163,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -181,7 +176,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -194,7 +189,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -207,7 +202,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -220,7 +215,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -233,7 +228,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -246,7 +241,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -259,7 +254,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -272,7 +267,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -285,7 +280,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -301,7 +296,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -314,7 +309,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -327,7 +322,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -340,7 +335,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -353,7 +348,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -366,7 +361,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -379,7 +374,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -392,7 +387,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -405,7 +400,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -418,7 +413,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -431,7 +426,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -444,7 +439,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -457,7 +452,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -470,7 +465,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertTrue(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -483,7 +478,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -496,7 +491,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -509,7 +504,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertFalse(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -522,7 +517,7 @@ public class CaseStmtTest {
         tempSecondChild = ((ContainerSchemaNode) tempChild).getChildNodes().iterator().next();
         assertNotNull(tempSecondChild);
         assertTrue(tempSecondChild.isConfiguration());
-        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().values().iterator().next();
+        tempChoice = ((ChoiceSchemaNode) tempSecondChild).getCases().iterator().next();
         assertNotNull(tempChoice);
         assertFalse(tempChoice.isConfiguration());
         tempThirdChild = tempChoice.getChildNodes().iterator().next();
@@ -531,14 +526,14 @@ public class CaseStmtTest {
     }
 
     @Test
-    public void testInferenceExceptionChoice() throws Exception {
-        expectedEx.expect(ReactorException.class);
-        schema = StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/choice");
+    public void testInferenceExceptionChoice() {
+        assertThrows(ReactorException.class,
+            () -> StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/choice"));
     }
 
     @Test
     public void testInferenceExceptionCase() throws Exception {
-        expectedEx.expect(ReactorException.class);
-        schema = StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/case");
+        assertThrows(ReactorException.class,
+            () -> StmtTestUtils.parseYangSources("/case-test/case-test-exceptions/case"));
     }
 }
\ No newline at end of file