svn commit: r709562 - in /tuscany/branches/sca-equinox/modules/policy-security-jsr250/src: main/java/org/apache/tuscany/sca/implementation/java/ test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/ test/java/org/apache/tuscany/sca/poli...

[lr...@apache.org]

Author: lresende
Date: Fri Oct 31 13:46:38 2008
New Revision: 709562

URL: http://svn.apache.org/viewvc?rev=709562&view=rev
Log:
Fixing SPI violation in test case that was using non-exported package org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor

Removed:
    tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/main/java/org/apache/tuscany/sca/implementation/java/
    tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/implementation/java/introspect/impl/
Modified:
    tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java

Modified: tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java?rev=709562&r1=709561&r2=709562&view=diff
==============================================================================
--- tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java (original)
+++ tuscany/branches/sca-equinox/modules/policy-security-jsr250/src/test/java/org/apache/tuscany/sca/policy/jsr250/introspect/impl/PolicyProcessorTestCaseFIXME.java Fri Oct 31 13:46:38 2008
@@ -31,14 +31,9 @@
 import org.apache.tuscany.sca.implementation.java.DefaultJavaImplementationFactory;
 import org.apache.tuscany.sca.implementation.java.JavaImplementation;
 import org.apache.tuscany.sca.implementation.java.JavaImplementationFactory;
-import org.apache.tuscany.sca.implementation.java.introspect.impl.ServiceProcessor;
-import org.apache.tuscany.sca.interfacedef.java.DefaultJavaInterfaceFactory;
-import org.apache.tuscany.sca.interfacedef.java.JavaInterface;
-import org.apache.tuscany.sca.interfacedef.java.impl.PolicyJavaInterfaceVisitor;
 import org.apache.tuscany.sca.policy.DefaultPolicyFactory;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.PolicySetAttachPoint;
-import org.apache.tuscany.sca.policy.jsr250.introspect.impl.JSR250PolicyProcessor;
 import org.osoa.sca.annotations.Requires;
 import org.osoa.sca.annotations.Service;
 
@@ -46,52 +41,38 @@
  * @version $Rev$ $Date$
  */
 public class PolicyProcessorTestCaseFIXME extends TestCase {
-    private ServiceProcessor serviceProcessor;
     private JSR250PolicyProcessor policyProcessor;
-    private PolicyJavaInterfaceVisitor visitor;
     private JavaImplementation type;
 
     // This actually is a test for PolicyJavaInterfaceProcessor. It will get
     // invoked via the call to ImplementationProcessorServiceImpl.createService in
     // ServiceProcessor. Of course ServiceProcessor class has to be working.
     public void stestSingleInterfaceWithIntentsOnInterfaceAtInterfaceLevel() throws Exception {
-        serviceProcessor.visitClass(Service1.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
         policyProcessor.visitClass(Service1.class, type);
         verifyIntents(Service1.class, type);
     }
 
     public void stestMultipleInterfacesWithIntentsOnInterfaceAtInterfaceLevel() throws Exception {
-        serviceProcessor.visitClass(Service2.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
         policyProcessor.visitClass(Service2.class, type);
         verifyIntents(Service2.class, type);
     }
 
     public void stestSingleInterfaceWithIntentsOnImplAtClassLevel() throws Exception {
-        serviceProcessor.visitClass(Service3.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
         policyProcessor.visitClass(Service3.class, type);
         verifyIntents(Service3.class, type);
     }
 
     public void stestMultipleInterfacesWithIntentsOnImplAtClassLevel() throws Exception {
-        serviceProcessor.visitClass(Service4.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
         policyProcessor.visitClass(Service4.class, type);
         verifyIntents(Service4.class, type);
     }
 
     public void stestSingleInterfaceWithIntentsOnInterfaceAtMethodLevel() throws Exception {
-        serviceProcessor.visitClass(Service5.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
         policyProcessor.visitClass(Service5.class, type);
         verifyIntents(Service5.class, type);
     }
 
     public void testSingleInterfaceWithIntentsOnServiceAndInterfaceAtImplAndInertfaceAndMethodLevel() throws Exception {
-        serviceProcessor.visitClass(Service6.class, type);
-        visitor.visitInterface((JavaInterface)type.getServices().get(0).getInterfaceContract().getInterface());
         policyProcessor.visitClass(Service6.class, type);
         for (Method method : Service6.class.getDeclaredMethods()) {
             policyProcessor.visitMethod(method, type);
@@ -236,9 +217,7 @@
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        serviceProcessor = new ServiceProcessor(new DefaultAssemblyFactory(), new DefaultJavaInterfaceFactory());
         policyProcessor = new JSR250PolicyProcessor(new DefaultAssemblyFactory(), new DefaultPolicyFactory());
-        visitor = new PolicyJavaInterfaceVisitor(new DefaultPolicyFactory());
         JavaImplementationFactory javaImplementationFactory = new DefaultJavaImplementationFactory();
         type = javaImplementationFactory.createJavaImplementation();
     }