You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by tv...@apache.org on 2007/04/03 23:24:40 UTC
svn commit: r525284 [2/2] - in
/jakarta/turbine/fulcrum/trunk/security/api/src:
java/org/apache/fulcrum/security/model/basic/entity/
java/org/apache/fulcrum/security/model/basic/entity/impl/
java/org/apache/fulcrum/security/model/dynamic/entity/ java/o...
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/GroupSetTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/GroupSetTest.java?view=diff&rev=525284&r1=525283&r2=525284
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/GroupSetTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/GroupSetTest.java Tue Apr 3 14:24:38 2007
@@ -19,8 +19,8 @@
import org.apache.fulcrum.security.entity.Group;
import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
+import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicGroupImpl;
+import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicRoleImpl;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -50,7 +50,7 @@
public void testAddGroups() throws Exception
{
- Group group = new DynamicGroup();
+ Group group = new DynamicGroupImpl();
group.setId(new Integer(1));
group.setName("Eric");
GroupSet groupSet = new GroupSet();
@@ -58,12 +58,12 @@
assertFalse(groupSet.add(group));
assertTrue(groupSet.contains(group));
- Group group2 = new DynamicGroup();
+ Group group2 = new DynamicGroupImpl();
group2.setName("Kate");
group2.setId(new Integer(2));
groupSet.add(group2);
- Group group3 = new DynamicGroup();
+ Group group3 = new DynamicGroupImpl();
group3.setId(new Integer(1));
group3.setName("Eric");
groupSet.add(group3);
@@ -73,7 +73,7 @@
assertTrue(groupSet.contains(group3));
assertTrue(groupSet.contains(group));
- Role role = new DynamicRole();
+ Role role = new DynamicRoleImpl();
role.setName("role");
role.setId("role");
try {
@@ -102,14 +102,14 @@
groupSet.add(group);
assertTrue(groupSet.contains(group));
- Group group2 = new DynamicGroup();
+ Group group2 = new DynamicGroupImpl();
group2.setId(new Integer(1));
group2.setName("Eric");
assertTrue(groupSet.contains(group2));
}
- class GroupSubClass extends DynamicGroup
+ class GroupSubClass extends DynamicGroupImpl
{
private String extraGroupData;
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java?view=diff&rev=525284&r1=525283&r2=525284
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/RoleSetTest.java Tue Apr 3 14:24:38 2007
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
import org.apache.fulcrum.security.entity.Role;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicRole;
+import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicRoleImpl;
/**
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -48,19 +48,19 @@
public void testAddRoles() throws Exception
{
- Role role = new DynamicRole();
+ Role role = new DynamicRoleImpl();
role.setId(new Integer(1));
role.setName("Eric");
RoleSet roleSet = new RoleSet();
assertTrue(roleSet.add(role));
assertTrue(roleSet.contains(role));
- Role role2 = new DynamicRole();
+ Role role2 = new DynamicRoleImpl();
role2.setName("Kate");
role2.setId(new Integer(2));
roleSet.add(role2);
- Role role3 = new DynamicRole();
+ Role role3 = new DynamicRoleImpl();
role3.setId(new Integer(1));
role3.setName("Eric");
roleSet.add(role3);
@@ -81,14 +81,14 @@
roleSet.add(role);
assertTrue(roleSet.contains(role));
- Role role2 = new DynamicRole();
+ Role role2 = new DynamicRoleImpl();
role2.setId(new Integer(1));
role2.setName("Eric");
assertTrue(roleSet.contains(role2));
}
- class RoleSubClass extends DynamicRole
+ class RoleSubClass extends DynamicRoleImpl
{
private String extraRoleData;
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/SecuritySetTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/SecuritySetTest.java?view=diff&rev=525284&r1=525283&r2=525284
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/SecuritySetTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/SecuritySetTest.java Tue Apr 3 14:24:38 2007
@@ -17,7 +17,7 @@
import junit.framework.TestCase;
import org.apache.fulcrum.security.entity.Group;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicGroup;
+import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicGroupImpl;
/**
* Test using a SecuritySet. Useing various subclasses since it is
* Abstract.
@@ -52,7 +52,7 @@
{
SecuritySet securitySet = new GroupSet();
assertFalse(securitySet.containsName(null));
- Group g = new DynamicGroup();
+ Group g = new DynamicGroupImpl();
g.setName("BOB");
((GroupSet) securitySet).add(g);
@@ -65,7 +65,7 @@
{
SecuritySet securitySet = new GroupSet();
assertFalse(securitySet.containsName(null));
- Group g = new DynamicGroup();
+ Group g = new DynamicGroupImpl();
g.setName("BOB");
g.setId("BOB");
@@ -73,7 +73,7 @@
SecuritySet securitySet2 = new GroupSet();
assertFalse(securitySet.containsName(null));
- g = new DynamicGroup();
+ g = new DynamicGroupImpl();
g.setName("BOB");
g.setId("BOB");
@@ -96,7 +96,7 @@
public void testAdd() throws Exception
{
GroupSet securitySet = (GroupSet)getTestData();
- Group g = new DynamicGroup();
+ Group g = new DynamicGroupImpl();
g.setName("Michael");
g.setId("Michael");
assertTrue(securitySet.add(g));
@@ -106,11 +106,11 @@
{
SecuritySet securitySet = new GroupSet();
assertFalse(securitySet.containsName(null));
- Group g = new DynamicGroup();
+ Group g = new DynamicGroupImpl();
g.setName("JOE");
g.setId("JOE");
- Group g2 = new DynamicGroup();
+ Group g2 = new DynamicGroupImpl();
g2.setName("RICK");
g2.setId("RICK");
Modified: jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java
URL: http://svn.apache.org/viewvc/jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java?view=diff&rev=525284&r1=525283&r2=525284
==============================================================================
--- jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java (original)
+++ jakarta/turbine/fulcrum/trunk/security/api/src/test/org/apache/fulcrum/security/util/UserSetTest.java Tue Apr 3 14:24:38 2007
@@ -18,7 +18,7 @@
import junit.framework.TestCase;
import org.apache.fulcrum.security.entity.User;
-import org.apache.fulcrum.security.model.dynamic.entity.DynamicUser;
+import org.apache.fulcrum.security.model.dynamic.entity.impl.DynamicUserImpl;
/**
*
* @author <a href="mailto:epugh@upstate.com">Eric Pugh</a>
@@ -43,19 +43,19 @@
public void testAddUsers() throws Exception
{
- User user = new DynamicUser();
+ User user = new DynamicUserImpl();
user.setId(new Integer(1));
user.setName("Eric");
UserSet userSet = new UserSet();
userSet.add(user);
assertTrue(userSet.contains(user));
- User user2 = new DynamicUser();
+ User user2 = new DynamicUserImpl();
user2.setName("Kate");
user2.setId(new Integer(2));
userSet.add(user2);
- User user3 = new DynamicUser();
+ User user3 = new DynamicUserImpl();
user3.setId(new Integer(1));
user3.setName("Eric");
assertTrue(userSet.contains(user));
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org