summaryrefslogtreecommitdiff
path: root/java/test
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
committerBernard Normier <bernard@zeroc.com>2012-10-23 16:19:38 -0400
commitada25bad3511a359eb28cf48f018d6a42e166f10 (patch)
tree430749f887a1c6f708c2d4a23b3e3ec4ef18ef2c /java/test
parentRuby 1.8 fix (diff)
downloadice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.bz2
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.tar.xz
ice-ada25bad3511a359eb28cf48f018d6a42e166f10.zip
Fixed ICE-4855: expand tabs to space (8) for .php, .cpp, .h, .java and .cs files
Diffstat (limited to 'java/test')
-rw-r--r--java/test/Freeze/evictor/Client.java22
-rw-r--r--java/test/Freeze/evictor/RemoteEvictorI.java10
-rw-r--r--java/test/Glacier2/router/Client.java4
-rw-r--r--java/test/Ice/adapterDeactivation/AllTests.java2
-rw-r--r--java/test/Ice/adapterDeactivation/Client.java2
-rw-r--r--java/test/Ice/adapterDeactivation/Server.java2
-rw-r--r--java/test/Ice/ami/Server.java4
-rw-r--r--java/test/Ice/background/Client.java2
-rw-r--r--java/test/Ice/background/Collocated.java118
-rw-r--r--java/test/Ice/background/Server.java2
-rw-r--r--java/test/Ice/binding/AllTests.java2
-rw-r--r--java/test/Ice/binding/Server.java4
-rw-r--r--java/test/Ice/checksum/Client.java6
-rw-r--r--java/test/Ice/checksum/Server.java6
-rw-r--r--java/test/Ice/dispatcher/Server.java4
-rw-r--r--java/test/Ice/exceptions/Collocated.java4
-rw-r--r--java/test/Ice/facets/AllTests.java2
-rw-r--r--java/test/Ice/faultTolerance/Client.java4
-rw-r--r--java/test/Ice/interceptor/Client.java4
-rw-r--r--java/test/Ice/objects/AllTests.java2
-rw-r--r--java/test/Ice/packagemd/AllTests.java2
-rw-r--r--java/test/Ice/servantLocator/AllTests.java2
-rw-r--r--java/test/Ice/slicing/exceptions/AllTests.java2
-rw-r--r--java/test/Ice/stream/Client.java2
-rw-r--r--java/test/Ice/udp/Server.java2
-rw-r--r--java/test/IceGrid/simple/Server.java4
26 files changed, 110 insertions, 110 deletions
diff --git a/java/test/Freeze/evictor/Client.java b/java/test/Freeze/evictor/Client.java
index 76f89e2fc64..8c057070c59 100644
--- a/java/test/Freeze/evictor/Client.java
+++ b/java/test/Freeze/evictor/Client.java
@@ -579,17 +579,17 @@ public class Client extends test.Util.Application
{
}
- //
- // Call an operation that does not exist on the servant
- //
- try
- {
- int balance = AccountPrxHelper.uncheckedCast(servants[0]).getBalance();
- test(false);
- }
- catch(Ice.OperationNotExistException ex)
- {
- }
+ //
+ // Call an operation that does not exist on the servant
+ //
+ try
+ {
+ int balance = AccountPrxHelper.uncheckedCast(servants[0]).getBalance();
+ test(false);
+ }
+ catch(Ice.OperationNotExistException ex)
+ {
+ }
//
// Remove all facets
diff --git a/java/test/Freeze/evictor/RemoteEvictorI.java b/java/test/Freeze/evictor/RemoteEvictorI.java
index 8f88d18d802..cfb6c7fe620 100644
--- a/java/test/Freeze/evictor/RemoteEvictorI.java
+++ b/java/test/Freeze/evictor/RemoteEvictorI.java
@@ -78,11 +78,11 @@ public final class RemoteEvictorI extends _RemoteEvictorDisp
true);
}
- //
- // Check that we can get an iterator on a non-existing facet
- //
- Freeze.EvictorIterator p = _evictor.getIterator("foo", 1);
- test(p.hasNext() == false);
+ //
+ // Check that we can get an iterator on a non-existing facet
+ //
+ Freeze.EvictorIterator p = _evictor.getIterator("foo", 1);
+ test(p.hasNext() == false);
initializer.init(this, _evictor);
diff --git a/java/test/Glacier2/router/Client.java b/java/test/Glacier2/router/Client.java
index 572ff0989ab..036358df2c1 100644
--- a/java/test/Glacier2/router/Client.java
+++ b/java/test/Glacier2/router/Client.java
@@ -468,8 +468,8 @@ public class Client extends test.Util.Application
public static void
main(String[] args)
{
- Client c = new Client();
- int status = c.main("Client", args);
+ Client c = new Client();
+ int status = c.main("Client", args);
System.gc();
System.exit(status);
diff --git a/java/test/Ice/adapterDeactivation/AllTests.java b/java/test/Ice/adapterDeactivation/AllTests.java
index de0b09b36ef..ecdc6935faf 100644
--- a/java/test/Ice/adapterDeactivation/AllTests.java
+++ b/java/test/Ice/adapterDeactivation/AllTests.java
@@ -28,7 +28,7 @@ public class AllTests
public static TestIntfPrx
allTests(Ice.Communicator communicator, java.io.PrintWriter out)
{
- out.print("testing stringToProxy... ");
+ out.print("testing stringToProxy... ");
out.flush();
String ref = "test:default -p 12010";
Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/adapterDeactivation/Client.java b/java/test/Ice/adapterDeactivation/Client.java
index 6930d16f4d5..b78b88a3dd6 100644
--- a/java/test/Ice/adapterDeactivation/Client.java
+++ b/java/test/Ice/adapterDeactivation/Client.java
@@ -30,7 +30,7 @@ public class Client extends test.Util.Application
public static void
main(String[] args)
{
- Client app = new Client();
+ Client app = new Client();
int result = app.main("Client", args);
System.gc();
System.exit(result);
diff --git a/java/test/Ice/adapterDeactivation/Server.java b/java/test/Ice/adapterDeactivation/Server.java
index 0e4f6d36ea7..fdba37a4548 100644
--- a/java/test/Ice/adapterDeactivation/Server.java
+++ b/java/test/Ice/adapterDeactivation/Server.java
@@ -36,7 +36,7 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server app = new Server();
+ Server app = new Server();
int result = app.main("Server", args);
System.gc();
diff --git a/java/test/Ice/ami/Server.java b/java/test/Ice/ami/Server.java
index f9e38e63dec..bf2512c1c79 100644
--- a/java/test/Ice/ami/Server.java
+++ b/java/test/Ice/ami/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
@@ -41,7 +41,7 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server app = new Server();
+ Server app = new Server();
int result = app.main("Server", args);
System.gc();
System.exit(result);
diff --git a/java/test/Ice/background/Client.java b/java/test/Ice/background/Client.java
index c640a8024c0..722f6855f41 100644
--- a/java/test/Ice/background/Client.java
+++ b/java/test/Ice/background/Client.java
@@ -60,7 +60,7 @@ public class Client extends test.Util.Application
public static void
main(String[] args)
{
- Client app = new Client();
+ Client app = new Client();
int result = app.main("Client", args);
System.gc();
System.exit(result);
diff --git a/java/test/Ice/background/Collocated.java b/java/test/Ice/background/Collocated.java
index 8aadec2213c..34e930c8d04 100644
--- a/java/test/Ice/background/Collocated.java
+++ b/java/test/Ice/background/Collocated.java
@@ -16,66 +16,66 @@ public class Collocated
public static void
main(String[] args)
{
- final Client client = new Client();
- final Server server = new Server();
- Thread t = new Thread(new Runnable()
- {
- public void run()
- {
- String[] args =
- {
- "--Ice.NullHandleAbort=1",
- "--Ice.Warn.Connections=1",
- "--Ice.ThreadPool.Server.Size=1",
- "--Ice.ThreadPool.Server.SizeMax=3",
- "--Ice.ThreadPool.Server.SizeWarn=0",
- "--Ice.PrintAdapterReady=1",
- "--Ice.ServerIdleTime=30",
- "--Ice.Default.Host=127.0.0.1"
- };
- server.setServerReadyListener(new test.Util.Application.ServerReadyListener()
- {
- public void serverReady()
- {
- _clientThread = new Thread(new Runnable()
- {
- public void run()
- {
- String[] args =
- {
- "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1", "--Ice.Default.Host=127.0.0.1"
- };
- client.main("Client", args);
- }
- });
- _clientThread.start();
- }
- });
+ final Client client = new Client();
+ final Server server = new Server();
+ Thread t = new Thread(new Runnable()
+ {
+ public void run()
+ {
+ String[] args =
+ {
+ "--Ice.NullHandleAbort=1",
+ "--Ice.Warn.Connections=1",
+ "--Ice.ThreadPool.Server.Size=1",
+ "--Ice.ThreadPool.Server.SizeMax=3",
+ "--Ice.ThreadPool.Server.SizeWarn=0",
+ "--Ice.PrintAdapterReady=1",
+ "--Ice.ServerIdleTime=30",
+ "--Ice.Default.Host=127.0.0.1"
+ };
+ server.setServerReadyListener(new test.Util.Application.ServerReadyListener()
+ {
+ public void serverReady()
+ {
+ _clientThread = new Thread(new Runnable()
+ {
+ public void run()
+ {
+ String[] args =
+ {
+ "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1", "--Ice.Default.Host=127.0.0.1"
+ };
+ client.main("Client", args);
+ }
+ });
+ _clientThread.start();
+ }
+ });
- result = server.main("Server", args);
- if(_clientThread != null)
- {
- while(_clientThread.isAlive())
- {
- try
- {
- _clientThread.join();
- }
- catch(InterruptedException e1)
- {
- }
- }
- }
- }
- });
- t.start();
- try
- {
- t.join();
- }
- catch(InterruptedException ex)
- {
- }
+ result = server.main("Server", args);
+ if(_clientThread != null)
+ {
+ while(_clientThread.isAlive())
+ {
+ try
+ {
+ _clientThread.join();
+ }
+ catch(InterruptedException e1)
+ {
+ }
+ }
+ }
+ }
+ });
+ t.start();
+ try
+ {
+ t.join();
+ }
+ catch(InterruptedException ex)
+ {
+ }
System.gc();
System.exit(result);
}
diff --git a/java/test/Ice/background/Server.java b/java/test/Ice/background/Server.java
index 648229d8d33..34c012e2e73 100644
--- a/java/test/Ice/background/Server.java
+++ b/java/test/Ice/background/Server.java
@@ -141,7 +141,7 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server app = new Server();
+ Server app = new Server();
int result = app.main("Server", args);
System.gc();
System.exit(result);
diff --git a/java/test/Ice/binding/AllTests.java b/java/test/Ice/binding/AllTests.java
index e21d1bc8ef4..65c84f0b2cc 100644
--- a/java/test/Ice/binding/AllTests.java
+++ b/java/test/Ice/binding/AllTests.java
@@ -102,7 +102,7 @@ public class AllTests
String ref = "communicator:default -p 12010";
RemoteCommunicatorPrx com = RemoteCommunicatorPrxHelper.uncheckedCast(communicator.stringToProxy(ref));
- out.print("testing binding with single endpoint... ");
+ out.print("testing binding with single endpoint... ");
out.flush();
{
RemoteObjectAdapterPrx adapter = com.createObjectAdapter("Adapter", "default");
diff --git a/java/test/Ice/binding/Server.java b/java/test/Ice/binding/Server.java
index 5579fbe0035..d45c49a02cd 100644
--- a/java/test/Ice/binding/Server.java
+++ b/java/test/Ice/binding/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Identity id = communicator.stringToIdentity("communicator");
adapter.add(new RemoteCommunicatorI(), id);
@@ -35,7 +35,7 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server app = new Server();
+ Server app = new Server();
int result = app.main("Server", args);
System.gc();
System.exit(result);
diff --git a/java/test/Ice/checksum/Client.java b/java/test/Ice/checksum/Client.java
index 29de6990009..f1f662592b9 100644
--- a/java/test/Ice/checksum/Client.java
+++ b/java/test/Ice/checksum/Client.java
@@ -16,7 +16,7 @@ public class Client extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
ChecksumPrx checksum = AllTests.allTests(communicator, false, getWriter());
checksum.shutdown();
return 0;
@@ -34,8 +34,8 @@ public class Client extends test.Util.Application
public static void
main(String[] args)
{
- Client c = new Client();
- int status = c.main("Client", args);
+ Client c = new Client();
+ int status = c.main("Client", args);
System.gc();
System.exit(status);
diff --git a/java/test/Ice/checksum/Server.java b/java/test/Ice/checksum/Server.java
index c4f249372de..3a5225764ca 100644
--- a/java/test/Ice/checksum/Server.java
+++ b/java/test/Ice/checksum/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010");
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object object = new ChecksumI();
@@ -34,8 +34,8 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server c = new Server();
- int status = c.main("Server", args);
+ Server c = new Server();
+ int status = c.main("Server", args);
System.gc();
System.exit(status);
diff --git a/java/test/Ice/dispatcher/Server.java b/java/test/Ice/dispatcher/Server.java
index b6d268e4bd6..980dd7aaaad 100644
--- a/java/test/Ice/dispatcher/Server.java
+++ b/java/test/Ice/dispatcher/Server.java
@@ -14,7 +14,7 @@ public class Server extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
Ice.ObjectAdapter adapter = communicator().createObjectAdapter("TestAdapter");
Ice.ObjectAdapter adapter2 = communicator().createObjectAdapter("ControllerAdapter");
@@ -53,7 +53,7 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server app = new Server();
+ Server app = new Server();
int result = app.main("Server", args);
app.terminate();
System.gc();
diff --git a/java/test/Ice/exceptions/Collocated.java b/java/test/Ice/exceptions/Collocated.java
index 1da9731cff0..7d8b27b602e 100644
--- a/java/test/Ice/exceptions/Collocated.java
+++ b/java/test/Ice/exceptions/Collocated.java
@@ -14,7 +14,7 @@ public class Collocated extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
Ice.ObjectAdapter adapter = communicator.createObjectAdapter("TestAdapter");
Ice.Object object = new ThrowerI();
adapter.add(object, communicator.stringToIdentity("thrower"));
@@ -36,7 +36,7 @@ public class Collocated extends test.Util.Application
public static void
main(String[] args)
{
- Collocated app = new Collocated();
+ Collocated app = new Collocated();
int result = app.main("Collocated", args);
System.gc();
System.exit(result);
diff --git a/java/test/Ice/facets/AllTests.java b/java/test/Ice/facets/AllTests.java
index 9932421b963..6cff107412c 100644
--- a/java/test/Ice/facets/AllTests.java
+++ b/java/test/Ice/facets/AllTests.java
@@ -35,7 +35,7 @@ public class AllTests
public static GPrx
allTests(Ice.Communicator communicator, PrintWriter out)
{
- out.print("testing Ice.Admin.Facets property... ");
+ out.print("testing Ice.Admin.Facets property... ");
test(communicator.getProperties().getPropertyAsList("Ice.Admin.Facets").length == 0);
communicator.getProperties().setProperty("Ice.Admin.Facets", "foobar");
String[] facetFilter = communicator.getProperties().getPropertyAsList("Ice.Admin.Facets");
diff --git a/java/test/Ice/faultTolerance/Client.java b/java/test/Ice/faultTolerance/Client.java
index 984d5954fcb..80db5140566 100644
--- a/java/test/Ice/faultTolerance/Client.java
+++ b/java/test/Ice/faultTolerance/Client.java
@@ -25,7 +25,7 @@ public class Client extends test.Util.Application
{
PrintWriter out = getWriter();
- Ice.Communicator communicator = communicator();
+ Ice.Communicator communicator = communicator();
java.util.List<Integer> ports = new java.util.ArrayList<Integer>(args.length);
for(String arg : args)
{
@@ -56,7 +56,7 @@ public class Client extends test.Util.Application
if(ports.isEmpty())
{
- out.println("Client: no ports specified");
+ out.println("Client: no ports specified");
usage();
return 1;
}
diff --git a/java/test/Ice/interceptor/Client.java b/java/test/Ice/interceptor/Client.java
index b2b2bd78472..bea4345026c 100644
--- a/java/test/Ice/interceptor/Client.java
+++ b/java/test/Ice/interceptor/Client.java
@@ -115,7 +115,7 @@ public class Client extends test.Util.Application
private int
runAmd(MyObjectPrx prx, AMDInterceptorI interceptor, PrintWriter out)
{
- out.print("testing simple interceptor... ");
+ out.print("testing simple interceptor... ");
out.flush();
test(interceptor.getLastOperation() == null);
test(interceptor.getLastStatus() == null);
@@ -201,7 +201,7 @@ public class Client extends test.Util.Application
oa.activate();
PrintWriter out = getWriter();
- out.println("Collocation optimization on");
+ out.println("Collocation optimization on");
int rs = run(prx, interceptor);
if(rs == 0)
{
diff --git a/java/test/Ice/objects/AllTests.java b/java/test/Ice/objects/AllTests.java
index e42ac1c167e..1e955dd02d5 100644
--- a/java/test/Ice/objects/AllTests.java
+++ b/java/test/Ice/objects/AllTests.java
@@ -41,7 +41,7 @@ public class AllTests
public static InitialPrx
allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
{
- out.print("testing stringToProxy... ");
+ out.print("testing stringToProxy... ");
out.flush();
String ref = "initial:default -p 12010";
Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/packagemd/AllTests.java b/java/test/Ice/packagemd/AllTests.java
index ed6cc29c751..525f02f51e5 100644
--- a/java/test/Ice/packagemd/AllTests.java
+++ b/java/test/Ice/packagemd/AllTests.java
@@ -33,7 +33,7 @@ public class AllTests
public static InitialPrx
allTests(Ice.Communicator communicator, PrintWriter out)
{
- out.print("testing stringToProxy... ");
+ out.print("testing stringToProxy... ");
out.flush();
String ref = "initial:default -p 12010";
Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/servantLocator/AllTests.java b/java/test/Ice/servantLocator/AllTests.java
index 572c876e90d..aa23d04b40a 100644
--- a/java/test/Ice/servantLocator/AllTests.java
+++ b/java/test/Ice/servantLocator/AllTests.java
@@ -194,7 +194,7 @@ public class AllTests
public static TestIntfPrx
allTests(Ice.Communicator communicator, boolean collocated, PrintWriter out)
{
- out.print("testing stringToProxy... ");
+ out.print("testing stringToProxy... ");
out.flush();
String ref = "asm:default -p 12010";
Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/slicing/exceptions/AllTests.java b/java/test/Ice/slicing/exceptions/AllTests.java
index e3e0c6dcfb2..331b6b15770 100644
--- a/java/test/Ice/slicing/exceptions/AllTests.java
+++ b/java/test/Ice/slicing/exceptions/AllTests.java
@@ -673,7 +673,7 @@ public class AllTests
public static TestIntfPrx
allTests(Ice.Communicator communicator, boolean collocated, java.io.PrintWriter out)
{
- out.print("testing stringToProxy... ");
+ out.print("testing stringToProxy... ");
out.flush();
String ref = "Test:default -p 12010 -t 10000";
Ice.ObjectPrx base = communicator.stringToProxy(ref);
diff --git a/java/test/Ice/stream/Client.java b/java/test/Ice/stream/Client.java
index d6129f47b7e..0f7d46a55ef 100644
--- a/java/test/Ice/stream/Client.java
+++ b/java/test/Ice/stream/Client.java
@@ -173,7 +173,7 @@ public class Client extends test.Util.Application
public int
run(String[] args)
{
- Ice.Communicator comm = communicator();
+ Ice.Communicator comm = communicator();
MyClassFactoryWrapper factoryWrapper = new MyClassFactoryWrapper();
comm.addObjectFactory(factoryWrapper, MyClass.ice_staticId());
comm.addObjectFactory(new MyInterfaceFactory(), _MyInterfaceDisp.ice_staticId());
diff --git a/java/test/Ice/udp/Server.java b/java/test/Ice/udp/Server.java
index dd6bfb15adb..55c515cf267 100644
--- a/java/test/Ice/udp/Server.java
+++ b/java/test/Ice/udp/Server.java
@@ -46,7 +46,7 @@ public class Server extends test.Util.Application
protected Ice.InitializationData getInitData(Ice.StringSeqHolder argsH)
{
Ice.InitializationData initData = new Ice.InitializationData();
- initData.properties = Ice.Util.createProperties(argsH);
+ initData.properties = Ice.Util.createProperties(argsH);
initData.properties.setProperty("Ice.Package.Test", "test.Ice.udp");
initData.properties.setProperty("Ice.Warn.Connections", "0");
initData.properties.setProperty("Ice.UDP.RcvSize", "16384");
diff --git a/java/test/IceGrid/simple/Server.java b/java/test/IceGrid/simple/Server.java
index 5f113d3dd56..c14745a05b4 100644
--- a/java/test/IceGrid/simple/Server.java
+++ b/java/test/IceGrid/simple/Server.java
@@ -50,8 +50,8 @@ public class Server extends test.Util.Application
public static void
main(String[] args)
{
- Server c = new Server();
- int status = c.main("test.IceGrid.simple.Server", args);
+ Server c = new Server();
+ int status = c.main("test.IceGrid.simple.Server", args);
System.gc();
System.exit(status);