[569656] Update test to use the actual default Java source folder
Signed-off-by: Nitin Dahyabhai <thatnitind@gmail.com>
Change-Id: I621097058b88dc0a4a51d23d1039cf3868a32ecc
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 e5cc029..328989f 100644
--- a/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.jsf.tests.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.jst.jsf.tests.feature"
label="%featureName"
- version="3.5.102.qualifier"
+ version="3.5.103.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 a345fa3..3fa0349 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.102-SNAPSHOT</version>
+ <version>3.5.103-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF
index fa30004..570abba 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jst.jsf.context.symbol.tests; singleton:=true
-Bundle-Version: 1.5.0.qualifier
+Bundle-Version: 1.5.100.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -14,6 +14,7 @@
org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jst.jsf.core.tests;bundle-version="[1.0.0,2.0.0)",
org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.10.0,2.0.0)",
org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)",
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
index 5da02a9..cb739bd 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/pom.xml
@@ -23,7 +23,7 @@
<groupId>org.eclipse.webtools.jsf</groupId>
<artifactId>org.eclipse.jst.jsf.context.symbol.tests</artifactId>
- <version>1.5.0-SNAPSHOT</version>
+ <version>1.5.100-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
<build>
diff --git a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java
index 6b40be2..a6226d4 100644
--- a/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java
+++ b/jsf/tests/org.eclipse.jst.jsf.context.symbol.tests/src/org/eclipse/jst/jsf/context/symbol/tests/ModelBaseTestCase.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2009 Oracle Corporation.
+ * Copyright (c) 2007, 2021 Oracle 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
@@ -17,9 +17,8 @@
import java.util.List;
import java.util.Map;
-import junit.framework.TestCase;
-
import org.eclipse.jdt.core.IType;
+import org.eclipse.jst.common.project.facet.core.internal.FacetCorePlugin;
import org.eclipse.jst.jsf.context.symbol.IBeanInstanceSymbol;
import org.eclipse.jst.jsf.context.symbol.IJavaTypeDescriptor2;
import org.eclipse.jst.jsf.context.symbol.IPropertySymbol;
@@ -30,6 +29,8 @@
import org.eclipse.jst.jsf.test.util.WebProjectTestEnvironment;
import org.osgi.framework.Bundle;
+import junit.framework.TestCase;
+
/**
* @author cbateman
*
@@ -44,7 +45,7 @@
/**
* The base source folder name for Java classes
*/
- protected final static String srcFolderName = "src";
+ protected final static String srcFolderName = FacetCorePlugin.DEFAULT_SOURCE_FOLDER;
protected void setUp() throws Exception
{
