Commit 635059fc authored by Jeff Burke's avatar Jeff Burke
Browse files

added cadcAccessControl unit tests

parent d4532a01

projects/cadcAccessControl/build.xml

+11 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ 
    </target>



    <!-- JAR files needed to run the test suite -->

    <property name="xerces"     value="${ext.dev}/xerces.jar" />

    <property name="xerces"     value="${ext.lib}/xerces.jar" />

    <property name="asm"        value="${ext.dev}/asm.jar" />

    <property name="cglib"      value="${ext.dev}/cglib.jar" />

    <property name="easymock"   value="${ext.dev}/easymock.jar" />
@@ -125,8 +125,17 @@ 
                <pathelement path="${build}/test/class"/>

                <pathelement path="${testingJars}"/>

            </classpath>

            <test name="ca.nrc.cadc.ac.UserTest" />

            <test name="ca.nrc.cadc.ac.GroupTest" />

            <test name="ca.nrc.cadc.ac.GroupPropertyTest" />

            <test name="ca.nrc.cadc.ac.GroupPropertyReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.GroupReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.IdentityReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.PersonalDetailsTest" />

            <test name="ca.nrc.cadc.ac.PosixDetailsTest" />

            <test name="ca.nrc.cadc.ac.UserDetailsReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.UserReaderWriterTest" />

            <test name="ca.nrc.cadc.ac.UserTest" />

            

            <formatter type="plain" usefile="false" />

        </junit>

    </target>

projects/cadcAccessControl/src/ca/nrc/cadc/ac/ACConstants.java→projects/cadcAccessControl/src/ca/nrc/cadc/ac/AC.java

+1 −2
Original line number Diff line number Diff line
@@ -68,9 +68,8 @@ 
 */

package ca.nrc.cadc.ac;



public class ACConstants

public class AC

{



    public static final String PROPERTY_GROUP_DESCRIPTION = "ivo://ivoa.net/gms#description";

    public static final String PROPERTY_OWNER_DN = "ivo://ivoa.net/gms#owner_dn";

    public static final String PROPERTY_USER_DN = "ivo://ivoa.net/gms#user_dn";

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

+26 −0
Original line number Diff line number Diff line
@@ -74,6 +74,32 @@ package ca.nrc.cadc.ac; 
 */

public class GroupProperty

{

    /**

     * Name of the GroupProperty element.

     */

    public static final String NAME = "property";

    

    /**

     * Name of the property key attribute in the GroupProperty element.

     */

    public static final String KEY_ATTRIBUTE = "key";

    

    /**

     * Name of the property type attribute in the GroupProperty element.

     */

    public static final String TYPE_ATTRIBUTE = "type";

    

    /**

     * Name of the property readOnly attribute in the GroupProperty element.

     */

    public static final String READONLY_ATTRIBUTE = "readOnly";

    

    /**

     * Allowed types.

     */

    public static final String STRING_TYPE = "String";

    public static final String INTEGER_TYPE = "Integer";

    

    // The property identifier

    private String key;

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

+6 −5
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ import java.io.Reader; 
import java.io.StringReader;

import java.io.UnsupportedEncodingException;

import java.net.URISyntaxException;

import java.security.Principal;

import java.text.DateFormat;

import java.text.ParseException;

import java.util.List;
@@ -180,7 +181,7 @@ public class GroupReader 
            String error = "owner missing required user element";

            throw new ReaderException(error);

        }

        User user = UserReader.parseUser(userElement);

        User<? extends Principal> user = UserReader.parseUser(userElement);



        Group group = new Group(groupID, user);

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

+9 −7
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ import java.io.OutputStream; 
import java.io.OutputStreamWriter;

import java.io.UnsupportedEncodingException;

import java.io.Writer;

import java.security.Principal;

import java.text.DateFormat;

import java.util.Set;

import org.jdom2.Attribute;
@@ -194,7 +195,7 @@ public class GroupWriter 
            if ((group.getUserMembers() != null) && (!group.getUserMembers().isEmpty()))

            {

                Element userMembersElement = new Element("userMembers");

                for (User userMember : group.getUserMembers())

                for (User<? extends Principal> userMember : group.getUserMembers())

                {

                    userMembersElement.addContent(UserWriter.getUserElement(userMember));

                }
@@ -212,4 +213,5 @@ public class GroupWriter 
        outputter.setFormat(Format.getPrettyFormat());

        outputter.output(new Document(root), writer);

    }

    

}