summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--javae/test/IceE/location/build.xml2
-rw-r--r--javae/test/IceE/operations/build.xml2
-rw-r--r--javae/test/IceE/slicing/build.xml7
-rw-r--r--javae/test/IceE/slicing/csrc/AllTests.java92
-rw-r--r--javae/test/IceE/slicing/csrc/Client.java8
-rw-r--r--javae/test/IceE/slicing/ssrc/Server.java6
6 files changed, 59 insertions, 58 deletions
diff --git a/javae/test/IceE/location/build.xml b/javae/test/IceE/location/build.xml
index 3c9474b5d5c..4e99e7ce1d9 100644
--- a/javae/test/IceE/location/build.xml
+++ b/javae/test/IceE/location/build.xml
@@ -47,7 +47,7 @@
<attribute name="MicroEdition-Profile" value="MIDP-2.0"/>
</manifest>
- <copy file="./config" todir="./classes"/>
+ <copy overwrite="true" file="./config" todir="./classes"/>
<jar destfile="./tmp/TestMIDlet.jar" manifest="./MANIFEST.MF" basedir="./classes"/>
<jar destfile="./tmp/TestMIDlet.jar" manifest="./MANIFEST.MF" basedir="${lib.dir}" excludes="**/IceE.jar"
update="true"/>
diff --git a/javae/test/IceE/operations/build.xml b/javae/test/IceE/operations/build.xml
index 69e93c336a6..5749aa078ec 100644
--- a/javae/test/IceE/operations/build.xml
+++ b/javae/test/IceE/operations/build.xml
@@ -50,7 +50,7 @@
<attribute name="MicroEdition-Profile" value="MIDP-2.0"/>
</manifest>
- <copy file="./config" todir="./classes"/>
+ <copy overwrite="true" file="./config" todir="./classes"/>
<jar destfile="./tmp/TestMIDlet.jar" manifest="./MANIFEST.MF" basedir="./classes"/>
<jar destfile="./tmp/TestMIDlet.jar" manifest="./MANIFEST.MF" basedir="${lib.dir}" excludes="**/IceE.jar"
update="true"/>
diff --git a/javae/test/IceE/slicing/build.xml b/javae/test/IceE/slicing/build.xml
index 05978a73b74..6e4c6ec6e9e 100644
--- a/javae/test/IceE/slicing/build.xml
+++ b/javae/test/IceE/slicing/build.xml
@@ -76,6 +76,7 @@
<attribute name="MicroEdition-Profile" value="MIDP-2.0"/>
</manifest>
+ <copy overwrite="true" file="./config" todir="./cclasses"/>
<jar destfile="./tmp/ClientMIDlet.jar" manifest="./MANIFEST.MF" basedir="./cclasses"/>
<jar destfile="./tmp/ClientMIDlet.jar" manifest="./MANIFEST.MF" basedir="${lib.dir}" excludes="**/IceE.jar"
update="true"/>
@@ -119,7 +120,7 @@
<!-- Write the descriptor files -->
<target name="client-midlet" depends="client-midlet-jar" if="midp">
<length property="jarfile-length" file="./ClientMIDlet.jar"/>
- <jadfile file="server.jad">
+ <jadfile file="client.jad">
<attribute name="MIDlet-Version" value="1.0"/>
<attribute name="MIDlet-Vendor" value="ZeroC"/>
<attribute name="MIDlet-Jar-URL" value="ClientMIDlet.jar"/>
@@ -128,8 +129,8 @@
<attribute name="MIDlet-1" value="TestApplication, , TestApplication"/>
<attribute name="MIDlet-Jar-Size" value="${jarfile-length}"/>
<attribute name="MIDlet-Name" value="TestServer"/>
- <attribute name="runclient" value="false"/>
- <attribute name="runserver" value="true"/>
+ <attribute name="runclient" value="true"/>
+ <attribute name="runserver" value="false"/>
<attribute name="MIDlet-Permissions"
value="javax.microedition.io.Connector.socket, javax.microedition.io.Connector.serversocket"/>
</jadfile>
diff --git a/javae/test/IceE/slicing/csrc/AllTests.java b/javae/test/IceE/slicing/csrc/AllTests.java
index d6f2ba93ebb..2ec8200933b 100644
--- a/javae/test/IceE/slicing/csrc/AllTests.java
+++ b/javae/test/IceE/slicing/csrc/AllTests.java
@@ -63,24 +63,24 @@ public class AllTests
}
public static TestIntfPrx
- allTests(Ice.Communicator communicator, boolean collocated)
+ allTests(Ice.Communicator communicator, boolean collocated, java.io.PrintStream out)
{
- System.out.print("testing stringToProxy... ");
- System.out.flush();
+ out.print("testing stringToProxy... ");
+ out.flush();
String ref = communicator.getProperties().getPropertyWithDefault("Test.Proxy", "Test:default -p 12345 -t 2000");
Ice.ObjectPrx base = communicator.stringToProxy(ref);
test(base != null);
- System.out.println("ok");
+ out.println("ok");
- System.out.print("testing checked cast... ");
- System.out.flush();
+ out.print("testing checked cast... ");
+ out.flush();
TestIntfPrx test = TestIntfPrxHelper.checkedCast(base);
test(test != null);
test(test.equals(base));
- System.out.println("ok");
+ out.println("ok");
- System.out.print("base... ");
- System.out.flush();
+ out.print("base... ");
+ out.flush();
{
try
{
@@ -97,10 +97,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of unknown derived... ");
- System.out.flush();
+ out.print("slicing of unknown derived... ");
+ out.flush();
{
try
{
@@ -117,10 +117,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("non-slicing of known derived as base... ");
- System.out.flush();
+ out.print("non-slicing of known derived as base... ");
+ out.flush();
{
try
{
@@ -138,10 +138,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("non-slicing of known derived as derived... ");
- System.out.flush();
+ out.print("non-slicing of known derived as derived... ");
+ out.flush();
{
try
{
@@ -159,10 +159,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of unknown intermediate as base... ");
- System.out.flush();
+ out.print("slicing of unknown intermediate as base... ");
+ out.flush();
{
try
{
@@ -179,10 +179,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of known intermediate as base... ");
- System.out.flush();
+ out.print("slicing of known intermediate as base... ");
+ out.flush();
{
try
{
@@ -200,10 +200,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of known most derived as base... ");
- System.out.flush();
+ out.print("slicing of known most derived as base... ");
+ out.flush();
{
try
{
@@ -222,10 +222,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("non-slicing of known intermediate as intermediate... ");
- System.out.flush();
+ out.print("non-slicing of known intermediate as intermediate... ");
+ out.flush();
{
try
{
@@ -243,10 +243,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("non-slicing of known most derived as intermediate... ");
- System.out.flush();
+ out.print("non-slicing of known most derived as intermediate... ");
+ out.flush();
{
try
{
@@ -265,10 +265,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("non-slicing of known most derived as most derived... ");
- System.out.flush();
+ out.print("non-slicing of known most derived as most derived... ");
+ out.flush();
{
try
{
@@ -287,10 +287,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of unknown most derived, known intermediate as base... ");
- System.out.flush();
+ out.print("slicing of unknown most derived, known intermediate as base... ");
+ out.flush();
{
try
{
@@ -308,10 +308,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of unknown most derived, known intermediate as intermediate... ");
- System.out.flush();
+ out.print("slicing of unknown most derived, known intermediate as intermediate... ");
+ out.flush();
{
try
{
@@ -329,10 +329,10 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
- System.out.print("slicing of unknown most derived, unknown intermediate thrown as base... ");
- System.out.flush();
+ out.print("slicing of unknown most derived, unknown intermediate thrown as base... ");
+ out.flush();
{
try
{
@@ -349,7 +349,7 @@ public class AllTests
test(false);
}
}
- System.out.println("ok");
+ out.println("ok");
return test;
}
diff --git a/javae/test/IceE/slicing/csrc/Client.java b/javae/test/IceE/slicing/csrc/Client.java
index e74fd1cfad9..2b09f3a2f97 100644
--- a/javae/test/IceE/slicing/csrc/Client.java
+++ b/javae/test/IceE/slicing/csrc/Client.java
@@ -11,10 +11,10 @@ import Test.*;
public class Client
{
- private static int
- run(String[] args, Ice.Communicator communicator)
+ public static int
+ run(String[] args, Ice.Communicator communicator, java.io.PrintStream out)
{
- TestIntfPrx test = AllTests.allTests(communicator, false);
+ TestIntfPrx test = AllTests.allTests(communicator, false, out);
test.shutdown();
return 0;
}
@@ -28,7 +28,7 @@ public class Client
try
{
communicator = Ice.Util.initialize(args);
- status = run(args, communicator);
+ status = run(args, communicator, System.out);
}
catch(Ice.LocalException ex)
{
diff --git a/javae/test/IceE/slicing/ssrc/Server.java b/javae/test/IceE/slicing/ssrc/Server.java
index 4eb9cdc28ae..c2e11caa1f1 100644
--- a/javae/test/IceE/slicing/ssrc/Server.java
+++ b/javae/test/IceE/slicing/ssrc/Server.java
@@ -9,8 +9,8 @@
public class Server
{
- private static int
- run(String[] args, Ice.Communicator communicator)
+ public static int
+ run(String[] args, Ice.Communicator communicator, java.io.PrintStream out)
{
Ice.Properties properties = communicator.getProperties();
properties.setProperty("Ice.Warn.Dispatch", "0");
@@ -32,7 +32,7 @@ public class Server
try
{
communicator = Ice.Util.initialize(args);
- status = run(args, communicator);
+ status = run(args, communicator, System.out);
}
catch(Ice.LocalException ex)
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-05 10:45:33 +0000