Skip to content

Commit

Permalink
Migrate several test classes in o.e.osgi.tests to JUnit 4
Browse files Browse the repository at this point in the history 
This migrates all tests to JUnit 4 that are in packages containing only
a single test class or only a single test not yet migrated to JUnit 4.

* Add JUnit 4 annotations @test, @before, @after
* Remove inheritance of JUnit 3 TestCase and CoreTest
* Adapt performance tests to JUnit-4-conforming API
* Replace try-catch for actual errors with making the test method throw
the exception
  • Loading branch information
@HeikoKlare @HannesWell
HeikoKlare authored and HannesWell committed Dec 21, 2023
1 parent add8e99 commit 60a2e63
Show file tree
Hide file tree
Showing 4 changed files with 89 additions and 74 deletions.
32 changes: 22 additions & 10 deletions bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleResourceTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,38 @@
*******************************************************************************/
package org.eclipse.osgi.tests.bundles;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import java.net.URL;
import java.util.Enumeration;
import org.eclipse.core.tests.harness.CoreTest;
import org.eclipse.osgi.service.environment.EnvironmentInfo;
import org.eclipse.osgi.tests.OSGiTestsActivator;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;

public class BundleResourceTests extends CoreTest {
public class BundleResourceTests {
private BundleInstaller installer;

protected void setUp() throws Exception {
try {
installer = new BundleInstaller(OSGiTestsActivator.TEST_FILES_ROOT + "resourcetests/bundles", OSGiTestsActivator.getContext()); //$NON-NLS-1$
} catch (InvalidSyntaxException e) {
fail("Failed to create bundle installer", e); //$NON-NLS-1$
}
@Before
public void setUp() throws Exception {
installer = new BundleInstaller(OSGiTestsActivator.TEST_FILES_ROOT + "resourcetests/bundles", //$NON-NLS-1$
OSGiTestsActivator.getContext());
}

protected void tearDown() throws Exception {
@After
public void tearDown() throws Exception {
installer.shutdown();
}

@Test
public void testBug320546_01() throws Exception {
Bundle bundle = installer.installBundle("test"); //$NON-NLS-1$
URL result = bundle.getEntry("../../../../security");
Expand All @@ -54,6 +61,7 @@ public void testBug320546_01() throws Exception {
assertNotNull("Did not find resource!", result);
}

@Test
public void testBug320546_02() throws Exception {
Bundle bundle = installer.installBundle("test"); //$NON-NLS-1$
Enumeration paths = bundle.getEntryPaths("../");
Expand All @@ -66,12 +74,14 @@ public void testBug320546_02() throws Exception {
assertNotNull("Did not find resource!", paths);
}

@Test
public void testBreakOutDirBundle() throws Exception {
Bundle bundle = installer.installBundle("test"); //$NON-NLS-1$
URL result = bundle.getEntry("../testout/file.txt");
assertNull("Found resource!", result);
}

@Test
public void testBug395274() throws Exception {
ServiceReference<EnvironmentInfo> infoRef = OSGiTestsActivator.getContext().getServiceReference(EnvironmentInfo.class);
EnvironmentInfo info = OSGiTestsActivator.getContext().getService(infoRef);
Expand All @@ -96,6 +106,7 @@ public void testBug395274() throws Exception {
}
}

@Test
public void testBug328795() throws BundleException {
Bundle bundle = installer.installBundle("test"); //$NON-NLS-1$
checkEntries(bundle, "notFound\\", 0); // this results in invalid syntax exception which is logged because of trailing escape
Expand Down Expand Up @@ -130,6 +141,7 @@ public void testBug328795() throws BundleException {
checkEntries(bundle, "*\\(*", 2);
}

@Test
public void testBug338081() throws BundleException {
Bundle bundle = installer.installBundle("test"); //$NON-NLS-1$
// Empty string same as '/' for bundle root
Expand Down
13 changes: 7 additions & 6 deletions bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/eclipseadaptor/FilePathTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
*******************************************************************************/
package org.eclipse.osgi.tests.eclipseadaptor;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import org.eclipse.core.runtime.Platform;
import org.eclipse.osgi.framework.util.FilePath;
import org.eclipse.osgi.tests.OSGiTest;

public class FilePathTest extends OSGiTest {
import org.junit.Test;

public FilePathTest(String name) {
super(name);
}
public class FilePathTest {

@Test
public void testColonOnPath() {
FilePath path = new FilePath("/c:b/a");
if (Platform.getOS().equals(Platform.OS_WIN32)) {
Expand Down
70 changes: 36 additions & 34 deletions bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/internal/plugins/InstallTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,29 @@
*******************************************************************************/
package org.eclipse.osgi.tests.internal.plugins;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.fail;

import java.io.IOException;
import junit.framework.AssertionFailedError;
import org.eclipse.core.tests.harness.BundleTestingHelper;
import org.eclipse.core.tests.harness.CoreTest;
import org.eclipse.osgi.tests.OSGiTestsActivator;
import org.eclipse.osgi.util.ManifestElement;
import org.osgi.framework.*;
import org.junit.Test;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleException;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
import org.osgi.service.packageadmin.PackageAdmin;

/**
* Provisory home for tests that install plugins.
*/
public class InstallTests extends CoreTest {

public InstallTests() {
super();
}

public InstallTests(String name) {
super(name);
}

protected void setUp() throws Exception {
super.setUp();
}
public class InstallTests {

@Test
public void testInstallNoVersionManifest01() throws BundleException, IOException {
// Note that this test case has changed since the removing of plugin.xml conversion
// Before this tested that a plugin.xml with no version specified would fail.
Expand All @@ -46,9 +44,6 @@ public void testInstallNoVersionManifest01() throws BundleException, IOException
try {
installed = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle03"); //$NON-NLS-1$
// success - should allow manifests with no version.
} catch (BundleException be) {
// should not have failed with BundleException
fail("1.0"); //$NON-NLS-1$
} finally {
if (installed != null)
// clean-up - only runs if we end-up accepting an invalid manifest
Expand All @@ -59,6 +54,7 @@ public void testInstallNoVersionManifest01() throws BundleException, IOException
/**
* Test invalid manifest; missing Bundle-SymbolicName
*/
@Test
public void testInstallInvalidManifest02() throws IOException, BundleException {
Bundle installed = null;
try {
Expand All @@ -78,6 +74,7 @@ public void testInstallInvalidManifest02() throws IOException, BundleException {
/**
* Test invalid manifest; duplicate directive
*/
@Test
public void testInstallInvalidManifest03() throws IOException, BundleException {
Bundle installed = null;
try {
Expand All @@ -97,6 +94,7 @@ public void testInstallInvalidManifest03() throws IOException, BundleException {
/**
* Test invalid manifest; use attributes bundle-version and bundle-symbolic-name in Export-Package
*/
@Test
public void testInstallInvalidManifest04() throws IOException, BundleException {
Bundle installed = null;
try {
Expand All @@ -116,6 +114,7 @@ public void testInstallInvalidManifest04() throws IOException, BundleException {
/**
* Test invalid manifest; imports same package twice
*/
@Test
public void testInstallInvalidManifest05() throws IOException, BundleException {
Bundle installed = null;
try {
Expand All @@ -135,16 +134,12 @@ public void testInstallInvalidManifest05() throws IOException, BundleException {
/**
* Test unresolvable
*/
@Test
public void testStartError01() throws IOException, BundleException {
Bundle installed = null;
try {
try {
installed = BundleTestingHelper.installBundle("testStartError01", OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle15"); //$NON-NLS-1$ //$NON-NLS-2$
// should be able to install
} catch (BundleException be) {
// failed to install unresolvable bundle
fail("Unexpected installation error", be); //$NON-NLS-1$
}
installed = BundleTestingHelper.installBundle("testStartError01", OSGiTestsActivator.getContext(), //$NON-NLS-1$
OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle15"); //$NON-NLS-1$
try {
installed.start();
// expected exception starting
Expand All @@ -164,22 +159,21 @@ public void testStartError01() throws IOException, BundleException {
/**
* Test start fragment
*/
@Test
public void testStartError02() throws IOException, BundleException {
Bundle host = null;
Bundle fragment = null;
try {
try {
host = BundleTestingHelper.installBundle("testStartError02_host", OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle16"); //$NON-NLS-1$ //$NON-NLS-2$
fragment = BundleTestingHelper.installBundle("testStartError02_frag", OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle17"); //$NON-NLS-1$ //$NON-NLS-2$
// should be able to install host
} catch (BundleException be) {
// failed to install unresolvable bundle
fail("Unexpected installation error", be); //$NON-NLS-1$
}
host = BundleTestingHelper.installBundle("testStartError02_host", OSGiTestsActivator.getContext(), //$NON-NLS-1$
OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle16"); //$NON-NLS-1$
fragment = BundleTestingHelper.installBundle("testStartError02_frag", OSGiTestsActivator.getContext(), //$NON-NLS-1$
OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle17"); //$NON-NLS-1$
try {
host.start();
} catch (BundleException be) {
fail("Unexpected start host error", be); //$NON-NLS-1$
AssertionFailedError error = new AssertionFailedError("Unexpected start host error");
error.initCause(be);
throw error;
}
try {
fragment.start();
Expand All @@ -202,6 +196,7 @@ public void testStartError02() throws IOException, BundleException {
/**
* Test unsupported operation with boot classpath extension
*/
@Test
public void testUnsupportedOperation01() throws IOException, BundleException {
Bundle installed = null;
try {
Expand All @@ -218,6 +213,7 @@ public void testUnsupportedOperation01() throws IOException, BundleException {
}
}

@Test
public void testInstallLocationWithSpaces() throws BundleException, IOException {
Bundle installed = null;
installed = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle 01"); //$NON-NLS-1$
Expand All @@ -230,6 +226,7 @@ public void testInstallLocationWithSpaces() throws BundleException, IOException
}
}

@Test
public void testInstallLocationWithUnderscores() throws BundleException, IOException {
Bundle installed = null;
installed = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle02_1.0.0"); //$NON-NLS-1$
Expand All @@ -244,6 +241,7 @@ public void testInstallLocationWithUnderscores() throws BundleException, IOExcep
}

/** Ensures we see a bundle with only a extension point as a singleton */
@Test
public void testInstallBundleWithExtensionPointOnly() throws BundleException, IOException {
Bundle installed = null;
installed = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle04"); //$NON-NLS-1$
Expand All @@ -264,6 +262,7 @@ public void testInstallBundleWithExtensionPointOnly() throws BundleException, IO
}

/** Ensures we see a bundle with only a extension as a singleton */
@Test
public void testInstallBundleWithExtensionOnly() throws BundleException, IOException {
Bundle installed = null;
installed = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle05"); //$NON-NLS-1$
Expand All @@ -284,6 +283,7 @@ public void testInstallBundleWithExtensionOnly() throws BundleException, IOExcep
}

/** Ensures we see a bundle with only extension and extension point as a singleton */
@Test
public void testInstallBundleWithExtensionAndExtensionPoint() throws BundleException, IOException {
Bundle installed = null;
installed = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle06"); //$NON-NLS-1$
Expand All @@ -304,6 +304,7 @@ public void testInstallBundleWithExtensionAndExtensionPoint() throws BundleExcep
}

/** Ensures two versions of a non-singleton bundle are accepted */
@Test
public void testInstall2NonSingletonBundles() throws BundleException, IOException {
Bundle installed1 = org.eclipse.core.tests.harness.BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle07"); //$NON-NLS-1$
ServiceReference packageAdminSR = OSGiTestsActivator.getContext().getServiceReference(PackageAdmin.class.getName());
Expand All @@ -327,6 +328,7 @@ public void testInstall2NonSingletonBundles() throws BundleException, IOExceptio
}

/** Ensures two versions of a singleton bundle are accepted */
@Test
public void testInstall2SingletonBundles() throws BundleException, IOException {
Bundle installed1 = BundleTestingHelper.installBundle(OSGiTestsActivator.getContext(), OSGiTestsActivator.TEST_FILES_ROOT + "internal/plugins/installTests/bundle08"); //$NON-NLS-1$
ServiceReference packageAdminSR = OSGiTestsActivator.getContext().getServiceReference(PackageAdmin.class.getName());
Expand Down
Loading

0 comments on commit 60a2e63

Please sign in to comment.