Remove usage of ExpectedException

[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..b8f8e822ad167cab9c31883a3b63ef6c223b1a14 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");
@@ -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