Story 1734: Test fix with 'fixed' build file.

projects/cadcAccessControl-Server/build.xml

@@ -112,11 +112,23 @@
     </jar>
   </target>
 
+  <target name="setup-test" depends="init">
+
+    <!-- Why do the tests need this configuration in two places? -->
+    <!-- jenkinsd 2015.07.20 -->
+    <copy overwrite="true" file="test/LdapConfig.test.properties"
+          todir="build/test/class"/>
+    <mkdir dir="${user.home}/config" />
+    <copy overwrite="true" file="test/LdapConfig.test.properties"
+          todir="${user.home}/config/"/>
+  </target>
+
   <!-- JAR files needed to run the test suite -->
   <property name="dev.junit" value="${ext.dev}/junit.jar"/>
   <property name="dev.httpunit" value="${ext.dev}/httpunit.jar"/>
   <property name="dev.easyMock" value="${ext.dev}/easymock.jar"/>
   <property name="dev.objenesis" value="${ext.dev}/objenesis.jar"/>
+  <property name="dev.jsonassert" value="${ext.dev}/jsonassert.jar" />
   <property name="dev.selenium.server"
             value="${ext.dev}/selenium-server-standalone.jar" />
   <property name="lib.js" value="${ext.lib}/js.jar"/>
@@ -125,15 +137,5 @@
   <property name="lib.commons-logging"
             value="${ext.lib}/commons-logging.jar"/>
   <property name="testingJars"
-            value="${lib.commons-logging}:${dev.junit}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>
-
-  <target name="setup-test">
-    <echo>******************</echo>
-    <echo>******************</echo>
-    <echo>Don't forget to set the ca.nrc.cadc.util.PropertiesReader.dir system property first!</echo>
-    <echo>e.g. ant -Dca.nrc.cadc.util.PropertiesReader.dir=test clean build test</echo>
-    <echo>******************</echo>
-    <echo>******************</echo>
-  </target>
-
+            value="${lib.commons-logging}:${dev.junit}:${dev.jsonassert}:${dev.httpunit}:${dev.easyMock}:${dev.selenium.server}:${dev.objenesis}:${lib.js}:${lib.nekoHTML}:${lib.xerces}"/>
 </project>

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/web/users/GetUsersActionTest.java

@@ -186,19 +186,19 @@ public class GetUsersActionTest
 
         final String expected = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\r\n" +
                                 "<users>\r\n" +
-                                "  <USER_1 />\r\n" +
-                                "  <USER_2 />\r\n" +
-                                "  <USER_3 />\r\n" +
-                                "  <USER_4 />\r\n" +
-                                "  <USER_5 />\r\n" +
-                                "  <USER_6 />\r\n" +
-                                "  <USER_7 />\r\n" +
-                                "  <USER_8 />\r\n" +
-                                "  <USER_9 />\r\n" +
-                                "  <USER_10 />\r\n" +
-                                "  <USER_11 />\r\n" +
-                                "  <USER_12 />\r\n" +
-                                "  <USER_13 />\r\n" +
+                                "  <user>USER_1</user>\r\n" +
+                                "  <user>USER_2</user>\r\n" +
+                                "  <user>USER_3</user>\r\n" +
+                                "  <user>USER_4</user>\r\n" +
+                                "  <user>USER_5</user>\r\n" +
+                                "  <user>USER_6</user>\r\n" +
+                                "  <user>USER_7</user>\r\n" +
+                                "  <user>USER_8</user>\r\n" +
+                                "  <user>USER_9</user>\r\n" +
+                                "  <user>USER_10</user>\r\n" +
+                                "  <user>USER_11</user>\r\n" +
+                                "  <user>USER_12</user>\r\n" +
+                                "  <user>USER_13</user>\r\n" +
                                 "</users>\r\n";
         final String result = writer.toString();
 

projects/cadcAccessControl/src/ca/nrc/cadc/ac/xml/UsersWriter.java

@@ -94,7 +94,9 @@ public class UsersWriter
 
         for (final String s : users)
         {
-            final Element userEntryElement = new Element(s);
+            final Element userEntryElement = new Element("user");
+            userEntryElement.setText(s);
+
             usersElement.addContent(userEntryElement);
         }