View | Details | Raw Unified | Return to bug 59891 | Differences between
and this patch

Collapse All | Expand All

(-)ui/org/eclipse/jdt/ui/tests/core/source/GenerateToStringTest.java (-4 / +4 lines)
Lines 1706-1713 Link Here
1706
				+ "	public String toString() {\r\n"
1706
				+ "	public String toString() {\r\n"
1707
				+ "		final int maxLen = 10;\r\n"
1707
				+ "		final int maxLen = 10;\r\n"
1708
				+ "		StringBuffer buffer = new StringBuffer();\r\n"
1708
				+ "		StringBuffer buffer = new StringBuffer();\r\n"
1709
				+ "		buffer.append(\"A [AArray=\").append(AArray != null ? arrayToString(AArray, AArray.length, maxLen) : null).append(\", aBool=\").append(aBool).append(\", anA=\").append(anA).append(\", floatArray=\").append(floatArray != null ? arrayToString(floatArray, floatArray.length, maxLen) : null).append(\", hashMap=\").append(hashMap != null ? toString(hashMap.entrySet(), maxLen) : null).append(\", intArray=\").append(intArray != null ? arrayToString(intArray, intArray.length, maxLen) : null).append(\", integerCollection=\").append(integerCollection != null ? toString(integerCollection, maxLen) : null).append(\", list=\").append(list != null ? toString(list, maxLen) : null).append(\", object=\").append(object).append(\", stringArray=\").append(stringArray != null ? arrayToString(stringArray, stringArray.length, maxLen) : null).append(\", wildCollection=\").append(wildCollection != null ? toString(wildCollection, maxLen) : null).append(\", charArrayMethod()=\").append(\r\n"
1709
				+ "		buffer.append(\"A [AArray=\").append(AArray != null ? arrayToString(AArray, AArray.length, maxLen) : null).append(\", aBool=\").append(aBool).append(\", anA=\").append(anA).append(\", floatArray=\").append(floatArray != null ? arrayToString(floatArray, floatArray.length, maxLen) : null).append(\", hashMap=\").append(hashMap != null ? toString(hashMap.entrySet(), maxLen) : null).append(\", intArray=\").append(intArray != null ? arrayToString(intArray, intArray.length, maxLen) : null).append(\", integerCollection=\").append(integerCollection != null ? toString(integerCollection, maxLen) : null).append(\", list=\").append(list != null ? toString(list, maxLen) : null).append(\", object=\").append(object).append(\", stringArray=\").append(stringArray != null ? arrayToString(stringArray, stringArray.length, maxLen) : null).append(\", wildCollection=\").append(wildCollection != null ? toString(wildCollection, maxLen) : null).append(\", charArrayMethod()=\")\r\n"
1710
				+ "				charArrayMethod() != null ? arrayToString(charArrayMethod(), charArrayMethod().length, maxLen) : null).append(\", floatArrayMethod()=\").append(floatArrayMethod() != null ? arrayToString(floatArrayMethod(), floatArrayMethod().length, maxLen) : null).append(\"]\");\r\n"
1710
				+ "				.append(charArrayMethod() != null ? arrayToString(charArrayMethod(), charArrayMethod().length, maxLen) : null).append(\", floatArrayMethod()=\").append(floatArrayMethod() != null ? arrayToString(floatArrayMethod(), floatArrayMethod().length, maxLen) : null).append(\"]\");\r\n"
1711
				+ "		return buffer.toString();\r\n" + "	}\r\n" + "	private String toString(Collection collection, int maxLen) {\r\n" + "		StringBuffer buffer = new StringBuffer();\r\n"
1711
				+ "		return buffer.toString();\r\n" + "	}\r\n" + "	private String toString(Collection collection, int maxLen) {\r\n" + "		StringBuffer buffer = new StringBuffer();\r\n"
1712
				+ "		buffer.append(\"[\");\r\n" + "		int i = 0;\r\n" + "		for (Iterator iterator = collection.iterator(); iterator.hasNext() && i < maxLen; i++) {\r\n" + "			if (i > 0) {\r\n"
1712
				+ "		buffer.append(\"[\");\r\n" + "		int i = 0;\r\n" + "		for (Iterator iterator = collection.iterator(); iterator.hasNext() && i < maxLen; i++) {\r\n" + "			if (i > 0) {\r\n"
1713
				+ "				buffer.append(\", \");\r\n" + "			}\r\n" + "			buffer.append(iterator.next());\r\n" + "		}\r\n" + "		buffer.append(\"]\");\r\n" + "		return buffer.toString();\r\n" + "	}\r\n"
1713
				+ "				buffer.append(\", \");\r\n" + "			}\r\n" + "			buffer.append(iterator.next());\r\n" + "		}\r\n" + "		buffer.append(\"]\");\r\n" + "		return buffer.toString();\r\n" + "	}\r\n"
Lines 2018-2025 Link Here
2018
				+ "	@Override\r\n"
2018
				+ "	@Override\r\n"
2019
				+ "	public String toString() {\r\n"
2019
				+ "	public String toString() {\r\n"
2020
				+ "		final int maxLen = 10;\r\n"
2020
				+ "		final int maxLen = 10;\r\n"
2021
				+ "		return String.format(\"A [AArray=%s, aBool=%s, anA=%s, floatArray=%s, hashMap=%s, intArray=%s, integerCollection=%s, list=%s, object=%s, stringArray=%s, wildCollection=%s, charArrayMethod()=%s, floatArrayMethod()=%s]\", AArray != null ? Arrays.asList(AArray).subList(0, Math.min(AArray.length, maxLen)) : null, aBool, anA, floatArray != null ? Arrays.toString(Arrays.copyOf(floatArray, Math.min(floatArray.length, maxLen))) : null, hashMap != null ? toString(hashMap.entrySet(), maxLen) : null, intArray != null ? Arrays.toString(Arrays.copyOf(intArray, Math.min(intArray.length, maxLen))) : null, integerCollection != null ? toString(integerCollection, maxLen) : null, list != null ? toString(list, maxLen) : null, object, stringArray != null ? Arrays.asList(stringArray).subList(0, Math.min(stringArray.length, maxLen)) : null, wildCollection != null ? toString(wildCollection, maxLen) : null, charArrayMethod() != null ? Arrays.toString(Arrays.copyOf(charArrayMethod(), Math.min(\r\n"
2021
				+ "		return String.format(\"A [AArray=%s, aBool=%s, anA=%s, floatArray=%s, hashMap=%s, intArray=%s, integerCollection=%s, list=%s, object=%s, stringArray=%s, wildCollection=%s, charArrayMethod()=%s, floatArrayMethod()=%s]\", AArray != null ? Arrays.asList(AArray).subList(0, Math.min(AArray.length, maxLen)) : null, aBool, anA, floatArray != null ? Arrays.toString(Arrays.copyOf(floatArray, Math.min(floatArray.length, maxLen))) : null, hashMap != null ? toString(hashMap.entrySet(), maxLen) : null, intArray != null ? Arrays.toString(Arrays.copyOf(intArray, Math.min(intArray.length, maxLen))) : null, integerCollection != null ? toString(integerCollection, maxLen) : null, list != null ? toString(list, maxLen) : null, object, stringArray != null ? Arrays.asList(stringArray).subList(0, Math.min(stringArray.length, maxLen)) : null, wildCollection != null ? toString(wildCollection, maxLen) : null,\r\n"
2022
				+ "				charArrayMethod().length, maxLen))) : null, floatArrayMethod() != null ? Arrays.toString(Arrays.copyOf(floatArrayMethod(), Math.min(floatArrayMethod().length, maxLen))) : null);\r\n"
2022
				+ "				charArrayMethod() != null ? Arrays.toString(Arrays.copyOf(charArrayMethod(), Math.min(charArrayMethod().length, maxLen))) : null, floatArrayMethod() != null ? Arrays.toString(Arrays.copyOf(floatArrayMethod(), Math.min(floatArrayMethod().length, maxLen))) : null);\r\n"
2023
				+ "	}\r\n" + "	private String toString(Collection<?> collection, int maxLen) {\r\n" + "		StringBuilder builder = new StringBuilder();\r\n" + "		builder.append(\"[\");\r\n"
2023
				+ "	}\r\n" + "	private String toString(Collection<?> collection, int maxLen) {\r\n" + "		StringBuilder builder = new StringBuilder();\r\n" + "		builder.append(\"[\");\r\n"
2024
				+ "		int i = 0;\r\n" + "		for (Iterator<?> iterator = collection.iterator(); iterator.hasNext() && i < maxLen; i++) {\r\n" + "			if (i > 0) {\r\n" + "				builder.append(\", \");\r\n"
2024
				+ "		int i = 0;\r\n" + "		for (Iterator<?> iterator = collection.iterator(); iterator.hasNext() && i < maxLen; i++) {\r\n" + "			if (i > 0) {\r\n" + "				builder.append(\", \");\r\n"
2025
				+ "			}\r\n" + "			builder.append(iterator.next());\r\n" + "		}\r\n" + "		builder.append(\"]\");\r\n" + "		return builder.toString();\r\n" + "	}\r\n" + "	\r\n" + "}\r\n" + "";
2025
				+ "			}\r\n" + "			builder.append(iterator.next());\r\n" + "		}\r\n" + "		builder.append(\"]\");\r\n" + "		return builder.toString();\r\n" + "	}\r\n" + "	\r\n" + "}\r\n" + "";
(-)ui/org/eclipse/jdt/ui/tests/quickfix/CleanUpStressTest.java (-12 / +12 lines)
Lines 233-240 Link Here
233
        buf.append("    }\n");
233
        buf.append("    }\n");
234
        buf.append("\n");
234
        buf.append("\n");
235
        buf.append("    public static void savePreferences() throws IOException {\n");
235
        buf.append("    public static void savePreferences() throws IOException {\n");
236
        buf.append("        final FileOutputStream fos = new FileOutputStream(BaseTestRunner\n");
236
        buf.append("        final FileOutputStream fos = new FileOutputStream(\n");
237
        buf.append("                .getPreferencesFile());\n");
237
        buf.append("                BaseTestRunner.getPreferencesFile());\n");
238
        buf.append("        try {\n");
238
        buf.append("        try {\n");
239
        buf.append("            BaseTestRunner.getPreferences().store(fos, \"\"); //$NON-NLS-1$\n");
239
        buf.append("            BaseTestRunner.getPreferences().store(fos, \"\"); //$NON-NLS-1$\n");
240
        buf.append("        } finally {\n");
240
        buf.append("        } finally {\n");
Lines 492-499 Link Here
492
        buf.append("    }\n");
492
        buf.append("    }\n");
493
        buf.append("\n");
493
        buf.append("\n");
494
        buf.append("    public void testFilter() {\n");
494
        buf.append("    public void testFilter() {\n");
495
        buf.append("        Assert.assertEquals(this.fFiltered, BaseTestRunner\n");
495
        buf.append("        Assert.assertEquals(this.fFiltered,\n");
496
        buf.append("                .getFilteredTrace(this.fUnfiltered));\n");
496
        buf.append("                BaseTestRunner.getFilteredTrace(this.fUnfiltered));\n");
497
        buf.append("    }\n");
497
        buf.append("    }\n");
498
        buf.append("}");
498
        buf.append("}");
499
        fExpectedChangesAllTests.put("junit.tests.runner.StackFilterTest.java", buf.toString());
499
        fExpectedChangesAllTests.put("junit.tests.runner.StackFilterTest.java", buf.toString());
Lines 3094-3101 Link Here
3094
        buf.append("    public ClassLoaderTest() {\n");
3094
        buf.append("    public ClassLoaderTest() {\n");
3095
        buf.append("    }\n");
3095
        buf.append("    }\n");
3096
        buf.append("    private boolean isTestCaseClassLoader(final ClassLoader cl) {\n");
3096
        buf.append("    private boolean isTestCaseClassLoader(final ClassLoader cl) {\n");
3097
        buf.append("        return ((cl != null) && cl.getClass().getName().equals(\n");
3097
        buf.append("        return ((cl != null) && cl.getClass().getName()\n");
3098
        buf.append("                junit.runner.TestCaseClassLoader.class.getName()));\n");
3098
        buf.append("                .equals(junit.runner.TestCaseClassLoader.class.getName()));\n");
3099
        buf.append("    }\n");
3099
        buf.append("    }\n");
3100
        buf.append("    public void verify() {\n");
3100
        buf.append("    public void verify() {\n");
3101
        buf.append("        this.verifyApplicationClassLoadedByTestLoader();\n");
3101
        buf.append("        this.verifyApplicationClassLoadedByTestLoader();\n");
Lines 3410-3417 Link Here
3410
        buf.append("\n");
3410
        buf.append("\n");
3411
        buf.append("public class LoadedFromJar extends Assert {\n");
3411
        buf.append("public class LoadedFromJar extends Assert {\n");
3412
        buf.append("    private boolean isTestCaseClassLoader(final ClassLoader cl) {\n");
3412
        buf.append("    private boolean isTestCaseClassLoader(final ClassLoader cl) {\n");
3413
        buf.append("        return ((cl != null) && cl.getClass().getName().equals(\n");
3413
        buf.append("        return ((cl != null) && cl.getClass().getName()\n");
3414
        buf.append("                junit.runner.TestCaseClassLoader.class.getName()));\n");
3414
        buf.append("                .equals(junit.runner.TestCaseClassLoader.class.getName()));\n");
3415
        buf.append("    }\n");
3415
        buf.append("    }\n");
3416
        buf.append("    public void verify() {\n");
3416
        buf.append("    public void verify() {\n");
3417
        buf.append("        this.verifyApplicationClassLoadedByTestLoader();\n");
3417
        buf.append("        this.verifyApplicationClassLoadedByTestLoader();\n");
Lines 4167-4177 Link Here
4167
        buf.append("        }\n");
4167
        buf.append("        }\n");
4168
        buf.append("        Assert.assertTrue((p.waitFor() == 0) == success);\n");
4168
        buf.append("        Assert.assertTrue((p.waitFor() == 0) == success);\n");
4169
        buf.append("        if (success) {\n");
4169
        buf.append("        if (success) {\n");
4170
        buf.append("            Assert.assertEquals(junit.textui.TestRunner.SUCCESS_EXIT, p\n");
4170
        buf.append("            Assert.assertEquals(junit.textui.TestRunner.SUCCESS_EXIT,\n");
4171
        buf.append("                    .exitValue());\n");
4171
        buf.append("                    p.exitValue());\n");
4172
        buf.append("        } else {\n");
4172
        buf.append("        } else {\n");
4173
        buf.append("            Assert.assertEquals(junit.textui.TestRunner.FAILURE_EXIT, p\n");
4173
        buf.append("            Assert.assertEquals(junit.textui.TestRunner.FAILURE_EXIT,\n");
4174
        buf.append("                    .exitValue());\n");
4174
        buf.append("                    p.exitValue());\n");
4175
        buf.append("        }\n");
4175
        buf.append("        }\n");
4176
        buf.append("    }\n");
4176
        buf.append("    }\n");
4177
        buf.append("\n");
4177
        buf.append("\n");

Return to bug 59891