[openejb-scm] openejb/modules/core/src/test/org/openejb/corba/compiler PortableStubCompilerTest.java CompilerTest.java

[dain]

dain        2005/07/13 16:49:29

  Modified:    modules/core/src/test/org/openejb/corba/compiler
                        PortableStubCompilerTest.java
  Removed:     modules/core/src/test/org/openejb/corba/compiler
                        CompilerTest.java
  Log:

  Removed openorb/tmporb
  Removed tools jar hack
  Removed all stub/tie compiler code since is used openorb
  
  Revision  Changes    Path
  1.7       +13 -10    
openejb/modules/core/src/test/org/openejb/corba/compiler/PortableStubCompilerTest.java
  
  Index: PortableStubCompilerTest.java
  ===================================================================
  RCS file: 
/home/projects/openejb/scm/openejb/modules/core/src/test/org/openejb/corba/compiler/PortableStubCompilerTest.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- PortableStubCompilerTest.java     23 Jun 2005 04:28:03 -0000      1.6
  +++ PortableStubCompilerTest.java     13 Jul 2005 20:49:29 -0000      1.7
  @@ -51,8 +51,11 @@
   import java.util.HashSet;
   import java.util.Properties;
   import java.util.Set;
  +import java.util.Map;
  +import java.util.Iterator;
   
   import junit.framework.TestCase;
  +import org.openejb.corba.util.Util;
   
   /**
    * @version $Rev$ $Date$
  @@ -77,12 +80,13 @@
           File file = new File(basedir, propertiesFile);
           nameManglerProperties.load(new FileInputStream(file));
   
  -        Set methodSignatures = new HashSet();
  -        IiopOperation[] iiopOperations = 
PortableStubCompiler.createIiopOperations(intf);
           boolean failed = false;
  -        for (int i = 0; i < iiopOperations.length; i++) {
  -            IiopOperation iiopOperation = iiopOperations[i];
  -            Method method = iiopOperation.getMethod();
  +        Set methodSignatures = new HashSet();
  +        Map methodToOperation = Util.mapMethodToOperation(intf);
  +        for (Iterator iterator = methodToOperation.entrySet().iterator(); 
iterator.hasNext();) {
  +            Map.Entry entry = (Map.Entry) iterator.next();
  +            Method method = (Method) entry.getKey();
  +            String operation = (String) entry.getValue();
               String methodSignature = method.getName() + "(";
   
               Class[] parameterTypes = method.getParameterTypes();
  @@ -99,10 +103,9 @@
               methodSignatures.add(methodSignature);
   
               String expected = 
nameManglerProperties.getProperty(methodSignature);
  -            String actual = iiopOperation.getName();
  -            if (expected == null || !expected.equals(actual)) {
  +            if (expected == null || !expected.equals(operation)) {
                   System.out.println("Expected: " + expected);
  -                System.out.println("  Actual: " + actual);
  +                System.out.println("  Actual: " + operation);
                   System.out.println();
                   failed = true;
               }