[gatein-commits] gatein SVN: r3331 - in components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp: protocol/v1 and 1 other directory.
Author: chris.laprun(a)jboss.com
Date: 2010-06-14 18:52:05 -0400 (Mon, 14 Jun 2010)
New Revision: 3331
Modified:
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java
Log:
- WSRPProducerBaseTest shouldn't define the producer instance but leave it up to
subclasses to get the proper instance.
- V1ProducerBaseTest now properly retrieve the v1 producer. This also removes the shadowed
producer variable from WSRPProducerBaseTest.
Modified:
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java
===================================================================
---
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java 2010-06-14
20:43:13 UTC (rev 3330)
+++
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/producer/WSRPProducerBaseTest.java 2010-06-14
22:52:05 UTC (rev 3331)
@@ -32,8 +32,6 @@
*/
public abstract class WSRPProducerBaseTest extends TestCase
{
- protected WSRPProducerImpl producer = WSRPProducerImpl.getInstance();
-
protected WSRPProducerBaseTest(String name) throws Exception
{
super(name);
Modified:
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java
===================================================================
---
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java 2010-06-14
20:43:13 UTC (rev 3330)
+++
components/wsrp/trunk/producer/src/test/java/org/gatein/wsrp/protocol/v1/V1ProducerBaseTest.java 2010-06-14
22:52:05 UTC (rev 3331)
@@ -28,6 +28,7 @@
import org.gatein.registration.policies.DefaultRegistrationPolicy;
import org.gatein.registration.policies.DefaultRegistrationPropertyValidator;
import org.gatein.wsrp.WSRPConstants;
+import org.gatein.wsrp.producer.ProducerHolder;
import org.gatein.wsrp.producer.WSRPProducerBaseTest;
import org.gatein.wsrp.producer.config.ProducerRegistrationRequirements;
import org.gatein.wsrp.producer.v1.WSRP1Producer;
@@ -58,7 +59,7 @@
public abstract class V1ProducerBaseTest extends WSRPProducerBaseTest
{
private static final String CONSUMER = "test-consumer";
- protected WSRP1Producer producer;
+ protected WSRP1Producer producer = ProducerHolder.getV1Producer();
public V1ProducerBaseTest() throws Exception