[1.8] Make test results more deterministic

2 files changed, 13 insertions, 5 deletions

diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR335ClassFileTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR335ClassFileTest.java
index 89660cd736..cf9791b098 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR335ClassFileTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JSR335ClassFileTest.java
@@ -2756,15 +2756,19 @@ public void test430015() throws IOException, ClassFormatException {
 				"    }\n" +
 				"    public static void main(String[] args) {\n" +
 				"        Method[] methods = X.class.getDeclaredMethods();\n" +
-				"        Parameter[] parameters = methods[2].getParameters();\n" +
-				"        System.out.println(Arrays.asList(parameters));\n" +
+				"        for (Method method : methods) {\n" +
+				"        	if (method.getName().contains(\"lambda\")) {\n" +
+				"         		Parameter[] parameters = methods[2].getParameters();\n" +
+				"        		System.out.println(Arrays.asList(parameters));\n" +
+				"        	}\n" +
+				"        }\n" +
 				"    }\n" +
 				"}\n"
 			},
 			"[int arg0]");
 		
 		String expectedOutput =
-				"  // Method descriptor #61 (I)V\n" + 
+				"  // Method descriptor #78 (I)V\n" + 
 				"  // Stack: 0, Locals: 1\n" + 
 				"  private static synthetic void lambda$0(int i);\n" + 
 				"    0  return\n" + 
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
index 20f20c996b..b487b5d09c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/LambdaExpressionsTest.java
@@ -3731,8 +3731,12 @@ public void test430015() {
 				"    }\n" +
 				"    public static void main(String[] args) {\n" +
 				"        Method[] methods = X.class.getDeclaredMethods();\n" +
-				"        Parameter[] parameters = methods[2].getParameters();\n" +
-				"        System.out.println(Arrays.asList(parameters));\n" +
+				"        for (Method method : methods) {\n" +
+				"        	if (method.getName().contains(\"lambda\")) {\n" +
+				"         		Parameter[] parameters = methods[2].getParameters();\n" +
+				"        		System.out.println(Arrays.asList(parameters));\n" +
+				"        	}\n" +
+				"        }\n" +
 				"    }\n" +
 				"}\n"
 			},