[Andspidclient-commit] SF.net SVN: andspidclient:[207] trunk/src

[<chr...@us...>]

Revision: 207
          http://sourceforge.net/p/andspidclient/code/207
Author:   chris-trapani
Date:     2018-12-06 23:40:47 +0000 (Thu, 06 Dec 2018)
Log Message:
-----------
DMSTECH-9633:  preserve dto order for contruibutors.

Modified Paths:
--------------
    trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
    trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java

Modified: trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java
===================================================================
--- trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-12-02 23:21:16 UTC (rev 206)
+++ trunk/src/main/java/au/csiro/doiclient/utils/ConverterUtils.java	2018-12-06 23:40:47 UTC (rev 207)
@@ -454,7 +454,7 @@
                         creator.getAffiliation());
 
                 Element grandParent = baseElement.getParentElement();
-                grandParent.getParentElement().addContent(1, newCreatorNode);
+                grandParent.getParentElement().addContent(counter+1, newCreatorNode);
             }
         }
         else
@@ -509,7 +509,7 @@
                     baseElement.setAttribute(DoiMetaDataGenerator.DESCRIPTION_TYPE, firstNode.getDescriptionType());
                 }
 
-                baseElement.getParentElement().addContent(1, newNode);
+                baseElement.getParentElement().addContent(counter+1, newNode);
             }
         }
         else
@@ -634,7 +634,7 @@
 
             clonedParentElement.detach();
             Element grandParent = parent.getParentElement();
-            grandParent.addContent(1, clonedParentElement);
+            grandParent.addContent(counter+1, clonedParentElement);
         }
 
     }

Modified: trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java
===================================================================
--- trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java	2018-12-02 23:21:16 UTC (rev 206)
+++ trunk/src/test/java/au/csiro/doiclient/utils/TestDoiMetaDataGenerator.java	2018-12-06 23:40:47 UTC (rev 207)
@@ -147,16 +147,16 @@
     private List<Creator> createDummyCreators()
     {
         List<Creator> creators = new ArrayList<Creator>();
-        creators.add(new Creator("John", "Smith"));
-        creators.add(new Creator("Matt", "Green"));
-        creators.add(new Creator("Alison", "Chapman"));
-        creators.add(new Creator("Rahul", "Gandhi"));
-        creators.add(new Creator("Rahul", "Dravid"));
-        creators.add(new Creator("David", "Phillips"));
         Creator c = new Creator();
         c.setCreatorName("CSIRO");
         c.setNameType("Organizational");
         creators.add(c);
+        creators.add(new Creator("David", "Phillips"));
+        creators.add(new Creator("Rahul", "Gandhi"));
+        creators.add(new Creator("Alison", "Chapman"));
+        creators.add(new Creator("Matt", "Green"));
+        creators.add(new Creator("Rahul", "Dravid"));
+        creators.add(new Creator("John", "Smith"));
         return creators;
     }
 
@@ -207,10 +207,10 @@
         assertEquals("creatorName", ((Element) nodes.get(0)).getName());
         assertEquals("CSIRO", ((Element) nodes.get(0)).getText());
         assertEquals("Phillips, David", ((Element) nodes.get(1)).getText());
-        assertEquals("Dravid, Rahul", ((Element) nodes.get(2)).getText());
-        assertEquals("Gandhi, Rahul", ((Element) nodes.get(3)).getText());
-        assertEquals("Chapman, Alison", ((Element) nodes.get(4)).getText());
-        assertEquals("Green, Matt", ((Element) nodes.get(5)).getText());
+        assertEquals("Gandhi, Rahul", ((Element) nodes.get(2)).getText());
+        assertEquals("Chapman, Alison", ((Element) nodes.get(3)).getText());
+        assertEquals("Green, Matt", ((Element) nodes.get(4)).getText());
+        assertEquals("Dravid, Rahul", ((Element) nodes.get(5)).getText());
         assertEquals("Smith, John", ((Element) nodes.get(6)).getText());
 
         XPath resourceTypeXPath = XPath.newInstance(RESOURCETYPE_NAME_XPATH);
@@ -452,7 +452,7 @@
         List<Creator> creators = dto.getCreators();
         creators.remove(3); 
         creators.remove(4);
-        dto.getCreators().get(0).setFirstName("changed");
+        dto.getCreators().get(1).setFirstName("changed");
 
         dto.setCreators(creators);
         
@@ -488,10 +488,10 @@
         assertEquals("creatorName", ((Element) nodes.get(0)).getName());
 
         assertEquals("CSIRO", ((Element) nodes.get(0)).getText());
-        assertEquals("Dravid, Rahul", ((Element) nodes.get(1)).getText());
-        assertEquals("Chapman, Alison", ((Element) nodes.get(2)).getText());
+        assertEquals("Phillips, changed", ((Element) nodes.get(1)).getText());
+        assertEquals("Gandhi, Rahul", ((Element) nodes.get(2)).getText());
         assertEquals("Green, Matt", ((Element) nodes.get(3)).getText());
-        assertEquals("Smith, changed", ((Element) nodes.get(4)).getText());
+        assertEquals("Smith, John", ((Element) nodes.get(4)).getText());
 
         assertEquals("creatorName", ((Element) nodes.get(0)).getName());
         

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.