diff options
Diffstat (limited to 'csharp/test/Ice/timeout/AllTests.cs')
| -rw-r--r-- | csharp/test/Ice/timeout/AllTests.cs | 42 |
1 files changed, 2 insertions, 40 deletions
diff --git a/csharp/test/Ice/timeout/AllTests.cs b/csharp/test/Ice/timeout/AllTests.cs index 835f5768ec2..ae6b67da28a 100644 --- a/csharp/test/Ice/timeout/AllTests.cs +++ b/csharp/test/Ice/timeout/AllTests.cs @@ -7,14 +7,9 @@ // // ********************************************************************** -using System; using System.Diagnostics; using System.Threading; -#if SILVERLIGHT -using System.Windows.Controls; -#endif - public class AllTests : TestCommon.TestApp { private class Callback @@ -30,7 +25,7 @@ public class AllTests : TestCommon.TestApp { while(!_called) { - System.Threading.Monitor.Wait(this); + Monitor.Wait(this); } _called = false; @@ -43,42 +38,14 @@ public class AllTests : TestCommon.TestApp { Debug.Assert(!_called); _called = true; - System.Threading.Monitor.Pulse(this); + Monitor.Pulse(this); } } private bool _called; } -#if SILVERLIGHT - public override Ice.InitializationData initData() - { - Ice.InitializationData initData = new Ice.InitializationData(); - initData.properties = Ice.Util.createProperties(); - - // - // We need to send messages large enough to cause the transport - // buffers to fill up. - // - initData.properties.setProperty("Ice.MessageSizeMax", "20000"); - - // - // For this test, we want to disable retries. - // - initData.properties.setProperty("Ice.RetryIntervals", "-1"); - - // - // This test kills connections, so we don't want warnings. - // - initData.properties.setProperty("Ice.Warn.Connections", "0"); - return initData; - } - - override - public void run(Ice.Communicator communicator) -#else public static Test.TimeoutPrx allTests(Ice.Communicator communicator) -#endif { string sref = "timeout:default -p 12010"; Ice.ObjectPrx obj = communicator.stringToProxy(sref); @@ -473,11 +440,6 @@ public class AllTests : TestCommon.TestApp adapter.destroy(); } WriteLine("ok"); - -#if SILVERLIGHT - timeout.shutdown(); -#else return timeout; -#endif } } |