stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8274642: jdk/jshell/CommandCompletionTest.java fails with NoSuchElementException after JDK-8271287

Browse Source 
Reviewed-by: jlahoda
This commit is contained in:
Christoph Langer 2021-10-05 21:06:52 +00:00
parent 83b2219220
commit 47262670f3
1 changed files with 8 additions and 2 deletions

10
test/langtools/jdk/jshell/CommandCompletionTest.java

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -49,10 +49,13 @@ import java.util.stream.Collectors;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
import org.testng.SkipException;
import org.testng.annotations.Test;
import jdk.internal.jshell.tool.JShellTool;
import jdk.internal.jshell.tool.JShellToolBuilder;
import jdk.jshell.SourceCodeAnalysis.Suggestion;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
import static org.testng.Assert.fail;
@ -337,7 +340,10 @@ public class CommandCompletionTest extends ReplToolTesting {
selectedFile = content.filter(CLASSPATH_FILTER)
.findAny()
.map(file -> file.getFileName().toString())
.get();
.orElse(null);
}
if (selectedFile == null) {
throw new SkipException("No suitable file(s) found for this test in " + home);
}
try (Stream<Path> content = Files.list(home)) {
completions = content.filter(CLASSPATH_FILTER)