Commit d7f783eb authored by Alinga Yeung's avatar Alinga Yeung
Browse files

Story 1840. Added a method to provide a list of formatted attributes in a... 

Story 1840. Added a method to provide a list of formatted attributes in a String to be used by the ac admin tool.
parent 96d1b97d

projects/cadcAccessControl/src/ca/nrc/cadc/ac/PersonalDetails.java

+22 −0
Original line number Diff line number Diff line
@@ -195,4 +195,26 @@ public class PersonalDetails implements UserDetails 
               institute + ", " + city + ", " + country + "]";

    }



    /**

     * Provide a list of all personal attributes in a String.

     * Each attribute contains its name and value on a separate line.

     * For example:

     * firstName: John

     * lastName: Doe

     * email: john.Doe@jd.com 

     */

    public String toStringFormatted()

    {

    	StringBuffer sb = new StringBuffer(NAME + "\n");

    	sb.append(FIRSTNAME + ": " + firstName +"\n");

    	sb.append(LASTNAME + ": " + lastName +"\n");

    	sb.append(EMAIL + ": " + email +"\n");

    	sb.append(ADDRESS + ": " + address +"\n");

    	sb.append(INSTITUTE + ": " + institute +"\n");

    	sb.append(CITY + ": " + city +"\n");

    	sb.append(COUNTRY + ": " + country +"\n");

	

    	

    	return sb.toString();

    }

}

projects/cadcAccessControl/test/src/ca/nrc/cadc/ac/PersonalDetailsTest.java

+9 −3
Original line number Diff line number Diff line
@@ -86,10 +86,15 @@ public class PersonalDetailsTest 
    @Test

    public void simplePersonalDetailsTest() throws Exception

    {

        PersonalDetails pd1 = new PersonalDetails("firstname", "lastname");

        PersonalDetails pd1 = new PersonalDetails("john", "doe");

        pd1.email = "john.doe@jd.com";

        pd1.address = "1234 john doe street";

        pd1.institute = "JD insttitute";

        pd1.city = "JD city";

        pd1.country = "JD country";

        

        assertEquals("firstname", pd1.getFirstName());

        assertEquals("lastname", pd1.getLastName());

        assertEquals("john", pd1.getFirstName());

        assertEquals("doe", pd1.getLastName());



        PersonalDetails pd2 = pd1;

        assertEquals(pd1.hashCode(), pd2.hashCode());
@@ -98,6 +103,7 @@ public class PersonalDetailsTest 
        

        // test toString

        System.out.println(pd1);

        System.out.print(pd1.toStringFormatted());

    }

    

    @Test