diff options
Diffstat (limited to 'android/test')
| -rw-r--r-- | android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java | 129 | ||||
| -rw-r--r-- | android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java | 25 | ||||
| -rw-r--r-- | android/test/android/src/main/res/layout/main.xml | 19 | ||||
| -rw-r--r-- | android/test/android/src/main/res/raw/client.bks | bin | 3633 -> 3633 bytes | |||
| -rw-r--r-- | android/test/android/src/main/res/raw/server.bks | bin | 3639 -> 3639 bytes | |||
| -rw-r--r-- | android/test/android/src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | android/test/android/testApp.iml | 6 | ||||
| -rw-r--r-- | android/test/plugins/testPlugins.iml | 4 | ||||
| -rw-r--r-- | android/test/src/test_Ice_acm/test_Ice_acm.iml | 5 | ||||
| -rw-r--r-- | android/test/test.iml | 4 |
10 files changed, 118 insertions, 76 deletions
diff --git a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java index e7d92d6aebf..aea2ef13c99 100644 --- a/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java +++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestApp.java @@ -457,7 +457,39 @@ public class TestApp extends Application private int _status = 0; private int _currentTest = -1; - private boolean _ssl = false; + enum Mode { + TCP, + SSL, + WS, + WSS; + + public boolean isSSL() + { + return this == SSL || this == WSS; + } + + public void setupProtocol(List<String> args) + { + switch(this) { + case TCP: + break; + + case SSL: + args.add("--Ice.Default.Protocol=ssl"); + break; + + case WS: + args.add("--Ice.Default.Protocol=ws"); + break; + + case WSS: + args.add("--Ice.Default.Protocol=wss"); + break; + } + args.add("--Ice.Trace.Network=3"); + } + }; + private Mode _mode = Mode.TCP; private boolean _sslInitialized = false; private boolean _ipv6 = false; private SSLContext _clientContext = null; @@ -482,7 +514,7 @@ public class TestApp extends Application return _status; } - protected String[] setupAddress(String[] args, boolean ipv6) + protected void setupAddress(List<String> args, boolean ipv6) { if(ipv6) { @@ -494,10 +526,7 @@ public class TestApp extends Application "--Ice.PreferIPv6Address=1" }; - String[] nargs = new String[args.length + ipv6Args.length]; - System.arraycopy(args, 0, nargs, 0, args.length); - System.arraycopy(ipv6Args, 0, nargs, args.length, ipv6Args.length); - return nargs; + args.addAll(Arrays.asList(ipv6Args)); } else { @@ -505,39 +534,27 @@ public class TestApp extends Application { "--Ice.Default.Host=127.0.0.1", "--Ice.IPv4=1", - "--Ice.IPv6=0" + "--Ice.IPv6=0", }; - - String[] nargs = new String[args.length + ipv4Args.length]; - System.arraycopy(args, 0, nargs, 0, args.length); - System.arraycopy(ipv4Args, 0, nargs, args.length, ipv4Args.length); - return nargs; + args.addAll(Arrays.asList(ipv4Args)); } } - protected String[] setupssl(String[] args, final SSLContext context) + protected void setupssl(List<String> args, final SSLContext context) { String[] sslargs = { "--Ice.Plugin.IceSSL=IceSSL.PluginFactory", - "--Ice.Default.Protocol=ssl", "--Ice.InitPlugins=0" }; + args.addAll(Arrays.asList(sslargs)); // SDK versions < 21 only support TLSv1 with SSLEngine. if(VERSION.SDK_INT < 21) { - String[] arr = new String[sslargs.length + 1]; - System.arraycopy(sslargs, 0, arr, 0, sslargs.length); - arr[arr.length - 1] = "--IceSSL.Protocols=tls1_0"; - sslargs = arr; + args.add("--IceSSL.Protocols=tls1_0"); } - String[] nargs = new String[args.length + sslargs.length]; - System.arraycopy(args, 0, nargs, 0, args.length); - System.arraycopy(sslargs, 0, nargs, args.length, sslargs.length); - args = nargs; - _app.setCommunicatorListener(new CommunicatorListener() { public void communicatorInitialized(Communicator c) @@ -547,7 +564,6 @@ public class TestApp extends Application c.getPluginManager().initializePlugins(); } }); - return args; } } @@ -564,13 +580,14 @@ public class TestApp extends Application public void run() { - String[] args = + String[] defaultArgs = { "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1" }; + List<String> args = new ArrayList<String>(Arrays.asList(defaultArgs)); - args = setupAddress(args, _ipv6); + setupAddress(args, _ipv6); if(_testName == "plugin") { @@ -585,11 +602,12 @@ public class TestApp extends Application } } - if(_ssl) + if(_mode.isSSL()) { - args = setupssl(args, _clientContext); + setupssl(args, _clientContext); } - _status = _app.main("Client", args); + _mode.setupProtocol(args); + _status = _app.main("Client", args.toArray(new String[0])); // If the client failed, then stop the server -- the test is over. if(_status != 0 && _server != null) { @@ -612,7 +630,7 @@ public class TestApp extends Application public void run() { - String[] args = + String[] defaultArgs = { "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1", @@ -620,13 +638,15 @@ public class TestApp extends Application "--Ice.ThreadPool.Server.SizeMax=3", "--Ice.ThreadPool.Server.SizeWarn=0" }; + List<String> args = new ArrayList<String>(Arrays.asList(defaultArgs)); - args = setupAddress(args, _ipv6); + setupAddress(args, _ipv6); - if(_ssl) + if(_mode.isSSL()) { - args = setupssl(args, _serverContext); + setupssl(args, _serverContext); } + _mode.setupProtocol(args); _app.setServerReadyListener(new test.Util.Application.ServerReadyListener() { public void serverReady() @@ -639,7 +659,7 @@ public class TestApp extends Application } }); - _status = _app.main("Server", args); + _status = _app.main("Server", args.toArray(new String[0])); if(_clientThread != null) { while(_clientThread.isAlive()) @@ -670,18 +690,20 @@ public class TestApp extends Application public void run() { - String[] args = + String[] defaultArgs = { "--Ice.NullHandleAbort=1" }; + List<String> args = new ArrayList<String>(Arrays.asList(defaultArgs)); - args = setupAddress(args, _ipv6); + setupAddress(args, _ipv6); - if(_ssl) + if(_mode.isSSL()) { - args = setupssl(args, _clientContext); + setupssl(args, _clientContext); } - _status = _app.main("Collocated", args); + _mode.setupProtocol(args); + _status = _app.main("Collocated", args.toArray(new String[0])); } } @@ -841,7 +863,7 @@ public class TestApp extends Application synchronized public void startTest(int position) { - assert !_ssl || (_ssl && _sslInitialized); + assert !_mode.isSSL() || (_mode.isSSL() && _sslInitialized); PrintWriter pw = new PrintWriter(new MyWriter()); @@ -932,16 +954,31 @@ public class TestApp extends Application _ipv6 = ipv6; } - public void setSSL(boolean ssl) + public void setMode(int mode) { - _ssl = ssl; + switch(mode) + { + case 0: + _mode = Mode.TCP; + break; + case 1: + _mode = Mode.SSL; + break; + case 2: + _mode = Mode.WS; + break; + case 3: + _mode = Mode.WSS; + break; + } + configureTests(); if(_currentTest > _tests.size()-1) { _currentTest = _tests.size()-1; } - if(_ssl && !_sslInitialized) + if(_mode.isSSL() && !_sslInitialized) { if(_sslListener != null) { @@ -998,11 +1035,11 @@ public class TestApp extends Application _tests.clear(); for(String s : _allTests) { - if(_ssl && _sslUnsupportedTests.contains(s)) + if(_mode.isSSL() && _sslUnsupportedTests.contains(s)) { continue; } - if(!_ssl && _tcpUnsupportedTests.contains(s)) + if(!_mode.isSSL() && _tcpUnsupportedTests.contains(s)) { continue; } @@ -1013,7 +1050,7 @@ public class TestApp extends Application synchronized public void setSSLInitializationListener(SSLInitializationListener listener) { _sslListener = listener; - if(_ssl) + if(_mode.isSSL()) { if(!_sslInitialized) { diff --git a/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java b/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java index a2577a5aa87..edf3158abcc 100644 --- a/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java +++ b/android/test/android/src/main/java/com/zeroc/testsuite/TestSuite.java @@ -20,10 +20,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.os.Bundle; import android.view.View; -import android.widget.ArrayAdapter; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.ListView; +import android.widget.*; import android.widget.CompoundButton.OnCheckedChangeListener; public class TestSuite extends ListActivity @@ -71,17 +68,29 @@ public class TestSuite extends ListActivity showDialog(DIALOG_INITIALIZING); } }); - CheckBox secure = (CheckBox)findViewById(R.id.secure); - secure.setOnCheckedChangeListener(new OnCheckedChangeListener() + Spinner mode = (Spinner)findViewById(R.id.mode); + ArrayAdapter<String> modeAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, + new String[] { "TCP", "SSL", "WS", "WSS"}); + mode.setAdapter(modeAdapter); + mode.setOnItemSelectedListener(new android.widget.AdapterView.OnItemSelectedListener() { - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) + public void onItemSelected(AdapterView<?> parent, View view, int position, long id) { - app.setSSL(isChecked); + app.setMode((int)id); _tests.clear(); _tests.addAll(app.getTestNames()); adapter.notifyDataSetChanged(); } + + public void onNothingSelected(AdapterView<?> arg0) + { + } }); + if(savedInstanceState == null) + { + mode.setSelection(0); + } + app.setMode((int)mode.getSelectedItemId()); CheckBox ipv6 = (CheckBox)findViewById(R.id.ipv6); ipv6.setOnCheckedChangeListener(new OnCheckedChangeListener() diff --git a/android/test/android/src/main/res/layout/main.xml b/android/test/android/src/main/res/layout/main.xml index 3a8a534ecb3..289827f8793 100644 --- a/android/test/android/src/main/res/layout/main.xml +++ b/android/test/android/src/main/res/layout/main.xml @@ -26,17 +26,14 @@ android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="30" - android:text="@string/ssl" - /> - - <CheckBox - android:id="@+id/secure" - android:layout_width="0dip" - android:layout_weight="70" - android:layout_height="wrap_content" - /> - - <TextView + android:text="@string/mode" + /> + + <Spinner + android:layout_width="150dp" + android:layout_height="wrap_content" + android:id="@+id/mode"/> + <TextView android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="30" diff --git a/android/test/android/src/main/res/raw/client.bks b/android/test/android/src/main/res/raw/client.bks Binary files differindex a03b721e4bd..b1f4d3f0a6a 100644 --- a/android/test/android/src/main/res/raw/client.bks +++ b/android/test/android/src/main/res/raw/client.bks diff --git a/android/test/android/src/main/res/raw/server.bks b/android/test/android/src/main/res/raw/server.bks Binary files differindex 1216ff6f26d..276f19e74a6 100644 --- a/android/test/android/src/main/res/raw/server.bks +++ b/android/test/android/src/main/res/raw/server.bks diff --git a/android/test/android/src/main/res/values/strings.xml b/android/test/android/src/main/res/values/strings.xml index 797e31f6429..75790bc6e2c 100644 --- a/android/test/android/src/main/res/values/strings.xml +++ b/android/test/android/src/main/res/values/strings.xml @@ -2,6 +2,6 @@ <resources> <string name="app_name">Test Suite</string> <string name="next">Next</string> - <string name="ssl">SSL</string> + <string name="mode">Mode</string> <string name="ipv6">IPv6</string> </resources> diff --git a/android/test/android/testApp.iml b/android/test/android/testApp.iml index bbcb89208ba..4a27553dc0e 100644 --- a/android/test/android/testApp.iml +++ b/android/test/android/testApp.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6b" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -80,9 +80,9 @@ <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> - <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> + <orderEntry type="jdk" jdkName="Android API 17 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="library" exported="" name="Ice" level="project" /> + <orderEntry type="library" exported="" name="ice-3.6b" level="project" /> <orderEntry type="module" module-name="test" exported="" /> <orderEntry type="module" module-name="testPlugins" exported="" /> </component> diff --git a/android/test/plugins/testPlugins.iml b/android/test/plugins/testPlugins.iml index 74e8501b7a5..ab5f5ce27ad 100644 --- a/android/test/plugins/testPlugins.iml +++ b/android/test/plugins/testPlugins.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6b" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -33,7 +33,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="ice" exported="" /> </component> </module> diff --git a/android/test/src/test_Ice_acm/test_Ice_acm.iml b/android/test/src/test_Ice_acm/test_Ice_acm.iml index c655abc99cf..f96c16a500d 100644 --- a/android/test/src/test_Ice_acm/test_Ice_acm.iml +++ b/android/test/src/test_Ice_acm/test_Ice_acm.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/../../.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6b" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -12,7 +12,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> + <component name="NewModuleRootManager" inherit-compiler-output="true"> <output url="file://$MODULE_DIR$/build/classes/main" /> <output-test url="file://$MODULE_DIR$/build/classes/test" /> <exclude-output /> @@ -34,7 +34,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="test" exported="" /> - <orderEntry type="module" module-name="Ice" exported="" /> </component> </module> diff --git a/android/test/test.iml b/android/test/test.iml index a109c969e9c..4287a86a180 100644 --- a/android/test/test.iml +++ b/android/test/test.iml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4"> +<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.zeroc" external.system.module.version="3.6b" type="JAVA_MODULE" version="4"> <component name="FacetManager"> <facet type="android-gradle" name="Android-Gradle"> <configuration> @@ -40,7 +40,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="Ice" exported="" /> + <orderEntry type="module" module-name="ice" exported="" /> </component> </module> |