fix tests

JabRef · Oct 30, 2018 · 3162bc3 · 3162bc3
1 parent f8b0dda
commit 3162bc3
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 24 deletions.
diff --git a/src/main/resources/resource/layout/docbook5.article.layout b/src/main/resources/resource/layout/docbook5.article.layout
@@ -33,3 +33,4 @@
             <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
         </abstract>
     \end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.book.layout b/src/main/resources/resource/layout/docbook5.book.layout
@@ -43,4 +43,5 @@
         <abstract>
             <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
         </abstract>
-    \end{abstract}
+    \end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.end.layout b/src/main/resources/resource/layout/docbook5.end.layout
@@ -1 +1,2 @@
-</biblioentry>
+
+</bibliography>
diff --git a/src/main/resources/resource/layout/docbook5.incollection.layout b/src/main/resources/resource/layout/docbook5.incollection.layout
@@ -47,4 +47,5 @@
         <abstract>
             <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
         </abstract>
-    \end{abstract}
+    \end{abstract}
+</biblioentry>
diff --git a/src/main/resources/resource/layout/docbook5.phdthesis.layout b/src/main/resources/resource/layout/docbook5.phdthesis.layout
@@ -35,3 +35,4 @@
             <para>\format[XMLChars,RemoveLatexCommands]{\abstract}</para>
         </abstract>
     \end{abstract}
+</biblioentry>
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -16,6 +16,8 @@
 import org.jabref.logic.xmp.XmpPreferences;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.BibtexEntryTypes;
+import org.jabref.model.entry.FieldName;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -57,9 +59,10 @@ public void setUp() throws URISyntaxException {
 
         databaseContext = new BibDatabaseContext();
         charset = StandardCharsets.UTF_8;
-        BibEntry entry = new BibEntry();
-        entry.setField("title", "my paper title");
-        entry.setField("author", "Stefan Kolb and Tobias Diez");
+        BibEntry entry = new BibEntry(BibtexEntryTypes.BOOK);
+        entry.setField(FieldName.TITLE, "my paper title");
+        entry.setField(FieldName.AUTHOR, "Stefan Kolb and Tobias Diez");
+        entry.setField(FieldName.ISBN, "1-2-34");
         entry.setCiteKey("mykey");
         entry.setDate(new org.jabref.model.entry.Date(myDate));
         entries = Arrays.asList(entry);
@@ -75,6 +78,7 @@ public void testPerformExportForSingleEntry(@TempDirectory.TempDir Path testFold
         Builder control = Input.from(Files.newInputStream(xmlFile));
         Builder test = Input.from(Files.newInputStream(path));
 
+
         assertThat(test, CompareMatcher.isSimilarTo(control)
                                        .withNodeMatcher(new DefaultNodeMatcher(ElementSelectors.byNameAndText)).throwComparisonFailure());
     }

diff --git a/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml b/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
@@ -1,23 +1,30 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<bibliography xmlns="http://docbook.org/ns/docbook" version="5.1"
-   xmlns:xlink="http://www.w3.org/1999/xlink">
-<title/>
-<biblioentry xreflabel="Kolb and Diez (2018)" xml:id="mykey">
+<bibliography>
+<biblioentry xreflabel="S. Kolb and T. Diez (2018)" xml:id="mykey">
    <authorgroup>
+<!--AUTHORS-->
        <author><personname><firstname>Stefan</firstname><surname>Kolb</surname></personname></author>
        <author><personname><firstname>Tobias</firstname><surname>Diez</surname></personname></author> 
+<!--EDITORS-->
 
    </authorgroup>
-   <citetitle pubwork="article">my paper title</citetitle>
-
-
-
-
-
-   <pubdate>2018</pubdate>  
-
-
-
-</biblioentry>
-
-</bibliography>
+   <!--TITLE-->
+           <citetitle pubwork="Book">my paper title</citetitle> 
+
+<!--BOOK booktitle, edition, (pages), publisher-->
+
+
+           <pubdate>2018</pubdate>  
+
+
+
+
+
+<!-- IDENTIFIERS-->
+
+
+
+        <biblioid class="isbn">1&#45;2&#45;34</biblioid>
+
+<!--ABSTRACT-->
+
+</biblioentry></bibliography>