Author: bdaw Date: 2009-04-02 18:33:10 -0400 (Thu, 02 Apr 2009) New Revision: 420 Added: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java Removed: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java Modified: idm/branches/proto/idm/src/test/resources/jboss-unit.xml Log: proto Deleted: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java =================================================================== --- idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java 2009-04-02 22:19:30 UTC (rev 419) +++ idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java 2009-04-02 22:33:10 UTC (rev 420) @@ -1,106 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.jboss.unit.api.pojo.annotations.Parameter; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class OrganizationJBossUnitTest extends IdentityTestPOJO implements APITestContext -{ - private OrganizationTest orgTest; - - private IdentitySessionFactory identitySessionFactory; - - private String samplePortalRealmName = "realm://portal/SamplePortal/DB"; - - private String sampleOrganizationRealmName = "realm://RedHat/DB"; - - - @Create - public void setUp() throws Exception - { - super.start(); - - orgTest = new OrganizationTest(this); - - identitySessionFactory = new IdentityConfigurationImpl(). - configure(getIdentityConfig()).buildIdentitySessionFactory(); - } - - @Destroy - public void tearDown() throws Exception - { - super.stop(); - } - - public IdentitySessionFactory getIdentitySessionFactory() - { - return identitySessionFactory; - } - - @Test - public void testOrganization() throws Exception - { - - orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); - } - - @Test - public void testSamplePortal() throws Exception - { - - orgTest.testSamplePortal(getSamplePortalRealmName()); - - } - - public String getSamplePortalRealmName() - { - return samplePortalRealmName; - } - - @Parameter - public void setSamplePortalRealmName(String samplePortalRealmName) - { - this.samplePortalRealmName = samplePortalRealmName; - } - - public String getSampleOrganizationRealmName() - { - return sampleOrganizationRealmName; - } - - @Parameter - public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) - { - this.sampleOrganizationRealmName = sampleOrganizationRealmName; - } -} \ No newline at end of file Deleted: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java =================================================================== --- idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-02 22:19:30 UTC (rev 419) +++ idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-02 22:33:10 UTC (rev 420) @@ -1,109 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.impl.LDAPTestPOJO; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.jboss.unit.api.pojo.annotations.Parameter; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class OrganizationLDAPJBossUnitTest extends LDAPTestPOJO implements APITestContext -{ - private OrganizationTest orgTest; - - private IdentitySessionFactory identitySessionFactory; - - private String samplePortalRealmName = "realm://portal/SamplePortal/DB_LDAP"; - - private String sampleOrganizationRealmName = "realm://RedHat/DB_LDAP"; - - - @Create - public void setUp() throws Exception - { - super.start(); - - orgTest = new OrganizationTest(this); - - populateClean(); - - identitySessionFactory = new IdentityConfigurationImpl(). - configure(getIdentityConfig()).buildIdentitySessionFactory(); - } - - @Destroy - public void tearDown() throws Exception - { - super.stop(); - } - - public IdentitySessionFactory getIdentitySessionFactory() - { - return identitySessionFactory; - } - - @Test - public void testOrganization() throws Exception - { - - orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); - } - - @Test - public void testSamplePortal() throws Exception - { - - orgTest.testSamplePortal(getSamplePortalRealmName()); - - } - - public String getSamplePortalRealmName() - { - return samplePortalRealmName; - } - - @Parameter - public void setSamplePortalRealmName(String samplePortalRealmName) - { - this.samplePortalRealmName = samplePortalRealmName; - } - - public String getSampleOrganizationRealmName() - { - return sampleOrganizationRealmName; - } - - @Parameter - public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) - { - this.sampleOrganizationRealmName = sampleOrganizationRealmName; - } -} \ No newline at end of file Copied: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java (from rev 419, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java) =================================================================== --- idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java (rev 0) +++ idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java 2009-04-02 22:33:10 UTC (rev 420) @@ -0,0 +1,109 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.impl.LDAPTestPOJO; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.jboss.unit.api.pojo.annotations.Parameter; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class OrganizationLDAPTestCase extends LDAPTestPOJO implements APITestContext +{ + private OrganizationTest orgTest; + + private IdentitySessionFactory identitySessionFactory; + + private String samplePortalRealmName = "realm://portal/SamplePortal/DB_LDAP"; + + private String sampleOrganizationRealmName = "realm://RedHat/DB_LDAP"; + + + @Create + public void setUp() throws Exception + { + super.start(); + + orgTest = new OrganizationTest(this); + + populateClean(); + + identitySessionFactory = new IdentityConfigurationImpl(). + configure(getIdentityConfig()).buildIdentitySessionFactory(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + public IdentitySessionFactory getIdentitySessionFactory() + { + return identitySessionFactory; + } + + @Test + public void testOrganization() throws Exception + { + + orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); + } + + @Test + public void testSamplePortal() throws Exception + { + + orgTest.testSamplePortal(getSamplePortalRealmName()); + + } + + public String getSamplePortalRealmName() + { + return samplePortalRealmName; + } + + @Parameter + public void setSamplePortalRealmName(String samplePortalRealmName) + { + this.samplePortalRealmName = samplePortalRealmName; + } + + public String getSampleOrganizationRealmName() + { + return sampleOrganizationRealmName; + } + + @Parameter + public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) + { + this.sampleOrganizationRealmName = sampleOrganizationRealmName; + } +} \ No newline at end of file Copied: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java (from rev 419, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java) =================================================================== --- idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java (rev 0) +++ idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java 2009-04-02 22:33:10 UTC (rev 420) @@ -0,0 +1,106 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.jboss.unit.api.pojo.annotations.Parameter; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class OrganizationTestCase extends IdentityTestPOJO implements APITestContext +{ + private OrganizationTest orgTest; + + private IdentitySessionFactory identitySessionFactory; + + private String samplePortalRealmName = "realm://portal/SamplePortal/DB"; + + private String sampleOrganizationRealmName = "realm://RedHat/DB"; + + + @Create + public void setUp() throws Exception + { + super.start(); + + orgTest = new OrganizationTest(this); + + identitySessionFactory = new IdentityConfigurationImpl(). + configure(getIdentityConfig()).buildIdentitySessionFactory(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + public IdentitySessionFactory getIdentitySessionFactory() + { + return identitySessionFactory; + } + + @Test + public void testOrganization() throws Exception + { + + orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); + } + + @Test + public void testSamplePortal() throws Exception + { + + orgTest.testSamplePortal(getSamplePortalRealmName()); + + } + + public String getSamplePortalRealmName() + { + return samplePortalRealmName; + } + + @Parameter + public void setSamplePortalRealmName(String samplePortalRealmName) + { + this.samplePortalRealmName = samplePortalRealmName; + } + + public String getSampleOrganizationRealmName() + { + return sampleOrganizationRealmName; + } + + @Parameter + public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) + { + this.sampleOrganizationRealmName = sampleOrganizationRealmName; + } +} \ No newline at end of file Modified: idm/branches/proto/idm/src/test/resources/jboss-unit.xml =================================================================== --- idm/branches/proto/idm/src/test/resources/jboss-unit.xml 2009-04-02 22:19:30 UTC (rev 419) +++ idm/branches/proto/idm/src/test/resources/jboss-unit.xml 2009-04-02 22:33:10 UTC (rev 420) @@ -12,14 +12,14 @@ <!--Without LDAP--> <test > - <class name="org.jboss.identity.idm.impl.api.OrganizationJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.api.OrganizationTestCase"/> <parameter name="sampleOrganizationRealmName" value="realm://RedHat/DB"/> <parameter name="samplePortalRealmName" value="realm://portal/SamplePortal/DB"/> </test> <!--With LDAP--> <test > - <class name="org.jboss.identity.idm.impl.api.OrganizationLDAPJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.api.OrganizationLDAPTestCase"/> <parameter name="directoryName" value="EmbeddedOpenDS"/> <parameter name="sampleOrganizationRealmName" value="realm://RedHat/DB_LDAP"/> <parameter name="samplePortalRealmName" value="realm://portal/SamplePortal/DB_LDAP"/>