You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2013/07/08 11:43:28 UTC
svn commit: r1500634 - in
/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque:
TorqueGroupManagerTest.java TorquePermissionManagerTest.java
TorqueRoleManagerTest.java TorqueUserManagerTest.java
Author: tv
Date: Mon Jul 8 09:43:28 2013
New Revision: 1500634
URL: http://svn.apache.org/r1500634
Log:
Remove criteria.clear() even in disabled code
Modified:
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java?rev=1500634&r1=1500633&r2=1500634&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueGroupManagerTest.java Mon Jul 8 09:43:28 2013
@@ -61,31 +61,31 @@ public class TorqueGroupManagerTest exte
criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicUserGroupPeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicGroupRolePeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicRolePermissionPeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
TorqueDynamicUserDelegatesPeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
TorqueUserPeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
TorqueGroupPeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
TorqueRolePeer.doDelete(criteria);
- criteria.clear();
+ criteria = new Criteria();
criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
TorquePermissionPeer.doDelete(criteria);
}
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java?rev=1500634&r1=1500633&r2=1500634&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorquePermissionManagerTest.java Mon Jul 8 09:43:28 2013
@@ -55,31 +55,31 @@ public class TorquePermissionManagerTest
* criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicUserGroupPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicGroupRolePeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicRolePermissionPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicUserDelegatesPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
* TorqueUserPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
* TorqueGroupPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
* TorqueRolePeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
* TorquePermissionPeer.doDelete(criteria);
* }
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java?rev=1500634&r1=1500633&r2=1500634&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueRoleManagerTest.java Mon Jul 8 09:43:28 2013
@@ -62,31 +62,31 @@ public class TorqueRoleManagerTest exten
* criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicUserGroupPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicGroupRolePeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicRolePermissionPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicUserDelegatesPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
* TorqueUserPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
* TorqueGroupPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
* TorqueRolePeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
* TorquePermissionPeer.doDelete(criteria);
* }
Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java?rev=1500634&r1=1500633&r2=1500634&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/TorqueUserManagerTest.java Mon Jul 8 09:43:28 2013
@@ -64,31 +64,31 @@ public class TorqueUserManagerTest exten
* criteria.where(TorqueDynamicUserGroupPeer.USER_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicUserGroupPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicGroupRolePeer.GROUP_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicGroupRolePeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicRolePermissionPeer.ROLE_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicRolePermissionPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueDynamicUserDelegatesPeer.DELEGATEE_USER_ID, 0, Criteria.GREATER_THAN);
* TorqueDynamicUserDelegatesPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueUserPeer.USER_ID, 0, Criteria.GREATER_THAN);
* TorqueUserPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueGroupPeer.GROUP_ID, 0, Criteria.GREATER_THAN);
* TorqueGroupPeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorqueRolePeer.ROLE_ID, 0, Criteria.GREATER_THAN);
* TorqueRolePeer.doDelete(criteria);
*
- * criteria.clear();
+ * criteria = new Criteria();
* criteria.where(TorquePermissionPeer.PERMISSION_ID, 0, Criteria.GREATER_THAN);
* TorquePermissionPeer.doDelete(criteria);
* }