diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-03-29 13:52:17 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2010-03-29 13:52:17 -0700 |
| commit | 6e94ca64944375a1496f752c64503baeafca2bc4 (patch) | |
| tree | 83afe0431af5772221e899376e5706388f370744 /dom | |
| parent | 66a66f700738c07c7977cb023f8a7aa2b331af90 (diff) | |
| parent | 63422f870ea0946e51eda3edfc3ff549eefb30c4 (diff) | |
| download | libcore-6e94ca64944375a1496f752c64503baeafca2bc4.zip libcore-6e94ca64944375a1496f752c64503baeafca2bc4.tar.gz libcore-6e94ca64944375a1496f752c64503baeafca2bc4.tar.bz2 | |
Merge commit '8812fdd7' into manualmerge
Conflicts:
libcore/xml/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
Diffstat (limited to 'dom')
| -rw-r--r-- | dom/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java | 9 | ||||
| -rw-r--r-- | dom/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/dom/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java b/dom/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java index bc7b323..bae9800 100644 --- a/dom/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java +++ b/dom/src/test/java/org/w3c/domts/level2/core/documentcreateattributeNS04.java @@ -92,13 +92,14 @@ public final class documentcreateattributeNS04 extends DOMTestCase { qualifiedName = (String) qualifiedNames.get(indexN1004E); { - boolean success = false; + // BEGIN android-changed + // Our exception priorities differ from the spec try { attribute = doc.createAttributeNS(namespaceURI, qualifiedName); - } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); + fail("documentcreateattributeNS04"); + } catch (DOMException expected) { } - assertTrue("documentcreateattributeNS04", success); + // END android-changed } } } diff --git a/dom/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java b/dom/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java index 7300f80..9a83561 100644 --- a/dom/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java +++ b/dom/src/test/java/org/w3c/domts/level2/core/setAttributeNS02.java @@ -75,13 +75,14 @@ public final class setAttributeNS02 extends DOMTestCase { testAddr = elementList.item(0); { - boolean success = false; + // BEGIN android-changed + // Our exception priorities differ from the spec try { ((Element) /*Node */testAddr).setAttributeNS(namespaceURI, qualifiedName, "newValue"); + fail("throw_NAMESPACE_ERR"); } catch (DOMException ex) { - success = (ex.code == DOMException.NAMESPACE_ERR); } - assertTrue("throw_NAMESPACE_ERR", success); + // END android-changed } } /** |