Skip to content

Fix UnparsedEntityCheckingTest: remove leftover RuntimeException #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elharo wants to merge 2 commits into
base: main
Choose a base branch
from
+25 −75
Open

Fix UnparsedEntityCheckingTest: remove leftover RuntimeException #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf1977d
Fix UnparsedEntityCheckingTest: remove leftover RuntimeException from…
elharo Jul 17, 2026
c6c6aab
Remove unnecessary try-catch blocks per review feedback
elharo Jul 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -836,15 +836,15 @@ Authors:
<include name="schema/config/IgnoreXSIType_C_A_Test.class"/>
<include name="schema/config/RootSimpleTypeDefinitionTest.class"/>
<include name="schema/config/RootTypeDefinitionTest.class"/>
<include name="schema/config/UseGrammarPoolOnly_False_Test.class"/>
<!-- These tests are failing. Fix them.
<include name="schema/config/IgnoreXSIType_C_AC_Test.class"/>
<include name="schema/config/IgnoreXSIType_C_CA_Test.class"/>
<include name="schema/config/IgnoreXSIType_C_C_Test.class"/>
<include name="schema/config/SurrogatePairLengthTest.class"/>
<include name="schema/config/UseGrammarPoolOnly_True_Test.class"/>
<include name="schema/config/UnparsedEntityCheckingTest.class"/>
-->
<include name="schema/config/UseGrammarPoolOnly_False_Test.class"/>
<include name="schema/config/UnparsedEntityCheckingTest.class"/>
<!-- These tests are failing. Fix them.
<include name="schema/config/IgnoreXSIType_C_AC_Test.class"/>
<include name="schema/config/IgnoreXSIType_C_CA_Test.class"/>
<include name="schema/config/IgnoreXSIType_C_C_Test.class"/>
<include name="schema/config/SurrogatePairLengthTest.class"/>
<include name="schema/config/UseGrammarPoolOnly_True_Test.class"/>
-->
<include name="jaxp/JAXPSpecTest.class"/>
<include name="dom/ids/Test.class"/>
</fileset>
Expand Down
82 changes: 16 additions & 66 deletions tests/schema/config/UnparsedEntityCheckingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,8 @@

package schema.config;

import junit.framework.Assert;

import org.apache.xerces.dom.PSVIElementNSImpl;
import org.apache.xerces.xs.ItemPSVI;
import org.xml.sax.SAXException;

/**
* @author Peter McCracken, IBM
Expand All @@ -47,90 +44,43 @@ public UnparsedEntityCheckingTest(String name) {
super(name);
}

public void testDefaultValid() {
try {
validateDocument();
} catch (Exception e) {
Assert.fail("Validation failed: " + e.getMessage());
}

public void testDefaultValid() throws Exception {
validateDocument();
checkDefault();
throw new RuntimeException();
}

public void testSetFalseValid() {
try {
fValidator.setFeature(UNPARSED_ENTITY_CHECKING, false);
} catch (SAXException e) {
Assert.fail("Error setting feature.");
}
try {
validateDocument();
} catch (Exception e) {
Assert.fail("Validation failed: " + e.getMessage());
}

public void testSetFalseValid() throws Exception {
fValidator.setFeature(UNPARSED_ENTITY_CHECKING, false);
validateDocument();
checkDefault();
}

public void testSetTrueValid() {
try {
fValidator.setFeature(UNPARSED_ENTITY_CHECKING, true);
} catch (SAXException e) {
Assert.fail("Error setting feature.");
}
try {
validateDocument();
} catch (Exception e) {
Assert.fail("Validation failed: " + e.getMessage());
}

public void testSetTrueValid() throws Exception {
fValidator.setFeature(UNPARSED_ENTITY_CHECKING, true);
validateDocument();
checkDefault();
}

public void testDefaultInvalid() {
public void testDefaultInvalid() throws Exception {
((PSVIElementNSImpl) fRootNode).setAttributeNS(null,
"unparsedEntityAttr", "invalid");
try {
validateDocument();
} catch (Exception e) {
Assert.fail("Validation failed: " + e.getMessage());
}

validateDocument();
checkInvalid();
}

public void testSetFalseInvalid() {
public void testSetFalseInvalid() throws Exception {
((PSVIElementNSImpl) fRootNode).setAttributeNS(null,
"unparsedEntityAttr", "invalid");
try {
fValidator.setFeature(UNPARSED_ENTITY_CHECKING, false);
} catch (SAXException e) {
Assert.fail("Error setting feature.");
}
try {
validateDocument();
} catch (Exception e) {
Assert.fail("Validation failed: " + e.getMessage());
}

fValidator.setFeature(UNPARSED_ENTITY_CHECKING, false);
validateDocument();
checkDefault();
}

public void testSetTrueInvalid() {
public void testSetTrueInvalid() throws Exception {
((PSVIElementNSImpl) fRootNode).setAttributeNS(null,
"unparsedEntityAttr", "invalid");
try {
fValidator.setFeature(UNPARSED_ENTITY_CHECKING, true);
} catch (SAXException e) {
Assert.fail("Error setting feature.");
}
try {
validateDocument();
} catch (Exception e) {
Assert.fail("Validation failed: " + e.getMessage());
}

fValidator.setFeature(UNPARSED_ENTITY_CHECKING, true);
validateDocument();
checkInvalid();
}

Expand Down
Loading