From 43d6c847f417731abd7904c1fed709e0f7892f49 Mon Sep 17 00:00:00 2001 From: Nick Drochak Date: Wed, 26 Feb 2003 09:37:18 +0000 Subject: [PATCH] 2003/02/26 Nick Drochak * ActivatorTest.cs: Unregister the channel like it should. * MarshalByRefTest.cs: Take out my hack. Both from Jean-Marc Andr [jean-marc.andre@polymtl.ca]. svn path=/trunk/mcs/; revision=11995 --- mcs/class/corlib/Test/System/ActivatorTest.cs | 2 ++ mcs/class/corlib/Test/System/ChangeLog | 6 ++++++ mcs/class/corlib/Test/System/MarshalByRefObjectTest.cs | 4 ++-- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/mcs/class/corlib/Test/System/ActivatorTest.cs b/mcs/class/corlib/Test/System/ActivatorTest.cs index 6d2bc1e7765c1..f92249b624d5c 100755 --- a/mcs/class/corlib/Test/System/ActivatorTest.cs +++ b/mcs/class/corlib/Test/System/ActivatorTest.cs @@ -110,6 +110,8 @@ public void GetObject() Assertion.Assert("#A07",objRem != null); COMTest remCOMTest = (COMTest) objRem; Assertion.AssertEquals("#A08", 8, remCOMTest.Id); + + ChannelServices.UnregisterChannel(chnServer); // Todo: Implemente the test methods for // all the overriden function using activationAttribute } diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog index 7073b2ba42a69..b8fe6b0fdd286 100644 --- a/mcs/class/corlib/Test/System/ChangeLog +++ b/mcs/class/corlib/Test/System/ChangeLog @@ -1,3 +1,9 @@ +2003/02/26 Nick Drochak + + * ActivatorTest.cs: Unregister the channel like it should. + * MarshalByRefTest.cs: Take out my hack. + Both from Jean-Marc Andr [jean-marc.andre@polymtl.ca]. + 2003-02-25 Nick Drochak * TimeSpanTest.cs: Isolate test for Negate bug. Same as previous diff --git a/mcs/class/corlib/Test/System/MarshalByRefObjectTest.cs b/mcs/class/corlib/Test/System/MarshalByRefObjectTest.cs index 422b69c6a041d..dabf08f14c6e0 100755 --- a/mcs/class/corlib/Test/System/MarshalByRefObjectTest.cs +++ b/mcs/class/corlib/Test/System/MarshalByRefObjectTest.cs @@ -120,7 +120,7 @@ public void GetObject() RemotingServices.SetObjectUriForMarshal(objMarshal, "MarshalByRefObjectTest.objMarshal3"); RemotingServices.Marshal(objMarshal); - TcpChannel chn = new TcpChannel(1235); + TcpChannel chn = new TcpChannel(1234); ChannelServices.RegisterChannel(chn); object objRem = Activator.GetObject(typeof(MarshalObject), "tcp://localhost:1234/MarshalByRefObjectTest.objMarshal3"); @@ -131,7 +131,7 @@ public void GetObject() // TODO: When implemented in the mono RemotingServices class //RemotingServices.Disconnect(objMarshal); - chn.StopListening(null); +// chn.StopListening(null); ChannelServices.UnregisterChannel(chn); }