Eliminate blueprint for openflowplugins-impl karaf commands

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / karaf / AbstractKarafTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/karaf/AbstractKarafTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/karaf/AbstractKarafTest.java
index d47c0e1a38dea01b385af73e7b510316370a671b..04a5c22625d89a57629083516c2ab8b913812c01 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/karaf/AbstractKarafTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/karaf/AbstractKarafTest.java
@@ -5,42 +5,56 @@
  * 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.openflowplugin.impl.karaf;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.doReturn;
+
 import java.io.PrintStream;
 import java.util.List;
 import java.util.function.Function;
-import org.apache.felix.service.command.CommandSession;
-import org.junit.Before;
-import org.junit.runner.RunWith;
+import org.apache.karaf.shell.api.console.Session;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.junit.MockitoJUnitRunner;
+import org.mockito.junit.jupiter.MockitoExtension;
 
 /**
  * Created by mirehak on 7/29/15.
  */
-@RunWith(MockitoJUnitRunner.class)
-public abstract class AbstractKarafTest {
+@ExtendWith(MockitoExtension.class)
+abstract class AbstractKarafTest {
     @Mock
-    protected CommandSession cmdSession;
+    protected Session session;
     @Mock
     protected PrintStream console;
 
-    @Before
-    public void setUp() {
-        Mockito.when(cmdSession.getConsole()).thenReturn(console);
-        doSetUp();
+    @BeforeEach
+    void beforeEach() {
+        doReturn(console).when(session).getConsole();
+        doBeforeEach();
+    }
+
+    protected abstract void doBeforeEach();
+
+    protected static void assertNoActivity(final List<String> allStatLines,
+            final Function<String, Boolean> checkFunction) {
+        assertTrue(checkNoActivity(allStatLines, checkFunction));
     }
 
-    public abstract void doSetUp();
+    protected static void assertHasActivity(final List<String> allStatLines,
+            final Function<String, Boolean> checkFunction) {
+        assertFalse(checkNoActivity(allStatLines, checkFunction));
+    }
 
-    public static boolean checkNoActivity(List<String> allStatLines, Function<String, Boolean> checkFunction) {
-        boolean noActivity = true;
-        for (String statLine : allStatLines) {
-            noActivity &= checkFunction.apply(statLine);
+    private static boolean checkNoActivity(final List<String> allStatLines,
+            final Function<String, Boolean> checkFunction) {
+        for (var statLine : allStatLines) {
+            if (!checkFunction.apply(statLine)) {
+                return false;
+            }
         }
-        return noActivity;
+        return true;
     }
 }