svn commit: r159730 - in incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNetClient/procedure.out tests/lang/procedure.java

[kmarsden]

Author: kmarsden
Date: Fri Apr  1 12:49:39 2005
New Revision: 159730

URL: http://svn.apache.org/viewcvs?view=rev&rev=159730
Log:
        
Enable missing test for client


Modified:
    
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
    
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java

Modified: 
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out?view=diff&r1=159729&r2=159730
==============================================================================
--- 
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
 (original)
+++ 
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/procedure.out
 Fri Apr  1 12:49:39 2005
@@ -264,6 +264,7 @@
 EXPECTED SQL Exception: (39004) A NULL value cannot be passed to a method 
which takes a parameter of primitive type 'short'.
 p_inout 9 p_out 6
 p_inout 9 null?false p_out 6 null?false
+p_inout 9 null?false p_out 6 null?false
 outparams
 DEFINED PROCEDURES FOR OP1
   APP.OP1 AS 
org.apache.derbyTesting.functionTests.util.ProcedureTest.outparams1(OUT A 
INTEGER,IN B INTEGER) LANGUAGE JAVA PARAMETER STYLE JAVA MODIFIES SQL DATA

Modified: 
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
URL: 
http://svn.apache.org/viewcvs/incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java?view=diff&r1=159729&r2=159730
==============================================================================
--- 
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
 (original)
+++ 
incubator/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/procedure.java
 Fri Apr  1 12:49:39 2005
@@ -829,17 +829,14 @@
                ptsi.execute();
                System.out.println("p_inout " + ptsi.getByte(2) + " null?" + 
ptsi.wasNull() + " p_out " + ptsi.getByte(3) + " null?" + ptsi.wasNull());
 
-               if (!TestUtil.isDerbyNetClientFramework())
-               {
-                       // with setObject . Beetle 5439
-                       ptsi.setObject(1, new Integer(6));
-                       ptsi.setObject(2, new Integer(3));
-                       
-                       ptsi.execute();
-                       System.out.println("p_inout " + ptsi.getByte(2) + " 
null?" + ptsi.wasNull() + " p_out " + ptsi.getByte(3) + " null?" + 
ptsi.wasNull());
-               }
+               // with setObject . Beetle 5439
+               ptsi.setObject(1, new Integer(6));
+               ptsi.setObject(2, new Integer(3));
+               
+               ptsi.execute();
+               System.out.println("p_inout " + ptsi.getByte(2) + " null?" + 
ptsi.wasNull() + " p_out " + ptsi.getByte(3) + " null?" + ptsi.wasNull());
                ptsi.close();
-
+               
                s.execute("DROP procedure PTSMALLINT2");                
                s.execute("DROP TABLE PT1");