[195264] Add formatter preference to close tags without space before '/>'
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java index 2aa6414..f140e97 100644 --- a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java +++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/TestPartitionFormatterXML.java
@@ -252,9 +252,18 @@ formatAndAssertEquals("testfiles/xml/multiattributes.xml", "testfiles/xml/multiattributes-yessplit-yesalign-newfmt.xml", prefs); } - public void testProcessingInstruction() throws UnsupportedEncodingException, IOException, CoreException - { + public void testSpaceBeforeEmptyCloseTag() throws UnsupportedEncodingException, IOException, CoreException { + // Bug 195264 + XMLFormattingPreferences prefs = new XMLFormattingPreferences(); + prefs.setSpaceBeforeEmptyCloseTag(false); + formatAndAssertEquals("testfiles/xml/xml-empty-tag-space.xml", "testfiles/xml/xml-empty-tag-space-none-newfmt.xml", prefs); + + prefs.setSpaceBeforeEmptyCloseTag(true); + formatAndAssertEquals("testfiles/xml/xml-empty-tag-space.xml", "testfiles/xml/xml-empty-tag-space-newfmt.xml", prefs); + } + + public void testProcessingInstruction() throws UnsupportedEncodingException, IOException, CoreException { // BUG198297 - formatAndAssertEquals("testfiles/xml/processinginstruction.xml", "testfiles/xml/processinginstruction-fmt.xml"); - } + formatAndAssertEquals("testfiles/xml/processinginstruction.xml", "testfiles/xml/processinginstruction-fmt.xml"); + } }
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml new file mode 100644 index 0000000..e29afd7 --- /dev/null +++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-newfmt.xml
@@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<main> + <a tag="with"> Some content </a> + <nocontentwithspace /> + <nocontentwithoutspace /> + <nocontent withattr="stuff" /> + <nocontent /> + <manylinedcontent with="attributes" /> +</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml new file mode 100644 index 0000000..48e61d7 --- /dev/null +++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space-none-newfmt.xml
@@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<main> + <a tag="with"> Some content </a> + <nocontentwithspace/> + <nocontentwithoutspace/> + <nocontent withattr="stuff"/> + <nocontent/> + <manylinedcontent with="attributes"/> +</main>
diff --git a/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml new file mode 100644 index 0000000..d6fafea --- /dev/null +++ b/tests/org.eclipse.wst.xml.core.tests/src/org/eclipse/wst/xml/core/tests/format/testfiles/xml/xml-empty-tag-space.xml
@@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<main> + <a tag="with"> Some content </a> + <nocontentwithspace /> + <nocontentwithoutspace/> + <nocontent withattr="stuff"/> + <nocontent /> + <manylinedcontent + + with="attributes" + /> +</main>