diff options
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java (renamed from bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/classloader/hooks/a/TestHookConfigurator.java) | 4 | ||||
| -rwxr-xr-x | bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java (renamed from bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/wrapper/hooks/a/TestHookConfigurator.java) | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/pom.xml | 85 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java | 10 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java | 4 | ||||
| -rw-r--r-- | bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java | 4 |
6 files changed, 59 insertions, 52 deletions
diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/classloader/hooks/a/TestHookConfigurator.java b/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java index 796f9b49a..0259d4fd2 100644 --- a/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/classloader/hooks/a/TestHookConfigurator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 IBM Corporation and others. + * Copyright (c) 2013, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package classloader.hooks.a; +package org.eclipse.osgi.tests.classloader.hooks.a; import org.eclipse.osgi.internal.hookregistry.*; import org.eclipse.osgi.internal.loader.classpath.ClasspathEntry; diff --git a/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/wrapper/hooks/a/TestHookConfigurator.java b/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java index 6975591f3..1295d78a8 100755 --- a/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/wrapper/hooks/a/TestHookConfigurator.java +++ b/bundles/org.eclipse.osgi.tests/bundles_src/wrapper.hooks.a/org/eclipse/osgi/tests/wrapper/hooks/a/TestHookConfigurator.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 IBM Corporation and others. + * Copyright (c) 2015, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -8,7 +8,7 @@ * Contributors: * IBM Corporation - initial API and implementation *******************************************************************************/ -package wrapper.hooks.a; +package org.eclipse.osgi.tests.wrapper.hooks.a; import java.io.*; import java.net.*; diff --git a/bundles/org.eclipse.osgi.tests/pom.xml b/bundles/org.eclipse.osgi.tests/pom.xml index 33b113bd5..6f101afe5 100644 --- a/bundles/org.eclipse.osgi.tests/pom.xml +++ b/bundles/org.eclipse.osgi.tests/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright (c) 2012 Eclipse Foundation. + Copyright (c) 2012, 2016 Eclipse Foundation. All rights reserved. This program and the accompanying materials are made available under the terms of the Eclipse Distribution License v1.0 which accompanies this distribution, and is available at @@ -25,6 +25,8 @@ <properties> <defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars> <code.ignoredWarnings>${tests.ignoredWarnings}</code.ignoredWarnings> + <testSuite>${project.artifactId}</testSuite> + <testClass>org.eclipse.osgi.tests.AutomatedTests</testClass> </properties> <build> @@ -34,52 +36,57 @@ <artifactId>tycho-surefire-plugin</artifactId> <version>${tycho.version}</version> <configuration> - <testFramework>org.junit</testFramework> - <testSuite>org.eclipse.osgi.tests</testSuite> - <testClass>org.eclipse.osgi.tests.AutomatedTests</testClass> + <argLine>-Xmx128m -Dosgi.framework.extensions=reference:file:${basedir}/../org.eclipse.osgi.compatibility.plugins/target/org.eclipse.osgi.compatibility.plugins-1.0.0-SNAPSHOT.jar</argLine> <dependencies> <dependency> - <artifactId>org.eclipse.jdt.junit4.runtime</artifactId> - <type>eclipse-plugin</type> - </dependency> - <dependency> + <type>p2-installable-unit</type> <artifactId>org.eclipse.equinox.event</artifactId> - <type>eclipse-plugin</type> - </dependency> - <dependency> - <artifactId>org.eclipse.equinox.ds</artifactId> - <type>eclipse-plugin</type> </dependency> </dependencies> </configuration> </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho.version}</version> + <configuration> + <dependency-resolution> + <extraRequirements> + <requirement> + <id>org.eclipse.update.configurator</id> + <type>p2-installable-unit</type> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <id>org.eclipse.osgi.compatibility.plugins</id> + <type>p2-installable-unit</type> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <id>org.eclipse.osgi.compatibility.state</id> + <type>p2-installable-unit</type> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <id>org.eclipse.jdt.junit.runtime</id> + <type>p2-installable-unit</type> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <id>org.eclipse.jdt.junit4.runtime</id> + <type>p2-installable-unit</type> + <versionRange>0.0.0</versionRange> + </requirement> + <requirement> + <id>org.eclipse.pde.junit.runtime</id> + <type>p2-installable-unit</type> + <versionRange>0.0.0</versionRange> + </requirement> + </extraRequirements> + </dependency-resolution> + </configuration> + </plugin> </plugins> </build> - <profiles> - <profile> - <id>osx</id> - <activation> - <property> - <name>java.vendor.url</name> - <value>http://www.apple.com/</value> - </property> - </activation> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.eclipse.tycho</groupId> - <artifactId>tycho-surefire-plugin</artifactId> - <version>${tycho.version}</version> - <configuration> - <argLine>-Xmx512m -XX:MaxPermSize=256m -XstartOnFirstThread</argLine> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - </profile> - </profiles> - </project> diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java index 599640336..16b5971f3 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/BundleInstaller.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2006, 2008 IBM Corporation and others. + * Copyright (c) 2006, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -73,9 +73,9 @@ public class BundleInstaller { String getBundleLocation0(String name) throws BundleException { String bundleFileName = rootLocation + "/" + name; - URL bundleURL = context.getBundle().getEntry(bundleFileName); + URL bundleURL = context.getBundle().getEntry(bundleFileName + ".jar"); if (bundleURL == null) - bundleURL = context.getBundle().getEntry(bundleFileName + ".jar"); + bundleURL = context.getBundle().getEntry(bundleFileName); if (bundleURL == null) throw new BundleException("Could not find bundle to install at: " + name); try { @@ -96,9 +96,9 @@ public class BundleInstaller { if (fromBundle == null) throw new BundleException("The bundle to update does not exist!! " + fromName); String bundleFileName = rootLocation + "/" + toName; - URL bundleURL = context.getBundle().getEntry(bundleFileName); + URL bundleURL = context.getBundle().getEntry(bundleFileName + ".jar"); if (bundleURL == null) - bundleURL = context.getBundle().getEntry(bundleFileName + ".jar"); + bundleURL = context.getBundle().getEntry(bundleFileName); try { bundleURL = ((URLConverter) converter.getService()).resolve(bundleURL); } catch (IOException e) { diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java index cb791c238..6ae583cdd 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/BundleFileWrapperFactoryHookTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2015 IBM Corporation and others. + * Copyright (c) 2015, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -23,7 +23,7 @@ import org.osgi.framework.launch.Framework; public class BundleFileWrapperFactoryHookTests extends AbstractFrameworkHookTests { private static final String TEST_BUNDLE = "substitutes.a"; private static final String HOOK_CONFIGURATOR_BUNDLE = "wrapper.hooks.a"; - private static final String HOOK_CONFIGURATOR_CLASS = "wrapper.hooks.a.TestHookConfigurator"; + private static final String HOOK_CONFIGURATOR_CLASS = "org.eclipse.osgi.tests.wrapper.hooks.a.TestHookConfigurator"; private Map<String, String> configuration; private Framework framework; diff --git a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java index dca69ae12..56d2b76e1 100644 --- a/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java +++ b/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/hooks/framework/ClassLoaderHookTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2013 IBM Corporation and others. + * Copyright (c) 2013, 2016 IBM Corporation and others. * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at @@ -29,7 +29,7 @@ public class ClassLoaderHookTests extends AbstractFrameworkHookTests { private static final String TEST_BUNDLE = "substitutes.a"; private static final String TEST_CLASSNAME = "substitutes.x.Ax"; private static final String HOOK_CONFIGURATOR_BUNDLE = "classloader.hooks.a"; - private static final String HOOK_CONFIGURATOR_CLASS = "classloader.hooks.a.TestHookConfigurator"; + private static final String HOOK_CONFIGURATOR_CLASS = "org.eclipse.osgi.tests.classloader.hooks.a.TestHookConfigurator"; private static final String REJECT_PROP = "classloader.hooks.a.reject"; private static final String BAD_TRANSFORM_PROP = "classloader.hooks.a.bad.transform"; |