Convert mdsal-binding-spec-util to a JPMS module

[mdsal.git] / binding / mdsal-binding-spec-util / src / test / java / org / opendaylight / mdsal / binding / spec / util / DataObjectReadingUtilTest.java

diff --git a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java
index 9832232364fc46a523bfd130a94d62031259c045..6b3b70189365d67eb0779e2f8b2854e8dc68bcb2 100644 (file)
--- a/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java
+++ b/binding/mdsal-binding-spec-util/src/test/java/org/opendaylight/mdsal/binding/spec/util/DataObjectReadingUtilTest.java
@@ -20,24 +20,27 @@ import java.util.Map;
 import java.util.Map.Entry;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.Identifiable;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 
+@RunWith(MockitoJUnitRunner.StrictStubs.class)
 public class DataObjectReadingUtilTest {
+    @Mock
+    public InstanceIdentifier<? extends DataObject> pathNull;
+    @Mock
+    public Map.Entry<InstanceIdentifier<? extends DataObject>, DataObject> entryNull;
+    @Mock
+    public DataObject mockedDataObject;
 
-    @Mock private InstanceIdentifier<? extends DataObject> pathNull;
-    @Mock private Map.Entry<InstanceIdentifier<? extends DataObject>, DataObject> entryNull;
-    @Mock private DataObject mockedDataObject;
-    private InstanceIdentifier<? extends DataObject> path;
-    private Map.Entry<InstanceIdentifier<? extends DataObject>, DataObject> entry;
+    public InstanceIdentifier<? extends DataObject> path;
+    public Map.Entry<InstanceIdentifier<? extends DataObject>, DataObject> entry;
 
     @Before
     public void setup() {
-        MockitoAnnotations.initMocks(this);
-
         path = InstanceIdentifier.builder(Nodes.class).build();
         final ImmutableMap<InstanceIdentifier<? extends DataObject>, DataObject> map =
                 ImmutableMap.<InstanceIdentifier<? extends DataObject>, DataObject>builder()