Skip to content

fix void element is a simple element #34

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
amairi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix void element is a simple element #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions src/main/java/fr/vidal/oss/jaxb/atom/core/ExtensionElementAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,9 @@ private ExtensionElement extensionElement(Node node) {
}

private boolean isSimpleElementNode(Node node) {
return node.getChildNodes().getLength() == 1
&& isTextualNode(node.getFirstChild());
return (node.getChildNodes().getLength() == 1
&& isTextualNode(node.getFirstChild()))
|| node.getChildNodes().getLength() == 0;
}

private boolean isTextualNode(Node node) {
Expand Down
18 changes: 18 additions & 0 deletions src/test/java/fr/vidal/oss/jaxb/atom/core/ExtensionElementAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,24 @@ public void unmarshal_single_simple_element() throws Exception {
.build());
}

@Test
public void unmarshal_single_simple_void_element() throws Exception {

@jcgay jcgay Oct 30, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On peut aussi ajouter un test d'un élément sans attribut ?

String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<root xmlns=\"http://www.w3.org/2005/Atom\">\n" +
" <any:element xmlns:any=\"http://foo.bar.net/-/any/\"/>\n" +
"</root>";

ExtensionElement result = unmarshalElement(xml);

assertThat(result).isEqualTo(ExtensionElements.simpleElement("element", "")

@AElMehdiVidal AElMehdiVidal Oct 30, 2019

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cela doit être un structured element, et ce qu'on marshall c'est aussi un structured (contient un attribut). Voir les autres échanges sur la PR

.withNamespace(ANY_NAMESPACE)
.addAttribute(XMLNS_ATTRIBUTE)
.addAttribute(Attribute.builder("any", "http://foo.bar.net/-/any/")
.withNamespace(XMLNS_NAMESPACE)
.build())
.build());
}

@Test
public void unmarshal_structured_element_with_single_child() throws Exception {
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
Expand Down