summaryrefslogtreecommitdiff
path: root/java/test
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-04-11 18:06:58 +0200
committerBenoit Foucher <benoit@zeroc.com>2017-04-11 18:06:58 +0200
commitdbff9a34d9c9966c882be07324ba65a50a49bf11 (patch)
tree6eee4e8943182f2c674f940aec7036b0b8972739 /java/test
parentRename getEngineVersion -> getOpenSSLVersion, remove getEngineName (diff)
downloadice-dbff9a34d9c9966c882be07324ba65a50a49bf11.tar.bz2
ice-dbff9a34d9c9966c882be07324ba65a50a49bf11.tar.xz
ice-dbff9a34d9c9966c882be07324ba65a50a49bf11.zip
Speed up binding test on Unix platforms
Diffstat (limited to 'java/test')
-rw-r--r--java/test/src/main/java/test/Ice/binding/AllTests.java19
1 files changed, 4 insertions, 15 deletions
diff --git a/java/test/src/main/java/test/Ice/binding/AllTests.java b/java/test/src/main/java/test/Ice/binding/AllTests.java
index 23733d443ce..2bc222828d6 100644
--- a/java/test/src/main/java/test/Ice/binding/AllTests.java
+++ b/java/test/src/main/java/test/Ice/binding/AllTests.java
@@ -211,20 +211,11 @@ public class AllTests
System.getProperty("os.name").startsWith("Windows") ||
System.getProperty("java.vendor").toLowerCase().indexOf("android") >= 0;
- int count;
- if(shortenTest)
- {
- count = 20;
- }
- else
- {
- count = 60;
- }
-
+ int count = 20;
int adapterCount = adapters.length;
while(--count > 0)
{
- TestIntfPrx[] proxies;
+ TestIntfPrx[] proxies = new TestIntfPrx[10];
if(shortenTest)
{
if(count == 1)
@@ -232,16 +223,14 @@ public class AllTests
rcom.deactivateObjectAdapter(adapters[4]);
--adapterCount;
}
- proxies = new TestIntfPrx[10];
}
else
{
- if(count < 60 && count % 10 == 0)
+ if(count < 20 && count % 4 == 0)
{
- rcom.deactivateObjectAdapter(adapters[count / 10 - 1]);
+ rcom.deactivateObjectAdapter(adapters[count / 4 - 1]);
--adapterCount;
}
- proxies = new TestIntfPrx[40];
}
int i;