Attachment 58079 Details for Bug 49412 – Regression tests updated

[patch] Regression tests updated

patch_49412_tests.txt (text/plain), 8.19 KB, created by Olivier Thomann

on 2007-02-01 20:31:54 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Thomann

Created: 2007-02-01 20:31:54 EST

Size: 8.19 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.jdt.core.tests.model
>Index: src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java,v
>retrieving revision 1.8
>diff -u -r1.8 JavaDocTestCase.java
>--- src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java	1 Feb 2007 17:34:25 -0000	1.8
>+++ src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java	2 Feb 2007 01:32:07 -0000
>@@ -24,7 +24,7 @@
> public class JavaDocTestCase extends CommentTestCase {
> 	
> 	static {
>-//		TESTS_NAMES = new String[] { "test60453" } ;
>+//		TESTS_NAMES = new String[] { "test75460" } ;
> 	}
> 
> 	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
>@@ -352,7 +352,7 @@
> 	}
> 	
> 	public void testNoFormat1() {
>-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, "false");
>+		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_JAVADOC_COMMENT, "false");
> 		String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
> 		assertEquals(content, testFormat(content));
> 	}
>@@ -564,4 +564,44 @@
> 		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);
>+	}
> }
>Index: src/org/eclipse/jdt/core/tests/formatter/comment/MultiLineTestCase.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/comment/MultiLineTestCase.java,v
>retrieving revision 1.5
>diff -u -r1.5 MultiLineTestCase.java
>--- src/org/eclipse/jdt/core/tests/formatter/comment/MultiLineTestCase.java	21 Jun 2006 18:47:43 -0000	1.5
>+++ src/org/eclipse/jdt/core/tests/formatter/comment/MultiLineTestCase.java	2 Feb 2007 01:32:07 -0000
>@@ -10,6 +10,8 @@
>  *******************************************************************************/
> package org.eclipse.jdt.core.tests.formatter.comment;
> 
>+import java.util.Map;
>+
> import org.eclipse.jdt.core.formatter.CodeFormatter;
> import org.eclipse.jdt.core.formatter.DefaultCodeFormatterConstants;
> 
>@@ -18,7 +20,9 @@
> import org.eclipse.jdt.internal.formatter.comment.MultiCommentLine;
> 
> public class MultiLineTestCase extends CommentTestCase {
>-
>+	static {
>+//		TESTS_NAMES = new String[] { "test75460" } ;
>+	}
> 	protected static final String INFIX= MultiCommentLine.MULTI_COMMENT_CONTENT_PREFIX;
> 
> 	protected static final String POSTFIX= MultiCommentLine.MULTI_COMMENT_END_PREFIX;
>@@ -97,7 +101,7 @@
> 	}
> 	
> 	public void testNoFormat1() {
>-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.FALSE);
>+		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_BLOCK_COMMENT, DefaultCodeFormatterConstants.FALSE);
> 		String content= PREFIX + DELIMITER + INFIX + "test" + DELIMITER + INFIX + "test" + DELIMITER + POSTFIX;
> 		assertEquals(content, testFormat(content));
> 	}
>@@ -116,4 +120,36 @@
> 				"	 */";
> 		assertEquals("Different output", expectedOutput, 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 +
>+				" * Creates a new instance of DynamicEventChannel sdf sdfs dsdf dsfsd fd fsd fsdf" + DELIMITER +
>+				" * sdf dsfsd (on the same line)" + DELIMITER +
>+				" * " + DELIMITER +
>+				" * @pre obj != null" + DELIMITER +
>+				" */";
>+		String result=testFormat(input, options);
>+		assertEquals(expected, result);
>+	}
> }
>\ No newline at end of file
>Index: src/org/eclipse/jdt/core/tests/formatter/comment/SingleLineTestCase.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/formatter/comment/SingleLineTestCase.java,v
>retrieving revision 1.3
>diff -u -r1.3 SingleLineTestCase.java
>--- src/org/eclipse/jdt/core/tests/formatter/comment/SingleLineTestCase.java	16 Sep 2005 19:22:11 -0000	1.3
>+++ src/org/eclipse/jdt/core/tests/formatter/comment/SingleLineTestCase.java	2 Feb 2007 01:32:07 -0000
>@@ -209,13 +209,13 @@
> 	}
> 	
> 	public void testNoFormat1() {
>-		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT, DefaultCodeFormatterConstants.FALSE);
>+		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, DefaultCodeFormatterConstants.TRUE);
>+		setUserOption(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_LINE_COMMENT, DefaultCodeFormatterConstants.TRUE);
> 		String content= "//// some comment ////";
> 		assertEquals(content + DELIMITER, testFormat(content));
> 	}

Actions: View | Diff

Attachments on bug 49412: 58077 | 58078 | 58079 | 58113