Attachment #58079 for bug #49412




public class JavaDocTestCase extends CommentTestCase {
	
	static {
//		TESTS_NAMES = new String[] { "test75460" } ;
	}

	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;

	}
	
	public void testNoFormat1() {
		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT, "false");
		String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
		assertEquals(content, testFormat(content));
	}

		String result=testFormat(input, options);
		assertEquals(expected, result);
	}
	
	
	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=75460
	public void test75460() {
		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.TRUE);
		options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.FALSE);

		String input = "/**" + DELIMITER +
				"<pre>"+ DELIMITER +
				"            Object[] objects = new Object[3];" + DELIMITER +
				"            objects[0] = new String(\"Hallo Welt !!!\");" + DELIMITER +
				"            objects[1] = new String(\"Test !!!\");" + DELIMITER +
				"            objects[2] = new Integer(\"1980\");" + DELIMITER +
				"            ObjectFile.write(pathname, objects);" + DELIMITER +
				"            Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
				"            for(int i = 0; i < objs.length; i++)" + DELIMITER +
				"            {" + DELIMITER +
				"              System.out.println(objs[i].toString());" + DELIMITER +
				"            }" + DELIMITER +
				"</pre>"+ DELIMITER +
				"*/";
		
		String expected = "/**" + DELIMITER +
				" * <pre>" + DELIMITER +
				" * Object[] objects = new Object[3];" + DELIMITER +
				" * objects[0] = new String(&quot;Hallo Welt !!!&quot;);" + DELIMITER +
				" * objects[1] = new String(&quot;Test !!!&quot;);" + DELIMITER +
				" * objects[2] = new Integer(&quot;1980&quot;);" + DELIMITER +
				" * ObjectFile.write(pathname, objects);" + DELIMITER +
				" * Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
				" * for (int i = 0; i &lt; objs.length; i++) {" + DELIMITER +
				" * 	System.out.println(objs[i].toString());" + DELIMITER +
				" * }" + DELIMITER +
				" * </pre>" + DELIMITER +
				" */";
		String result=testFormat(input, options);
		assertEquals(expected, result);
	}
}

Lines 10-15 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/comment/MultiLineTestCase.java (-2 / +38 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.core.tests.formatter.comment;	11	package org.eclipse.jdt.core.tests.formatter.comment;
12		12
		13	import java.util.Map;
		14
13	import org.eclipse.jdt.core.formatter.CodeFormatter;	15	import org.eclipse.jdt.core.formatter.CodeFormatter;
14	import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;	16	import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
15		17
Lines 18-24 Link Here
18	import org.eclipse.jdt.internal.formatter.comment.MultiCommentLine;	20	import org.eclipse.jdt.internal.formatter.comment.MultiCommentLine;
19		21
20	public class MultiLineTestCase extends CommentTestCase {	22	public class MultiLineTestCase extends CommentTestCase {
21		23	static {
		24	// TESTS_NAMES = new String[] { "test75460" } ;
		25	}
22	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;	26	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
23		27
24	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;	28	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;
Lines 97-103 Link Here
97	}	101	}
98		102
99	public void testNoFormat1() {	103	public void testNoFormat1() {
100	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.FALSE);	104	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
101	String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;	105	String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
102	assertEquals(content, testFormat(content));	106	assertEquals(content, testFormat(content));
103	}	107	}
Lines 116-119 Link Here
116	" */";	120	" */";
117	assertEquals("Different output", expectedOutput, result);	121	assertEquals("Different output", expectedOutput, result);
118	}	122	}
		123
		124	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=75460
		125	public void _test75460() {
		126	Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		127	options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
		128	options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.TRUE);
		129	options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.FALSE);
		130
		131	String input = "/*" + DELIMITER +
		132	"<pre>"+ DELIMITER +
		133	" Object[] objects = new Object[3];" + DELIMITER +
		134	" objects[0] = new String(\"Hallo Welt !!!\");" + DELIMITER +
		135	" objects[1] = new String(\"Test !!!\");" + DELIMITER +
		136	" objects[2] = new Integer(\"1980\");" + DELIMITER +
		137	" ObjectFile.write(pathname, objects);" + DELIMITER +
		138	" Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
		139	" for(int i = 0; i < objs.length; i++)" + DELIMITER +
		140	" {" + DELIMITER +
		141	" System.out.println(objs[i].toString());" + DELIMITER +
		142	" }" + DELIMITER +
		143	"</pre>"+ DELIMITER +
		144	"*/";
		145
		146	String expected = "/**" + DELIMITER +
		147	" * Creates a new instance of DynamicEventChannel sdf sdfs dsdf dsfsd fd fsd fsdf" + DELIMITER +
		148	" * sdf dsfsd (on the same line)" + DELIMITER +
		149	" * " + DELIMITER +
		150	" * @pre obj != null" + DELIMITER +
		151	" */";
		152	String result=testFormat(input, options);
		153	assertEquals(expected, result);
		154	}
119	}	155	}




	}
	
	public void testNoFormat1() {
		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.FALSE);
		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "1");
		String content= PREFIX + "test test";
		assertEquals(content, testFormat(content));
	}
	public void _test109581() {
		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.TRUE);
		String content= "//// some comment ////";
		assertEquals(content + DELIMITER, testFormat(content));
	}

Return to bug 49412

Lines 24-30 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java (-2 / +42 lines)
24	public class JavaDocTestCase extends CommentTestCase {	24	public class JavaDocTestCase extends CommentTestCase {
25		25
26	static {	26	static {
27	// TESTS_NAMES = new String[] { "test60453" } ;	27	// TESTS_NAMES = new String[] { "test75460" } ;
28	}	28	}
29		29
30	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;	30	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
Lines 352-358 Link Here
352	}	352	}
353		353
354	public void testNoFormat1() {	354	public void testNoFormat1() {
355	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, "false");	355	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT, "false");
356	String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;	356	String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
357	assertEquals(content, testFormat(content));	357	assertEquals(content, testFormat(content));
358	}	358	}
Lines 564-567 Link Here
564	String result=testFormat(input, options);	564	String result=testFormat(input, options);
565	assertEquals(expected, result);	565	assertEquals(expected, result);
566	}	566	}
		567
		568
		569	// https://bugs.eclipse.org/bugs/show_bug.cgi?id=75460
		570	public void test75460() {
		571	Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		572	options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "200");
		573	options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_SOURCE, DefaultCodeFormatterConstants.TRUE);
		574	options.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_CLEAR_BLANK_LINES, DefaultCodeFormatterConstants.FALSE);
		575
		576	String input = "/**" + DELIMITER +
		577	"<pre>"+ DELIMITER +
		578	" Object[] objects = new Object[3];" + DELIMITER +
		579	" objects[0] = new String(\"Hallo Welt !!!\");" + DELIMITER +
		580	" objects[1] = new String(\"Test !!!\");" + DELIMITER +
		581	" objects[2] = new Integer(\"1980\");" + DELIMITER +
		582	" ObjectFile.write(pathname, objects);" + DELIMITER +
		583	" Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
		584	" for(int i = 0; i < objs.length; i++)" + DELIMITER +
		585	" {" + DELIMITER +
		586	" System.out.println(objs[i].toString());" + DELIMITER +
		587	" }" + DELIMITER +
		588	"</pre>"+ DELIMITER +
		589	"*/";
		590
		591	String expected = "/**" + DELIMITER +
		592	" * <pre>" + DELIMITER +
		593	" * Object[] objects = new Object[3];" + DELIMITER +
		594	" * objects[0] = new String("Hallo Welt !!!");" + DELIMITER +
		595	" * objects[1] = new String("Test !!!");" + DELIMITER +
		596	" * objects[2] = new Integer("1980");" + DELIMITER +
		597	" * ObjectFile.write(pathname, objects);" + DELIMITER +
		598	" * Object[] objs = ObjectFile.read(pathname);" + DELIMITER +
		599	" * for (int i = 0; i < objs.length; i++) {" + DELIMITER +
		600	" * System.out.println(objs[i].toString());" + DELIMITER +
		601	" * }" + DELIMITER +
		602	" * </pre>" + DELIMITER +
		603	" */";
		604	String result=testFormat(input, options);
		605	assertEquals(expected, result);
		606	}
567	}	607	}

Lines 209-221 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/comment/SingleLineTestCase.java (-2 / +2 lines)
209	}	209	}
210		210
211	public void testNoFormat1() {	211	public void testNoFormat1() {
212	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.FALSE);	212	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.FALSE);
213	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "1");	213	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "1");
214	String content= PREFIX + "test test";	214	String content= PREFIX + "test test";
215	assertEquals(content, testFormat(content));	215	assertEquals(content, testFormat(content));
216	}	216	}
217	public void _test109581() {	217	public void _test109581() {
218	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.TRUE);	218	setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.TRUE);
219	String content= "//// some comment ////";	219	String content= "//// some comment ////";
220	assertEquals(content + DELIMITER, testFormat(content));	220	assertEquals(content + DELIMITER, testFormat(content));
221	}	221	}