Nonfunctional changes only

3 files changed, 10 insertions, 7 deletions

diff --git a/documentgen-test/src/main/java/com/yahoo/vespa/document/NodeImpl.java b/documentgen-test/src/main/java/com/yahoo/vespa/document/NodeImpl.java
index 58b63835539..45da1e85795 100644
--- a/documentgen-test/src/main/java/com/yahoo/vespa/document/NodeImpl.java
+++ b/documentgen-test/src/main/java/com/yahoo/vespa/document/NodeImpl.java
@@ -7,7 +7,6 @@ import com.yahoo.document.annotation.Annotation;
  * Example of user provided annotation subtype that vespa-documentgen-plugin supports
  *
  * @author vegardh
- *
  */
 public class NodeImpl extends Annotation {
 
diff --git a/documentgen-test/src/main/java/com/yahoo/vespa/document/dom/DocumentImpl.java b/documentgen-test/src/main/java/com/yahoo/vespa/document/dom/DocumentImpl.java
index fd9b8b46711..1a1548b93d5 100644
--- a/documentgen-test/src/main/java/com/yahoo/vespa/document/dom/DocumentImpl.java
+++ b/documentgen-test/src/main/java/com/yahoo/vespa/document/dom/DocumentImpl.java
@@ -7,7 +7,6 @@ import com.yahoo.document.annotation.Annotation;
  * Example of user provided annotation subtype that vespa-documentgen-plugin supports
  *
  * @author vegardh
- *
  */
 public class DocumentImpl extends Annotation {
 
diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
index e772a3138da..0cb365d421f 100644
--- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
+++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
@@ -82,15 +82,16 @@ import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertThat;
 
-
 /**
- * Testcases for vespa-documentgen-plugin
+ * Tests vespa-documentgen-plugin
  *
  * @author vegardh
  */
 @SuppressWarnings({"unchecked", "rawtypes"})
 public class DocumentGenPluginTest {
 
+    // NOTE: Most assertEquals in this use the wrong argument order
+
     private static final int NUM_BOOKS = 10000;
 
     @Test
@@ -186,7 +187,7 @@ public class DocumentGenPluginTest {
     }
 
     @Test
-    public void testremoveFieldValue() {
+    public void testRemoveFieldValue() {
         Book book = getBook();
         book.setAuthor(null);
         Field a = new Field("author", DataType.STRING);
@@ -229,9 +230,13 @@ public class DocumentGenPluginTest {
     @Test
     public void testStructs() {
         Book book = getBook();
+        assertBook(book);
+    }
+
+    private void assertBook(Book book) {
         assertTrue(Struct.class.isInstance(book.getMystruct()));
-        assertEquals(book.getMystruct().getSs01().getD0(), -238472634.78, 0);
-        assertEquals(book.getMystruct().getI1(), (Integer)999);
+        assertEquals(-238472634.78, book.getMystruct().getSs01().getD0(), 0);
+        assertEquals((Integer)999, book.getMystruct().getI1());
         assertEquals(book.getAuthor(), "Herman Melville");
         book.getMystruct().getSs01().setD0(4d);
         assertEquals(book.getMystruct().getSs01().getD0(), 4.0, 1E-6);