Attachment #74955 for bug #197169




		String result=testFormat(input, options);
		assertEquals(expected, result);
	}
	
	public void test197169() {
		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();

		String input = "/**" + DELIMITER + 
				" * <pre>" + DELIMITER + 
				" * &#064;Anno1 class Foo {" + DELIMITER + 
				" * &#064;Anno1 class Bar {}" + DELIMITER + 
				" * }" + DELIMITER + 
				" * &#064;Anno2(&#064;Anno1) class Baz {}" + DELIMITER + 
				" * </pre>" + DELIMITER + 
				" */";
		
		String expected = "/**" + DELIMITER + 
				" * <pre>" + DELIMITER + 
				// Initial &#064 left alone.
				" * &#064;Anno1" + DELIMITER + 
				" * class Foo {" + DELIMITER + 
				// Left alone even after whitespace.
				" * 	&#064;Anno1" + DELIMITER + 
				" * 	class Bar {" + DELIMITER + 
				" * 	}" + DELIMITER + 
				" * }" + DELIMITER + 
				" * " + DELIMITER + 
				// Non-initial &#064; expanded.
				" * &#064;Anno2(@Anno1)" + DELIMITER + 
				" * class Baz {" + DELIMITER + 
				" * }" + DELIMITER + 
				" * </pre>" + DELIMITER + 
				" */";
		String result=testFormat(input, options);
		assertEquals(expected, result);
	}
}

Return to bug 197169

Lines 822-825 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java (+33 lines)
822	String result=testFormat(input, options);	822	String result=testFormat(input, options);
823	assertEquals(expected, result);	823	assertEquals(expected, result);
824	}	824	}
		825
		826	public void test197169() {
		827	Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		828
		829	String input = "/**" + DELIMITER +
		830	" * <pre>" + DELIMITER +
		831	" * @Anno1 class Foo {" + DELIMITER +
		832	" * @Anno1 class Bar {}" + DELIMITER +
		833	" * }" + DELIMITER +
		834	" * @Anno2(@Anno1) class Baz {}" + DELIMITER +
		835	" * </pre>" + DELIMITER +
		836	" */";
		837
		838	String expected = "/**" + DELIMITER +
		839	" * <pre>" + DELIMITER +
		840	// Initial &#064 left alone.
		841	" * @Anno1" + DELIMITER +
		842	" * class Foo {" + DELIMITER +
		843	// Left alone even after whitespace.
		844	" * @Anno1" + DELIMITER +
		845	" * class Bar {" + DELIMITER +
		846	" * }" + DELIMITER +
		847	" * }" + DELIMITER +
		848	" * " + DELIMITER +
		849	// Non-initial @ expanded.
		850	" * @Anno2(@Anno1)" + DELIMITER +
		851	" * class Baz {" + DELIMITER +
		852	" * }" + DELIMITER +
		853	" * </pre>" + DELIMITER +
		854	" */";
		855	String result=testFormat(input, options);
		856	assertEquals(expected, result);
		857	}
825	}	858	}