From 24755132a23115eb576c57d18445be4e183f95bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20M=C3=A9ndez?= <hello@davidemdot.com>
Date: Fri, 2 Aug 2019 18:46:25 +0200
Subject: [PATCH 1/2] Fix fail on testPerformExportForSingleEntry from
 DocBook5ExporterTest

---
 .../jabref/logic/exporter/DocBook5ExporterTest.java |  4 ++--
 .../jabref/logic/exporter/Docbook5ExportFormat.xml  | 13 -------------
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index ba39df69047..7c25e0f0823 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -17,7 +17,6 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.StandardEntryType;
 import org.jabref.model.entry.field.StandardField;
-import org.jabref.support.DisabledOnCIServer;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -67,7 +66,6 @@ void setUp() throws URISyntaxException {
     }
 
     @Test
-    @DisabledOnCIServer("Fails on CI for some reason")
     void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception {
         Path path = testFolder.resolve("ThisIsARandomlyNamedFile");
 
@@ -77,6 +75,8 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception
         Builder test = Input.from(Files.newInputStream(path));
 
         assertThat(test, CompareMatcher.isSimilarTo(control)
+                                       .normalizeWhitespace()
+                                       .ignoreComments()
                                        .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
index 8c03b8f17a4..1f10684a443 100644
--- a/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
+++ b/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
@@ -16,19 +16,6 @@
    <!--TITLE-->
            <citetitle pubwork="book">my paper title</citetitle> 
     
-<!--BOOK booktitle, edition, (pages), publisher-->
-    <biblioset relation="book">
-        
-		
-        <pubdate>2018</pubdate>
-        
-        
-		<publishername></publishername>
-        <address></address>
-        
-	</biblioset>
-    
-    
 <!-- IDENTIFIERS-->
     
     

From fd51416e8940f8fbf5f309371fb0180dcd61359e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20M=C3=A9ndez?= <hello@davidemdot.com>
Date: Fri, 2 Aug 2019 22:11:01 +0200
Subject: [PATCH 2/2] Restore XML test file and fix the bug in the right place

---
 .../org/jabref/logic/exporter/TemplateExporter.java |  2 +-
 .../jabref/logic/exporter/DocBook5ExporterTest.java |  1 -
 .../jabref/logic/exporter/Docbook5ExportFormat.xml  | 13 +++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
index 69562bc2d0d..2f98a4aaa8f 100644
--- a/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
+++ b/src/main/java/org/jabref/logic/exporter/TemplateExporter.java
@@ -261,7 +261,7 @@ public void export(final BibDatabaseContext databaseContext, final Path file,
                 if (layouts.containsKey(type)) {
                     layout = layouts.get(type);
                 } else {
-                    try (Reader reader = getReader(lfFileName + '.' + type + LAYOUT_EXTENSION)) {
+                    try (Reader reader = getReader(lfFileName + '.' + type.getName() + LAYOUT_EXTENSION)) {
                         // We try to get a type-specific layout for this entry.
                         layoutHelper = new LayoutHelper(reader, layoutPreferences);
                         layout = layoutHelper.getLayoutFromText();
diff --git a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
index 7c25e0f0823..0fa6bb16820 100644
--- a/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
+++ b/src/test/java/org/jabref/logic/exporter/DocBook5ExporterTest.java
@@ -76,7 +76,6 @@ void testPerformExportForSingleEntry(@TempDir Path testFolder) throws Exception
 
         assertThat(test, CompareMatcher.isSimilarTo(control)
                                        .normalizeWhitespace()
-                                       .ignoreComments()
                                        .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
index 1f10684a443..8c03b8f17a4 100644
--- a/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
+++ b/src/test/resources/org/jabref/logic/exporter/Docbook5ExportFormat.xml
@@ -16,6 +16,19 @@
    <!--TITLE-->
            <citetitle pubwork="book">my paper title</citetitle> 
     
+<!--BOOK booktitle, edition, (pages), publisher-->
+    <biblioset relation="book">
+        
+		
+        <pubdate>2018</pubdate>
+        
+        
+		<publishername></publishername>
+        <address></address>
+        
+	</biblioset>
+    
+    
 <!-- IDENTIFIERS-->