Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin Dahyabhai2021-03-17 21:28:22 -0400
committerNitin Dahyabhai2021-03-17 21:28:22 -0400
commit296a6b713bdffb9a2a6e82ddb0ee766f546b7d3e (patch)
treeb73d8434876e5ae384bfd4c99c49b93db5108ae9
parente4154574231aa1fb4ac11d9090cb162b2887dad6 (diff)
downloadwebtools.sourceediting-296a6b713bdffb9a2a6e82ddb0ee766f546b7d3e.tar.gz
webtools.sourceediting-296a6b713bdffb9a2a6e82ddb0ee766f546b7d3e.tar.xz
webtools.sourceediting-296a6b713bdffb9a2a6e82ddb0ee766f546b7d3e.zip
[457134] Respond to removal of IPlatformRunnable
-rw-r--r--xml/tests/org.eclipse.wst.xml.core.tests/.classpath8
-rw-r--r--xml/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs9
-rw-r--r--xml/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF4
-rw-r--r--xml/tests/org.eclipse.wst.xml.core.tests/pom.xml2
-rw-r--r--xml/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java21
5 files changed, 33 insertions, 11 deletions
diff --git a/xml/tests/org.eclipse.wst.xml.core.tests/.classpath b/xml/tests/org.eclipse.wst.xml.core.tests/.classpath
index ec8dfbe5cd..4fde217b25 100644
--- a/xml/tests/org.eclipse.wst.xml.core.tests/.classpath
+++ b/xml/tests/org.eclipse.wst.xml.core.tests/.classpath
@@ -1,11 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="org/eclipse/wst/**"/>
</accessrules>
</classpathentry>
- <classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="src">
+ <attributes>
+ <attribute name="test" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/xml/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs b/xml/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
index f1e6bba920..3816ada2e8 100644
--- a/xml/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/xml/tests/org.eclipse.wst.xml.core.tests/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@ org.eclipse.jdt.core.circularClasspath=error
org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -52,6 +53,7 @@ org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -74,6 +76,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.incompatibleJDKLevel=ignore
org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/xml/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF b/xml/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
index 280c8ca796..4c31eba6ee 100644
--- a/xml/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
+++ b/xml/tests/org.eclipse.wst.xml.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.wst.xml.core.tests; singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
Bundle-Activator: org.eclipse.wst.xml.core.tests.SSEModelXMLTestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
@@ -31,5 +31,5 @@ Require-Bundle: org.eclipse.core.runtime,
com.ibm.icu,
org.eclipse.wst.common.uriresolver
Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
Bundle-ActivationPolicy: lazy
diff --git a/xml/tests/org.eclipse.wst.xml.core.tests/pom.xml b/xml/tests/org.eclipse.wst.xml.core.tests/pom.xml
index 31f991d625..3bd499fd5b 100644
--- a/xml/tests/org.eclipse.wst.xml.core.tests/pom.xml
+++ b/xml/tests/org.eclipse.wst.xml.core.tests/pom.xml
@@ -21,7 +21,7 @@
<groupId>org.eclipse.webtools.sourceediting</groupId>
<artifactId>org.eclipse.wst.xml.core.tests</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<properties>
diff --git a/xml/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java b/xml/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
index 5ec3ac040a..0edde57293 100644
--- a/xml/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
+++ b/xml/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/contentmodel/CMVisitorTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2004, 2017 IBM Corporation and others.
+ * Copyright (c) 2004, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -12,10 +12,13 @@
*******************************************************************************/
package org.eclipse.wst.xml.core.tests.contentmodel;
+import java.util.Map;
+
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
-import org.eclipse.core.runtime.IPlatformRunnable;
+import org.eclipse.equinox.app.IApplication;
+import org.eclipse.equinox.app.IApplicationContext;
import org.eclipse.wst.xml.core.internal.contentmodel.CMNode;
import org.eclipse.wst.xml.core.internal.contentmodel.modelquery.ModelQuery;
import org.eclipse.wst.xml.core.internal.contentmodel.modelqueryimpl.ModelQueryImpl;
@@ -27,7 +30,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-public class CMVisitorTest implements IPlatformRunnable {
+public class CMVisitorTest implements IApplication {
public Object run(Object a) {
String args[] = (String[]) a;
if (args.length > 0) {
@@ -100,4 +103,16 @@ public class CMVisitorTest implements IPlatformRunnable {
}
System.out.println(string);
}
+
+ @Override
+ public Object start(IApplicationContext context) throws Exception {
+ context.applicationRunning();
+ @SuppressWarnings("unchecked")
+ Map<String, Object> contextArguments = context.getArguments();
+ return run(contextArguments.get(IApplicationContext.APPLICATION_ARGS));
+ }
+
+ @Override
+ public void stop() {
+ }
}

Back to the top