Bug 526337 - support building & running tests with Tycho 1.0
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
index b60f420..1783f47 100644
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.jst.jsf.tests.feature"
label="%featureName"
- version="3.5.1.qualifier"
+ version="3.5.100.qualifier"
provider-name="%providerName"
image="eclipse_update_120.jpg"
license-feature="org.eclipse.license"
diff --git a/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml b/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
index 354d35b..ae6c406 100644
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
+++ b/jsf/features/org.eclipse.jst.jsf.tests.feature/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.jsf</groupId>
<artifactId>org.eclipse.jst.jsf.tests.feature</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.5.100-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF
index e2037e3..f43479b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.jsf.core.tests;singleton:=true
-Bundle-Version: 1.5.100.qualifier
+Bundle-Version: 1.5.110.qualifier
Bundle-Activator: org.eclipse.jst.jsf.core.tests.TestsPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: plugin
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
index e018e3a..2b8e341 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.eclipse.webtools.jsf</groupId>
<artifactId>org.eclipse.jst.jsf.core.tests</artifactId>
- <version>1.5.100-SNAPSHOT</version>
+ <version>1.5.110-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/validation/MockValidationReporter.java b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/validation/MockValidationReporter.java
index a948679..1825e6e 100644
--- a/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/validation/MockValidationReporter.java
+++ b/jsf/tests/org.eclipse.jst.jsf.core.tests/src/org/eclipse/jst/jsf/core/tests/validation/MockValidationReporter.java
@@ -122,7 +122,7 @@
}
Assert.fail(String.format(
"Failed to find expected message at offset %d%s, length %d, found instead %s"
- , offset, length, (code == null ? "" : ", with errorCode "+code), failMessage));
+ , offset, (code == null ? "" : ", with errorCode "+code), length, failMessage));
}
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.test.util/META-INF/MANIFEST.MF
index ee45be4..c9fa105 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.eclipse.jst.jsf.test.util
-Bundle-Version: 1.5.100.qualifier
+Bundle-Version: 1.5.110.qualifier
Bundle-Activator: org.eclipse.jst.jsf.test.util.Activator
Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml b/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
index c3558c0..5f2210b 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.jsf</groupId>
<artifactId>org.eclipse.jst.jsf.test.util</artifactId>
- <version>1.5.100-SNAPSHOT</version>
+ <version>1.5.110-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockJavaProject.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockJavaProject.java
index 3de325d..abb076f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockJavaProject.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockJavaProject.java
@@ -12,6 +12,7 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IModuleDescription;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.IRegion;
@@ -434,6 +435,14 @@
}
+ public IModuleDescription findModule(String moduleName, WorkingCopyOwner owner) throws JavaModelException {
+ throw new UnsupportedOperationException();
+ }
+
+ public IModuleDescription getModuleDescription() throws JavaModelException {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public boolean equals(Object o)
{
diff --git a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockPackageFragmentRoot.java b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockPackageFragmentRoot.java
index aaf7be0..55b3b9f 100644
--- a/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockPackageFragmentRoot.java
+++ b/jsf/tests/org.eclipse.jst.jsf.test.util/src/org/eclipse/jst/jsf/test/util/mock/java/MockPackageFragmentRoot.java
@@ -6,6 +6,7 @@
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaElement;
import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IModuleDescription;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IPackageFragmentRoot;
import org.eclipse.jdt.core.JavaModelException;
@@ -162,6 +163,10 @@
throw new UnsupportedOperationException();
}
+ public IModuleDescription getModuleDescription() {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public boolean equals(final Object o)
{
@@ -204,4 +209,5 @@
// }
return buffer.toString();
}
+
}