Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply project settings to o.e.osgi.tests #325

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi.tests/META-INF/services/javax.print.PrintServiceLookup
100755 → 100644
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# just a test
# just a test
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi.tests/about.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ <h3>License</h3>
</p>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion bundles/org.eclipse.osgi.tests/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -416,4 +416,4 @@ jars.compile.order = bundle_tests/ext.framework.b.jar,\
bundle_tests/test.dynamic.privateimport.jar,\
bundle_tests/test.bug490902.b.jar,\
bundle_tests/test.bug490902.a.jar,\
bundle_tests/mrBundleInputBase.jar
bundle_tests/mrBundleInputBase.jar
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.dependent.a.test1
buddy.dependent.a.test1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.dependent.a.test1
buddy.dependent.a.test1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.dependent.a.test2
buddy.dependent.a.test2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.dependent.a.test2
buddy.dependent.a.test2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.dependent.a
buddy.dependent.a
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.registered.a.test1
buddy.registered.a.test1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.registered.a.test1
buddy.registered.a.test1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.registered.a.test2
buddy.registered.a.test2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.registered.a.test2
buddy.registered.a.test2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
buddy.registered.a
buddy.registered.a
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

import chain.test.b.BChain;

public class AChain extends BChain{
public class AChain extends BChain {

}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*******************************************************************************/
package chain.test.a;


public interface AMultiChain2 {
//
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*******************************************************************************/
package chain.test.b;


public interface BMultiChain1 {
//
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
import chain.test.c.CMultipleChain2;
import chain.test.d.DMultipleChain1;

public interface BMultiChain2 extends CMultipleChain2, DMultipleChain1{
public interface BMultiChain2 extends CMultipleChain2, DMultipleChain1 {
//
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
private static final String FILTER_CLASS_PATHS = "classloader.hooks.a.filter.class.paths";
private static final String PREVENT_RESOURCE_LOAD_PRE = "classloader.hooks.a.fail.resource.load.pre";
private static final String PREVENT_RESOURCE_LOAD_POST = "classloader.hooks.a.fail.resource.load.post";
final ThreadLocal<Boolean> doingRecursionLoad = new ThreadLocal<Boolean>() {

Check warning on line 34 in bundles/org.eclipse.osgi.tests/bundles_src/classloader.hooks.a/org/eclipse/osgi/tests/classloader/hooks/a/TestHookConfigurator.java

View check run for this annotation

Jenkins - Eclipse Equinox / Java Compiler

tycho-compiler:compile

NORMAL:
@Override
protected Boolean initialValue() {
return false;
Expand All @@ -42,14 +42,16 @@
hookRegistry.addClassLoaderHook(new ClassLoaderHook() {

@Override
public boolean rejectTransformation(String name, byte[] transformedBytes, ClasspathEntry classpathEntry, BundleEntry entry, ClasspathManager manager) {
public boolean rejectTransformation(String name, byte[] transformedBytes, ClasspathEntry classpathEntry,
BundleEntry entry, ClasspathManager manager) {
return Boolean.getBoolean(REJECT_PROP);
}

@Override
public byte[] processClass(String name, byte[] classbytes, ClasspathEntry classpathEntry, BundleEntry entry, ClasspathManager manager) {
public byte[] processClass(String name, byte[] classbytes, ClasspathEntry classpathEntry, BundleEntry entry,
ClasspathManager manager) {
if (Boolean.getBoolean(BAD_TRANSFORM_PROP)) {
return new byte[] {'b', 'a', 'd', 'b', 'y', 't', 'e', 's'};
return new byte[] { 'b', 'a', 'd', 'b', 'y', 't', 'e', 's' };
}
if (Boolean.getBoolean(RECURSION_LOAD)) {
if (isProcessClassRecursionSupported() && doingRecursionLoad.get()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
* IBM Corporation - initial API and implementation
*******************************************************************************/
package exporter.importer;

import exporter.importer.test.Test3;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ public class Activator implements BundleActivator {

public void start(BundleContext context) throws Exception {
AbstractBundleTests.simpleResults.addEvent(new ExtClasspathExtTest().toString());
AbstractBundleTests.simpleResults.addEvent(getURLContent(this.getClass().getResource("/ext/extclasspath/a/extresource.txt"))); //$NON-NLS-1$
AbstractBundleTests.simpleResults
.addEvent(getURLContent(this.getClass().getResource("/ext/extclasspath/a/extresource.txt"))); //$NON-NLS-1$
}

private String getURLContent(URL resource) throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public class Activator implements BundleActivator {

public void start(BundleContext context) throws Exception {
AbstractBundleTests.simpleResults.addEvent(new FrameworkExtTest().testIt("success")); //$NON-NLS-1$
AbstractBundleTests.simpleResults.addEvent(getURLContent(this.getClass().getResource("/ext/framework/a/fwkresource.txt"))); //$NON-NLS-1$
AbstractBundleTests.simpleResults
.addEvent(getURLContent(this.getClass().getResource("/ext/framework/a/fwkresource.txt"))); //$NON-NLS-1$
ExtensionBundleTests.events.add(context.getBundle().getSymbolicName() + " STARTED");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@ public class Activator implements BundleActivator {

public void start(BundleContext context) throws Exception {
AbstractBundleTests.simpleResults.addEvent(new FrameworkExtTest().testIt("success")); //$NON-NLS-1$
AbstractBundleTests.simpleResults.addEvent(getURLContent(this.getClass().getResource("/ext/framework/a/fwkresource.txt"))); //$NON-NLS-1$
AbstractBundleTests.simpleResults
.addEvent(getURLContent(this.getClass().getResource("/ext/framework/a/fwkresource.txt"))); //$NON-NLS-1$
ExtensionBundleTests.events.add(context.getBundle().getSymbolicName() + " STARTED");
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ private TestCondition(String id, boolean mutable, boolean postponed, boolean sat

static public Condition getCondition(final Bundle bundle, ConditionInfo info) {
if (!TestCondition.class.getName().equals(info.getType()))
throw new IllegalArgumentException("ConditionInfo must be of type \"" + TestCondition.class.getName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
throw new IllegalArgumentException(
"ConditionInfo must be of type \"" + TestCondition.class.getName() + "\""); //$NON-NLS-1$ //$NON-NLS-2$
String[] args = info.getArgs();
if (args.length != 4)
throw new IllegalArgumentException("Illegal number of args: " + args.length); //$NON-NLS-1$
Expand Down Expand Up @@ -109,7 +110,9 @@ public boolean equals(Object o) {
if (!(o instanceof TestCondition))
return false;
TestCondition otherCondition = (TestCondition) o;
return id.equals(otherCondition.id) && postponed == otherCondition.postponed && satisfied == otherCondition.satisfied && mutable == otherCondition.mutable && bundle == otherCondition.bundle;
return id.equals(otherCondition.id) && postponed == otherCondition.postponed
&& satisfied == otherCondition.satisfied && mutable == otherCondition.mutable
&& bundle == otherCondition.bundle;
}

public void setMutable(boolean mutable) {
Expand Down
Empty file.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

import org.eclipse.osgi.tests.bundles.ITestRunner;

public class TestPackageAccess implements ITestRunner{
public class TestPackageAccess implements ITestRunner {

@Override
public Object testIt() throws Exception {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
*******************************************************************************/
package fragment.test.attach.frag.b;


public class Test {

}
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ public void start(BundleContext context) throws Exception {
try {
new URL(url.getProtocol(), url.getHost(), url.getFile());
} catch (MalformedURLException e2) {
// unexpected; the handler does not get involved and we have a multiplexor cached
// unexpected; the handler does not get involved and we have a multiplexor
// cached
throw new RuntimeException("Could not create URL from parts: " + url);
}
url.toExternalForm();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

import org.eclipse.osgi.tests.bundles.ITestRunner;
import legacy.lazystart.c.CTest;

public class FalseExceptionLegacy2 implements ITestRunner {

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.eclipse.osgi.tests.bundles.ITestRunner;
import legacy.lazystart.b.excluded.a.BAExcluded;
import legacy.lazystart.b.excluded.b.BBExcluded;

public class TrueExceptionLegacy1 implements ITestRunner {

@Override
Expand Down
Empty file.
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Import-Package: pkg10
Require-Capability: cap10
Require-Capability: cap10
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Import-Package: pkg11
Require-Capability: cap11
Require-Capability: cap11
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Import-Package: pkg8
Require-Capability: cap8
Require-Capability: cap8
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
Import-Package: pkg9
Require-Capability: cap9
Require-Capability: cap9
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 10
ADD 10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 11
ADD 11
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 08
ADD 08
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 09
ADD 09
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 10
ADD 10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 11
ADD 11
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 08
ADD 08
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 09
ADD 09
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 10
ADD 10
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 11
ADD 11
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 08
ADD 08
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ADD 09
ADD 09
Original file line number Diff line number Diff line change
@@ -1 +1 @@
RESOURCE XX
RESOURCE XX
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
1
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,8 @@ public void start(BundleContext context) throws Exception {
Method findLibrary = findDeclaredMethod(this.getClass().getClassLoader().getClass(), "findLibrary",
String.class);
findLibrary.setAccessible(true);
AbstractBundleTests.simpleResults.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] {"nativefile1.txt"}));
AbstractBundleTests.simpleResults
.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] { "nativefile1.txt" }));
}

public void stop(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public void start(BundleContext context) throws Exception {
Method findLibrary = findDeclaredMethod(this.getClass().getClassLoader().getClass(), "findLibrary",
String.class);
findLibrary.setAccessible(true);
AbstractBundleTests.simpleResults.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] {"nativefile2.txt"}));
AbstractBundleTests.simpleResults
.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] { "nativefile2.txt" }));
}

public void stop(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public void start(BundleContext context) throws Exception {
Method findLibrary = findDeclaredMethod(this.getClass().getClassLoader().getClass(), "findLibrary",
String.class);
findLibrary.setAccessible(true);
AbstractBundleTests.simpleResults.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] {"nativefile.txt"}));
AbstractBundleTests.simpleResults
.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] { "nativefile.txt" }));
}

public void stop(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1
1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ public void start(BundleContext context) throws Exception {
Method findLibrary = findDeclaredMethod(this.getClass().getClassLoader().getClass(), "findLibrary",
String.class);
findLibrary.setAccessible(true);
AbstractBundleTests.simpleResults.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] {"nativefile.txt"}));
AbstractBundleTests.simpleResults
.addEvent(findLibrary.invoke(this.getClass().getClassLoader(), new Object[] { "nativefile.txt" }));
}

public void stop(BundleContext context) throws Exception {
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
libs.test3
libs.test3
Loading
Loading