Fixed (ICE-5264) - Android test suite Network.doBind failures

5 files changed, 76 insertions, 3 deletions

diff --git a/java/test/android/gen/com/zeroc/testsuite/R.java b/java/test/android/gen/com/zeroc/testsuite/R.java
index 3eb5513d783..77ab4d9e567 100644
--- a/java/test/android/gen/com/zeroc/testsuite/R.java
+++ b/java/test/android/gen/com/zeroc/testsuite/R.java
@@ -11,6 +11,7 @@ public final class R {
     public static final class attr {
     }
     public static final class id {
+        public static final int ipv6=0x7f050002;
         public static final int next=0x7f050000;
         public static final int secure=0x7f050001;
     }
@@ -25,6 +26,7 @@ public final class R {
     }
     public static final class string {
         public static final int app_name=0x7f040000;
+        public static final int ipv6=0x7f040003;
         public static final int next=0x7f040001;
         public static final int ssl=0x7f040002;
     }
diff --git a/java/test/android/res/layout/main.xml b/java/test/android/res/layout/main.xml
index dcddfc3ceae..612802f59b4 100644
--- a/java/test/android/res/layout/main.xml
+++ b/java/test/android/res/layout/main.xml
@@ -35,6 +35,20 @@
 			android:layout_weight="70"
 			android:layout_height="wrap_content"
 			/>
+		
+		<TextView
+		    android:layout_width="0dip" 
+		    android:layout_height="wrap_content"
+		    android:layout_weight="30" 
+		    android:text="@string/ipv6"
+		    />	
+		    
+		<CheckBox
+			android:id="@+id/ipv6"
+			android:layout_width="0dip"
+			android:layout_weight="70"
+			android:layout_height="wrap_content"
+			/>
 	
 	</LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/java/test/android/res/values/strings.xml b/java/test/android/res/values/strings.xml
index a5caff6b82c..797e31f6429 100644
--- a/java/test/android/res/values/strings.xml
+++ b/java/test/android/res/values/strings.xml
@@ -3,4 +3,5 @@
     <string name="app_name">Test Suite</string>
     <string name="next">Next</string>
     <string name="ssl">SSL</string>
+    <string name="ipv6">IPv6</string>
 </resources>
diff --git a/java/test/android/src/com/zeroc/testsuite/TestApp.java b/java/test/android/src/com/zeroc/testsuite/TestApp.java
index b276a5f04c9..09cccd8ea4d 100644
--- a/java/test/android/src/com/zeroc/testsuite/TestApp.java
+++ b/java/test/android/src/com/zeroc/testsuite/TestApp.java
@@ -252,6 +252,7 @@ public class TestApp extends Application
     private boolean _ssl = false;
     private boolean _sslInitialized = false;
     private boolean _sslSupported = false;
+    private boolean _ipv6 = false;
     private SSLContext _clientContext = null;
     private SSLContext _serverContext = null;
     private SSLInitializationListener _ssllistener;
@@ -270,6 +271,39 @@ public class TestApp extends Application
         {
             return _status;
         }
+        
+        protected String[] setupAddress(String[] args, boolean ipv6)
+        {
+            if(ipv6)
+            {
+                String[] ipv6Args =
+                {
+                    "--Ice.Default.Host=0:0:0:0:0:0:0:1",
+                    "--Ice.IPv4=1",
+                    "--Ice.IPv6=1",
+                    "--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;
+            }
+            else
+            {
+                String[] ipv4Args =
+                {
+                    "--Ice.Default.Host=127.0.0.1",
+                    "--Ice.IPv4=1",
+                    "--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;
+            }
+        }
 
         protected String[] setupssl(String[] args, final SSLContext context)
         {
@@ -322,8 +356,11 @@ public class TestApp extends Application
         {
             String[] args =
             {
-                "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1", "--Ice.Default.Host=127.0.0.1"
+                "--Ice.NullHandleAbort=1", "--Ice.Warn.Connections=1"
             };
+            
+            args = setupAddress(args, _ipv6);
+            
             if(_ssl)
             {
                 args = setupssl(args, _clientContext);
@@ -357,9 +394,11 @@ public class TestApp extends Application
                 "--Ice.Warn.Connections=1",
                 "--Ice.ThreadPool.Server.Size=1",
                 "--Ice.ThreadPool.Server.SizeMax=3",
-                "--Ice.ThreadPool.Server.SizeWarn=0",
-                "--Ice.Default.Host=127.0.0.1"
+                "--Ice.ThreadPool.Server.SizeWarn=0"
             };
+            
+            args = setupAddress(args, _ipv6);
+            
             if(_ssl)
             {
                 args = setupssl(args, _serverContext);
@@ -411,6 +450,9 @@ public class TestApp extends Application
             {
                 "--Ice.NullHandleAbort=1"
             };
+            
+            args = setupAddress(args, _ipv6);
+            
             if(_ssl)
             {
                 args = setupssl(args, _clientContext);
@@ -656,6 +698,11 @@ public class TestApp extends Application
     {
         return _sslSupported;
     }
+    
+    public void setIPv6(boolean ipv6)
+    {
+        _ipv6 = ipv6;
+    }
 
     public void setSSL(boolean ssl)
     {
diff --git a/java/test/android/src/com/zeroc/testsuite/TestSuite.java b/java/test/android/src/com/zeroc/testsuite/TestSuite.java
index 0ea80dcdc8e..8d4c46bada7 100644
--- a/java/test/android/src/com/zeroc/testsuite/TestSuite.java
+++ b/java/test/android/src/com/zeroc/testsuite/TestSuite.java
@@ -89,6 +89,15 @@ public class TestSuite extends ListActivity
         {
             secure.setEnabled(false);
         }
+        
+        CheckBox ipv6 = (CheckBox)findViewById(R.id.ipv6);
+        ipv6.setOnCheckedChangeListener(new OnCheckedChangeListener()
+        {
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked)
+            {
+                app.setIPv6(isChecked);
+            }
+        });
     }
 
     protected void onListItemClick(ListView l, View v, int position, long id)