Enforce InstanceIdentifier creation

[mdsal.git] / binding / mdsal-binding-dom-adapter / src / test / java / org / opendaylight / mdsal / binding / dom / adapter / DirectGetterRouteContextExtractorTest.java

diff --git a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractorTest.java b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractorTest.java
index 2a9efeb6b63b7efa9dca97517651c0c5d3f2e965..317c6a7972cf4e09e9165be335ed9cdcbf81e676 100644 (file)
--- a/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractorTest.java
+++ b/binding/mdsal-binding-dom-adapter/src/test/java/org/opendaylight/mdsal/binding/dom/adapter/DirectGetterRouteContextExtractorTest.java
@@ -8,36 +8,28 @@
 package org.opendaylight.mdsal.binding.dom.adapter;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.assertThrows;
 import static org.mockito.Mockito.mock;
 
-import java.lang.reflect.Method;
 import org.junit.Test;
-import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yang.gen.v1.urn.yang.foo.rev160101.BooleanContainer;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
 public class DirectGetterRouteContextExtractorTest {
-
-    private static final InstanceIdentifier<?> INSTANCE_IDENTIFIER = InstanceIdentifier.create(DataObject.class);
+    private static final InstanceIdentifier<?> INSTANCE_IDENTIFIER = InstanceIdentifier.create(BooleanContainer.class);
     private static final String EXCEPTION_TEXT = "testException";
 
     @Test
-    public void basicTest() throws Exception {
-        final Method testMthd = this.getClass().getDeclaredMethod("testMethod", DataObject.class);
-        testMthd.setAccessible(true);
-        final ContextReferenceExtractor referenceExtractor = DirectGetterRouteContextExtractor.create(testMthd);
-        assertEquals(testMethod(mock(DataObject.class)), referenceExtractor.extract(mock(DataObject.class)));
+    public void basicTest() throws IllegalAccessException, NoSuchMethodException  {
+        final ContextReferenceExtractor referenceExtractor = DirectGetterRouteContextExtractor.create(
+            getClass().getDeclaredMethod("testMethod", BooleanContainer.class));
+        assertEquals(INSTANCE_IDENTIFIER, referenceExtractor.extract(mock(BooleanContainer.class)));
 
-        try {
-            referenceExtractor.extract(null);
-            fail("Expected exception");
-        } catch (NullPointerException e) {
-            assertTrue(e.getMessage().equals(EXCEPTION_TEXT));
-        }
+        assertEquals(EXCEPTION_TEXT,
+            assertThrows(NullPointerException.class, () -> referenceExtractor.extract(null)).getMessage());
     }
 
-    private static InstanceIdentifier<?> testMethod(final DataObject data) {
+    public static InstanceIdentifier<?> testMethod(final BooleanContainer data) {
         if (data == null) {
             throw new NullPointerException(EXCEPTION_TEXT);
         }