Various minor updates

Modified copyobject junit tests to run under ant junit task
eclipse-ee4j · Mar 25, 2008 · 40b2f82 · 40b2f82
1 parent 2e0b232
commit 40b2f82
Show file tree

Hide file tree

Showing 26 changed files with 1,529 additions and 232 deletions.
diff --git a/make/test.xml b/make/test.xml
@@ -102,7 +102,7 @@
 </target>
 
 <target name="make-output-directory" depends="init">
-    <mkdir dir="${test.output}"/>
+    <mkdir dir="${test.output}/junitreports"/>
 </target>
 
 <target name="test-rmi-iiop" depends="make-output-directory">
@@ -115,7 +115,47 @@
 </target>
 
 <target name="test-copyobject" depends="make-output-directory">
-    <run-test args="-file ../src/share/classes/corba/CopyObjectTests.tdesc -verbose"/>
+    <!-- <run-test args="-file ../src/share/classes/corba/CopyObjectTests.tdesc -verbose"/> 
+    <run-test args="-test corba.copyobjectpolicy.CopyObjectPolicyTest -verbose"/> -->
+    <junit printsummary="on" fork="on" forkmode="perTest" newenvironment="true" clonevm="false" maxmemory="200M" showoutput="true">
+	<sysproperty key="javax.rmi.CORBA.UtilClass" value="com.sun.corba.se.impl.javax.rmi.CORBA.Util"/>
+	<sysproperty key="javax.rmi.CORBA.StubClass" value="com.sun.corba.se.impl.javax.rmi.CORBA.StubDelegateImpl"/>
+	<sysproperty key="javax.rmi.CORBA.PortableRemoteObjectClass" value="com.sun.corba.se.impl.javax.rmi.PortableRemoteObject"/>
+	<sysproperty key="corba.test.orb.classpath" value="${classes.dir}:${orblib.classes.dir}"/>
+	<sysproperty key="http.server.port" value="9090"/>
+	<sysproperty key="java.rmi.server.codebase" value="http://localhost:9090/"/>
+	<sysproperty key="http.server.root.directory" value="../build/values2/classes"/>
+	<sysproperty key="java.security.policy" value="../src/share/classes/test.policy"/>
+	<sysproperty key="java.security.debug" value="debug"/>
+	<sysproperty key="org.omg.CORBA.ORBClass" value="com.sun.corba.se.impl.orb.ORBImpl"/>
+	<sysproperty key="org.omg.CORBA.ORBSingletonClass" value="com.sun.corba.se.impl.orb.ORBSingleton"/>
+	<sysproperty key="com.sun.corba.se.POA.ORBServerId" value="1"/>
+	<sysproperty key="com.sun.corba.se.ORBBase" value="${basedir}"/>
+	<sysproperty key="com.sun.corba.se.test.sourcepath" value="${test.source.path}"/>
+	<sysproperty key="com.sun.corba.se.ORBUseDynamicStub" value="${use.dynamic.stub}"/>
+	<sysproperty key="com.sun.corba.se.ORBUseCodegenReflectiveCopyobject" value="${use.codegen.copyobject}"/>
+	<sysproperty key="com.sun.corba.se.encoding.ORBEnableJavaSerialization" value="${use.java.serialization}"/>
+	<sysproperty key="com.sun.corba.se.ORBDebugForkedProcess" value="${debug.forked.process}"/>
+	<sysproperty key="com.sun.corba.se.ORBDebugStubGeneration" value="false"/>
+	<sysproperty key="emma.coverage.out.file" value="../../${emma.dir}/orb_coverage.ec"/>
+	<sysproperty key="emma.coverage.out.merge" value="true"/>
+	<sysproperty key="emma.rt.control" value="false"/>
+	<classpath>
+	    <pathelement location="${emma.classes.dir}"/>
+	    <pathelement location="${classes.dir}"/>
+	    <pathelement location="${orblib.classes.dir}"/>
+	    <pathelement location="${boot.dir}/lib/tools.jar"/>
+	    <pathelement location="${emma-jar}"/>
+	</classpath> 
+	<jvmarg value="-Xbootclasspath/p:${emma.classes.dir}:${classes.dir}:${orblib.classes.dir}:${boot.dir}/lib/tools.jar:${emma-jar}"/> 
+	<jvmarg line="${debug.args}"/>
+	<formatter type="xml"/>
+	<test name="corba.copyobject.NewReflectTest" todir="${test.output}/junitreports"/>
+	<test name="corba.copyobject.NewReflectFallbackTest" todir="${test.output}/junitreports"/>
+	<test name="corba.copyobject.OldReflectTest" todir="${test.output}/junitreports"/>
+	<test name="corba.copyobject.JavaStreamTest" todir="${test.output}/junitreports"/>
+	<test name="corba.copyobject.ORBStreamTest" todir="${test.output}/junitreports"/>
+    </junit>
 </target>
 
 <target name="test-pi" depends="make-output-directory">

diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
@@ -1,4 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project-private xmlns="http://www.netbeans.org/ns/project-private/1">
     <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
+        <file>file:/space/ws/mercurial/performance/src/share/classes/com/sun/corba/se/impl/transport/SocketOrChannelConnectionImpl.java</file>
+    </open-files>
 </project-private>
diff --git a/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java b/src/share/classes/com/sun/corba/se/impl/encoding/BufferManagerWriteStream.java
@@ -102,7 +102,7 @@ public void overflow (ByteBufferWithInfo bbwi)
 		throw se;
 	    }
 
-	    // bug 6328377: must not lose exception in PI
+	    // bug 6382377: must not lose exception in PI
 	    orb.getPIHandler().invokeClientPIEndingPoint( ReplyMessage.SYSTEM_EXCEPTION, se ) ;
 
 	    boolean retry = itr.reportException(null, se);

diff --git a/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java b/src/share/classes/com/sun/corba/se/impl/orbutil/ORBConstants.java
@@ -420,7 +420,7 @@ public static int makePersistent( int scid )
 
     public static final String DEFAULT_INS_HOST = "localhost";
 
-    public static final int DEFAULT_INS_PORT                     = 2089;
+    public static final int DEFAULT_INS_PORT                     = 2809;
 
     public static final int DEFAULT_INS_GIOP_MAJOR_VERSION       = 1;
 

diff --git a/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java b/src/share/classes/com/sun/corba/se/impl/protocol/CorbaClientRequestDispatcherImpl.java
@@ -399,7 +399,7 @@ public InputObject marshalingComplete1(
 		getContactInfoListIterator(orb)
 	            .reportException(messageMediator.getContactInfo(), e);
 
-	    // Bug 6328377: must not lose exception in PI
+	    // Bug 6382377: must not lose exception in PI
 	    // Must run interceptor end point before retrying.
 	    Exception newException = 
 		orb.getPIHandler().invokeClientPIEndingPoint(

diff --git a/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java b/src/share/classes/com/sun/corba/se/impl/resolver/INSURLOperationImpl.java
@@ -46,6 +46,7 @@
 
 import org.omg.CosNaming.NamingContextExt ;
 import org.omg.CosNaming.NamingContextExtHelper ;
+import org.omg.CORBA.ORBPackage.InvalidName ;
 
 import com.sun.corba.se.spi.ior.IOR;
 import com.sun.corba.se.spi.ior.IORTemplate;
@@ -166,8 +167,19 @@ private org.omg.CORBA.Object resolveCorbaloc(
     {
         org.omg.CORBA.Object result = null;
         // If RIR flag is true use the Bootstrap protocol
+	// Bug 6670615 noticed that this is incorrect: rir means use resolve_initial_references
+	// on the local ORB!
         if( theCorbaLocObject.getRIRFlag( ) )  {
-            result = bootstrapResolver.resolve(theCorbaLocObject.getKeyString());
+            // result = bootstrapResolver.resolve(theCorbaLocObject.getKeyString());
+	    String keyString = theCorbaLocObject.getKeyString() ;
+	    if (keyString.equals( "" ))
+		keyString = "NameService" ;
+
+	    try {
+		result = orb.resolve_initial_references( keyString ) ;
+	    } catch (InvalidName exc) {
+		throw omgWrapper.soBadSchemaSpecific( exc ) ;
+	    }
 	} else {
 	    result = getIORUsingCorbaloc( theCorbaLocObject );
 	}

diff --git a/src/share/classes/com/sun/corba/se/impl/transport/TcpTimeoutsImpl.java b/src/share/classes/com/sun/corba/se/impl/transport/TcpTimeoutsImpl.java
@@ -58,7 +58,7 @@ public class TcpTimeoutsImpl implements TcpTimeouts
     public TcpTimeoutsImpl( String args ) {
 	this.wrapper = ORB.getStaticLogWrapperTable().get_UTIL_ORBUtil() ;
 	String[] data = args.split( ":" ) ;
-	if ((data.length <= 3) || (data.length > 4))
+	if ((data.length < 3) || (data.length > 4))
 	    wrapper.badTimeoutDataLength() ;
 
 	initial_time_to_wait = parseArg( "initial_time_to_wait", data[0] ) ;

diff --git a/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc b/src/share/classes/com/sun/corba/se/spi/logging/data/ORBUtil.mc
@@ -198,7 +198,7 @@
 	    (BAD_TIMEOUT_STRING_DATA
 	     30 WARNING "{0} is not a valid positive decimal integer for {1}")
 	    (BAD_TIMEOUT_DATA_LENGTH
-	     31 WARNING "Timeout data must be 3 positive decimal integers separated by :")
+	     31 WARNING "Timeout data must be 3 or 4 positive decimal integers separated by :")
 	    )
 	(BAD_INV_ORDER 
 	    (DSIMETHOD_NOTCALLED 
@@ -224,7 +224,7 @@
 	     2 WARNING "Invoked operation on unresolved recursive TypeCode"))
 	(COMM_FAILURE 
 	    (CONNECT_FAILURE
-	     1  WARNING "Connection failure: socketType: {0}; hostname: {1}; port: {2}")
+	     1  FINE "Connection failure: socketType: {0}; hostname: {1}; port: {2}")
 	    (WRITE_ERROR_SEND
 	     3  FINE "Write error sent")
 	    (GET_PROPERTIES_ERROR

diff --git a/test/src/share/classes/ALLTESTS.txt b/test/src/share/classes/ALLTESTS.txt