diff options
| author | Sarika Sinha | 2017-11-29 06:34:15 +0000 |
|---|---|---|
| committer | Sarika Sinha | 2017-11-29 06:34:15 +0000 |
| commit | 0556fe386d619feaa523384aa437062745976ac3 (patch) | |
| tree | 2e77798a86722ddbf0364b09bf8f0cb1a16e2e63 | |
| parent | 2c093ebc8e8d00693c6f9e9330bd0fae7faa36c1 (diff) | |
| download | eclipse.jdt.debug-0556fe386d619feaa523384aa437062745976ac3.tar.gz eclipse.jdt.debug-0556fe386d619feaa523384aa437062745976ac3.tar.xz eclipse.jdt.debug-0556fe386d619feaa523384aa437062745976ac3.zip | |
Bug 527861 - [9] JarSourceLookupTests.testTranslateContainers fails whenI20171130-2100I20171130-2000I20171129-2000
run on JDK 9
Change-Id: Ia1402e66d8d1512697d3430717cbcc87587a6050
| -rw-r--r-- | org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java index ab1479089..6124c200c 100644 --- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java +++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/sourcelookup/JarSourceLookupTests.java @@ -136,7 +136,12 @@ public class JarSourceLookupTests extends AbstractDebugTest { createLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR); ILaunchConfiguration config = getLaunchConfiguration(fgJarProject, LAUNCHCONFIGURATIONS, A_RUN_JAR); IRuntimeClasspathEntry[] entries = JavaRuntime.computeUnresolvedSourceLookupPath(config); - assertEquals("There should be 2 containers returned (JRE and classpath)", 2, entries.length); + if (JavaRuntime.isModularConfiguration(config)) { + // JRE Container is also part of it from Java 9 onwards + assertEquals("There should be 3 containers returned (JRE and classpath)", 3, entries.length); + } else { + assertEquals("There should be 2 containers returned (JRE and classpath)", 2, entries.length); + } IRuntimeClasspathEntry[] resolved = JavaRuntime.resolveSourceLookupPath(entries, config); ISourceContainer[] containers = JavaSourceLookupUtil.translate(resolved); try { |