JUnit 5 migration

eclipse-linuxtools · Aug 29, 2024 · a54d4ed · a54d4ed
1 parent ed4c75a
commit a54d4ed
Show file tree

Hide file tree

Showing 18 changed files with 55 additions and 47 deletions.
diff --git a/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF b/profiling/org.eclipse.linuxtools.profiling.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.1.0.qualifier
 Bundle-Vendor: %Bundle-Vendor.0
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.junit;bundle-version="4.10.0",
+ junit-jupiter-api,
  org.eclipse.cdt.core,
  org.eclipse.ui.ide,
  org.eclipse.remote.core;bundle-version="2.0.0",

diff --git a/...s.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/CProjectHelper.java b/...s.profiling.tests/src/org/eclipse/linuxtools/internal/profiling/tests/CProjectHelper.java
@@ -15,7 +15,8 @@
  *     Jeff Johnston (Red Hat Inc.) - Modified for usage in Linux Tools project
  *******************************************************************************/
 package org.eclipse.linuxtools.internal.profiling.tests;
-import static org.junit.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.fail;
 
 import org.eclipse.cdt.core.CCProjectNature;
 import org.eclipse.cdt.core.CCorePlugin;

diff --git a/...xtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractRemoteTest.java b/...xtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractRemoteTest.java
@@ -12,9 +12,9 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.profiling.tests;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assume.assumeTrue;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assumptions.assumeFalse;
 
 import org.eclipse.core.filesystem.EFS;
 import org.eclipse.core.filesystem.IFileStore;
@@ -60,19 +60,19 @@ public static void checkConnectionInfo() {
         if (host != null) {
             HOST = host;
         }
-        assumeTrue("Skip remote tests due lack of host information", !HOST.isEmpty());
+        assumeFalse(HOST.isEmpty(), "Skip remote tests due lack of host information");
 
         String username = System.getenv("TEST_USERNAME");
         if (username != null) {
             USERNAME = username;
         }
-        assumeTrue("Skip remote tests due lack of an username for connection", !USERNAME.isEmpty());
+        assumeFalse(USERNAME.isEmpty(), "Skip remote tests due lack of an username for connection");
 
         String password = System.getenv("TEST_PASSWORD");
         if (password != null) {
             PASSWORD = password;
         }
-        assumeTrue("Skip remote tests due lack of an password for connection", !PASSWORD.isEmpty());
+        assumeFalse(PASSWORD.isEmpty(), "Skip remote tests due lack of an password for connection");
     }
 
      protected void deleteResource (String directory) {

diff --git a/...e.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java b/...e.linuxtools.profiling.tests/src/org/eclipse/linuxtools/profiling/tests/AbstractTest.java
@@ -13,9 +13,9 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.profiling.tests;
 
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.launch.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.linuxtools.callgraph.launch.tests
 Bundle-Version: 1.0.0.qualifier
-Require-Bundle: org.junit;bundle-version="4.7.0"
+Require-Bundle: junit-jupiter-api
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-21
 Fragment-Host: org.eclipse.linuxtools.callgraph.launch

diff --git a/...raph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java b/...raph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/AbstractStapTest.java
@@ -26,7 +26,7 @@
 import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapOptionsTab;
 import org.eclipse.linuxtools.profiling.tests.AbstractTest;
 import org.eclipse.linuxtools.tools.launch.core.factory.RuntimeProcessFactory;
-import org.junit.After;
+import org.junit.jupiter.api.AfterEach;
 import org.osgi.framework.FrameworkUtil;
 
 public class AbstractStapTest extends AbstractTest {
@@ -57,7 +57,7 @@ public void killStap() {
 
     private List<ILaunch> launches = new ArrayList<>();
 
-    @After
+    @AfterEach
     public void tearDown() {
         if (!launches.isEmpty()) {
             DebugPlugin.getDefault().getLaunchManager().removeLaunches(launches.toArray(new ILaunch[launches.size()]));

diff --git a/...aph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/ConfigurationTest.java b/...aph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/ConfigurationTest.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.callgraph.launch.tests;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 
@@ -22,8 +22,8 @@
 import org.eclipse.linuxtools.internal.callgraph.core.LaunchConfigurationConstants;
 import org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph;
 import org.eclipse.linuxtools.internal.callgraph.launch.SystemTapLaunchConfigurationDelegate;
-import org.junit.After;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Test;
 
 public class ConfigurationTest extends AbstractStapTest {
 
@@ -103,7 +103,7 @@ public void testConfig() throws CoreException {
         killStap();
     }
 
-    @After
+    @AfterEach
     public void deleteFiles() {
         File file = new File("/tmp/ThisFileDoesNothingDeleteIt");
         if (file.exists()) {

diff --git a/...h.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/LaunchShortcutsTest.java b/...h.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/LaunchShortcutsTest.java
@@ -16,9 +16,9 @@
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.linuxtools.internal.callgraph.core.SystemTapUIErrorMessages;
 import org.eclipse.linuxtools.internal.callgraph.launch.LaunchStapGraph;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class LaunchShortcutsTest extends AbstractStapTest {
 
@@ -27,12 +27,12 @@ public class LaunchShortcutsTest extends AbstractStapTest {
      * is sent.
      */
 
-    @Before
+    @BeforeEach
     public void prep() throws Exception {
         proj = createProjectAndBuild("basicTest"); //$NON-NLS-1$
     }
 
-    @After
+    @AfterEach
     public void clean() throws Exception {
         deleteProject(proj);
     }

diff --git a/...ests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandGeneratorTest.java b/...ests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandGeneratorTest.java
@@ -12,13 +12,14 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.callgraph.launch.tests;
 
-import static org.junit.Assert.*;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 
 import org.eclipse.linuxtools.internal.callgraph.core.PluginConstants;
 import org.eclipse.linuxtools.internal.callgraph.core.SystemTapCommandGenerator;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SystemTapCommandGeneratorTest extends AbstractStapTest {
 

diff --git a/....launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandTest.java b/....launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapCommandTest.java
@@ -19,7 +19,7 @@
 import java.io.PrintStream;
 
 import org.eclipse.core.resources.ResourcesPlugin;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SystemTapCommandTest {
 

diff --git a/...ch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java b/...ch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapErrorHandlerTest.java
@@ -13,20 +13,21 @@
 
 package org.eclipse.linuxtools.callgraph.launch.tests;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.linuxtools.internal.callgraph.core.SystemTapErrorHandler;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 public class SystemTapErrorHandlerTest  {
 
     private SystemTapErrorHandler errHandler;
     private String errorString;
 
-    @Before
+    @BeforeEach
     public void setUp() {
         errHandler = new SystemTapErrorHandler();
     }

diff --git a/...raph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapTabTest.java b/...raph.launch.tests/src/org/eclipse/linuxtools/callgraph/launch/tests/SystemTapTabTest.java
@@ -21,7 +21,7 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 public class SystemTapTabTest {
 
     @Test

diff --git a/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF b/systemtap/org.eclipse.linuxtools.callgraph.tests/META-INF/MANIFEST.MF
@@ -7,7 +7,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.draw2d,
  org.eclipse.linuxtools.callgraph;bundle-version="0.0.1",
- org.junit;bundle-version="4.0.0",
+ junit-jupiter-api,
+ junit-platform-suite-api,
  org.eclipse.zest.core;bundle-version="1.2.0",
  org.eclipse.zest.layouts;bundle-version="1.1.0"
 Bundle-ActivationPolicy: lazy

diff --git a/...lipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/AllTests.java b/...lipse.linuxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/AllTests.java
@@ -13,9 +13,10 @@
 
 package org.eclipse.linuxtools.callgraph.tests;
 
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-@RunWith(Suite.class)
-@Suite.SuiteClasses({MouseListenerTest.class, StapGraphParserTest.class, SystemTapGraphTest.class, SystemTapGraphViewTest.class })
+import org.junit.platform.suite.api.SelectClasses;
+import org.junit.platform.suite.api.Suite;
+
+@Suite
+@SelectClasses({MouseListenerTest.class, StapGraphParserTest.class, SystemTapGraphTest.class, SystemTapGraphViewTest.class })
 public class AllTests {
 }
diff --git a/...uxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java b/...uxtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/MouseListenerTest.java
@@ -21,7 +21,7 @@
 import org.eclipse.linuxtools.internal.callgraph.core.ViewFactory;
 import org.eclipse.linuxtools.internal.callgraph.graphlisteners.StapGraphMouseListener;
 import org.eclipse.zest.core.widgets.GraphItem;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class MouseListenerTest {
 

diff --git a/...tools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/StapGraphParserTest.java b/...tools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/StapGraphParserTest.java
@@ -12,16 +12,17 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.callgraph.tests;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.fail;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 
 import org.eclipse.linuxtools.internal.callgraph.StapGraphParser;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class StapGraphParserTest {
 

diff --git a/...xtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphTest.java b/...xtools.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphTest.java
@@ -12,7 +12,8 @@
  *******************************************************************************/
 package org.eclipse.linuxtools.callgraph.tests;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -25,7 +26,7 @@
 import org.eclipse.linuxtools.internal.callgraph.StapGraphParser;
 import org.eclipse.linuxtools.internal.callgraph.core.StapUIJob;
 import org.eclipse.linuxtools.internal.callgraph.core.ViewFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SystemTapGraphTest {
 

diff --git a/...ls.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphViewTest.java b/...ls.callgraph.tests/src/org/eclipse/linuxtools/callgraph/tests/SystemTapGraphViewTest.java
@@ -13,11 +13,12 @@
 
 package org.eclipse.linuxtools.callgraph.tests;
 
-import static org.junit.Assert.assertEquals;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.eclipse.linuxtools.internal.callgraph.core.SystemTapTextView;
 import org.eclipse.linuxtools.internal.callgraph.core.ViewFactory;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 public class SystemTapGraphViewTest {
     private SystemTapTextView stapView = new SystemTapTextView();