svn commit: r1661906 - in /turbine/fulcrum/trunk/security/torque/src: java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java

[gk...@apache.org]

Author: gk
Date: Tue Feb 24 12:07:18 2015
New Revision: 1661906

URL: http://svn.apache.org/r1661906
Log:
- Deactivate test for custom peer setting until Torque 4.1 is released.
- Add getConstructor to get InvocationTargetException.

Modified:
    turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java
    turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java

Modified: turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java?rev=1661906&r1=1661905&r2=1661906&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/java/org/apache/fulcrum/security/torque/peer/PeerManagerDefaultImpl.java Tue Feb 24 12:07:18 2015
@@ -41,7 +41,7 @@ public class PeerManagerDefaultImpl exte
         }
         try
         {
-            P peer = (P) Class.forName(peerClassName).newInstance();
+            P peer = (P) Class.forName(peerClassName).getConstructor().newInstance();
             getLogger().debug( " getPeerInstance():" +  peer);
             peers.put( peerClassName, peer );
             return peer;

Modified: turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java
URL: http://svn.apache.org/viewvc/turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java?rev=1661906&r1=1661905&r2=1661906&view=diff
==============================================================================
--- turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java (original)
+++ turbine/fulcrum/trunk/security/torque/src/test/org/apache/fulcrum/security/torque/turbine/TorquePeerTurbineModelManagerTest.java Tue Feb 24 12:07:18 2015
@@ -33,6 +33,8 @@ import org.apache.torque.TorqueException
 import org.apache.torque.criteria.Criteria;
 
 /**
+ * Test with @link {@link #customPeers} requires at least Torque version 4.1.
+ * 
  * @author <a href="mailto:tv@apache.org">Thomas Vandahl</a>
  * @author <a href="jh@byteaction.de">J&#252;rgen Hoffmann</a>
  * @version $Id$
@@ -41,6 +43,8 @@ public class TorquePeerTurbineModelManag
     extends AbstractTurbineModelManagerTest
 {
     protected static HsqlDB hsqlDB = null;
+    
+    public static boolean customPeers = false;
 
     public void setUp() throws Exception
     {
@@ -53,7 +57,10 @@ public class TorquePeerTurbineModelManag
 
             this.setRoleFileName("src/test/TurbineTorqueRoleConfig.xml");            
             
-            this.setConfigurationFileName("src/test/TurbineTorqueWithPeersComponentConfig.xml");
+            if (customPeers)
+                this.setConfigurationFileName("src/test/TurbineTorqueWithPeersComponentConfig.xml");
+            else
+                this.setConfigurationFileName("src/test/TurbineTorqueComponentConfig.xml");
             
             // The successful Test requires that the PeerImpl classes (in configuration file) implement the interface TorqueTurbinePeer,
             // cft. ClassCastException messages.
@@ -71,7 +78,7 @@ public class TorquePeerTurbineModelManag
     
     public void testCustomPeerSet() {
         if (roleManager instanceof AbstractEntityManager) {
-            assertTrue( "As a custom Peer for RoleManager should be tested, a peerClassName element should be set in the configuration file for roleManager.", ((AbstractEntityManager)roleManager).getCustomPeer() == true);
+            assertTrue( "If a custom Peer for RoleManager should be tested, a peerClassName element should be set in the configuration file for roleManager.", ((AbstractEntityManager)roleManager).getCustomPeer() == customPeers);
         }
         if (roleManager instanceof PeerManagable) {
             assertNotNull(((PeerManagable)roleManager).getPeerManager());