Skip to content

Commit 18c23e3

Browse files
authored
Build with tests running on Windows
* Fix test-projects content for testing on Win * Majority of tests fixes on Win * Maven wrapper to maven 3.9.9 * Doc URI changes for Win to revisit. All tests pass * Disable a few tests on Win until JDT Core 3.41 * Wrap up questionable changes
1 parent 824e48c commit 18c23e3

File tree

221 files changed

+18454
-18278
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+18454
-18278
lines changed
-61.1 KB
Binary file not shown.

headless-services/.mvn/wrapper/maven-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,6 @@
1414
# KIND, either express or implied. See the License for the
1515
# specific language governing permissions and limitations
1616
# under the License.
17-
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip
18-
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
17+
wrapperVersion=3.3.2
18+
distributionType=only-script
19+
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/ClasspathTestUtil.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
*******************************************************************************/
1111
package org.springframework.ide.vscode.languageserver.testharness;
1212

13+
import java.io.File;
1314
import java.nio.file.Path;
1415
import java.nio.file.Paths;
1516

@@ -19,10 +20,12 @@
1920

2021
public class ClasspathTestUtil {
2122

23+
public static final String MAIN_JAVA = "main" + File.separatorChar + "java";
24+
2225
public static Path getOutputFolder(IJavaProject jp) throws Exception {
2326
for (CPE cpe : jp.getClasspath().getClasspathEntries()) {
2427
if (Classpath.isSource(cpe)) {
25-
if (cpe.getPath().endsWith("main/java")) {
28+
if (cpe.getPath().endsWith(MAIN_JAVA)) {
2629
return Paths.get(cpe.getOutputFolder());
2730
}
2831
}

headless-services/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/LanguageServerHarness.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ public String createTempUri(String extension) throws Exception {
766766
if (extension == null) {
767767
extension = getFileExtension();
768768
}
769-
return File.createTempFile("workingcopy", extension).toURI().toASCIIString();
769+
return File.createTempFile("workingcopy", extension).toPath().toUri().toASCIIString();
770770
}
771771

772772
public void assertCompletion(String textBefore, String expectTextAfter) throws Exception {

0 commit comments

Comments
 (0)