Author: taylor
Date: Wed Jun 11 02:01:38 2014
New Revision: 1601798
URL: http://svn.apache.org/r1601798
Log:
JS2-1292: fixing test failures that starting occurring either when i switched
to new mysql or java7
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java?rev=1601798&r1=1601797&r2=1601798&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-security/src/test/java/org/apache/jetspeed/security/AbstractSecurityTestcase.java
Wed Jun 11 02:01:38 2014
@@ -163,7 +163,8 @@ public class AbstractSecurityTestcase ex
{
for (String name : ums.getUserNames(null))
{
- ums.removeUser(name);
+ if (!name.equals(ums.getAnonymousUser()))
+ ums.removeUser(name);
}
for (String name : rms.getRoleNames(null))
{
Modified:
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java?rev=1601798&r1=1601797&r2=1601798&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java
(original)
+++
portals/jetspeed-2/portal/trunk/components/jetspeed-sso/src/test/java/org/apache/jetspeed/sso/AbstractSecurityTestCase.java
Wed Jun 11 02:01:38 2014
@@ -174,7 +174,8 @@ public abstract class AbstractSecurityTe
{
for (String name : ums.getUserNames(null))
{
- ums.removeUser(name);
+ if (!name.equals(ums.getAnonymousUser()))
+ ums.removeUser(name);
}
for (String name : rms.getRoleNames(null))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
