From 2df26716e3085a749957990eb5738ebd1edd3850 Mon Sep 17 00:00:00 2001 From: markpollack Date: Fri, 24 Jul 2009 01:11:16 +0000 Subject: [PATCH] More fixes upgrading to NUnit 2.5.x --- Spring.Net.2008.sln | 1 - lib/Net/1.1/DotNetMock.Framework.dll | Bin 45056 -> 45056 bytes lib/Net/1.1/DotNetMock.dll | Bin 61440 -> 61440 bytes lib/Net/2.0/DotNetMock.Framework.dll | Bin 45056 -> 45056 bytes lib/Net/2.0/DotNetMock.dll | Bin 61440 -> 61440 bytes .../AbstractMethodInvocationTests.cs | 22 +- .../AfterReturningAdviceInterceptorTests.cs | 86 ++++--- .../Adapter/ThrowsAdviceInterceptorTests.cs | 212 ++++++++++-------- .../Aop/Framework/ProxyFactoryObjectTests.cs | 2 +- .../Aop/Target/PrototypeTargetSourceTests.cs | 12 +- .../ExceptionHandlerAspectIntegrationTests.cs | 17 +- .../Spring.Aop.Tests.2008.csproj | 3 +- .../Support/AbstractMessageSourceTests.cs | 3 + .../Spring.Core.Tests.2008.csproj | 4 +- .../Spring.Core.Tests.dll.config | 3 +- .../Data/NHibernate/TemplateTests.cs | 3 +- .../Spring.Data.Tests.2008.csproj | 4 +- .../Spring.Messaging.Nms.Tests.2008.csproj | 4 - .../Spring.Messaging.Tests.2008.csproj | 6 +- 19 files changed, 215 insertions(+), 167 deletions(-) diff --git a/Spring.Net.2008.sln b/Spring.Net.2008.sln index 982b141c..9aa3e572 100644 --- a/Spring.Net.2008.sln +++ b/Spring.Net.2008.sln @@ -5,7 +5,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution BreakingChanges-1.2.txt = BreakingChanges-1.2.txt changelog.txt = changelog.txt readme.txt = readme.txt - Spring.build = Spring.build Spring.include = Spring.include EndProjectSection EndProject diff --git a/lib/Net/1.1/DotNetMock.Framework.dll b/lib/Net/1.1/DotNetMock.Framework.dll index 181c37da1ccb244f0eac4446b57f14efa913cf02..b91f079ff873d09c5394e23b36528ac82dcc8f79 100644 GIT binary patch delta 228 zcmV?;gt>VxRH|A zvq;u%|5`^Rrj#`N%PiB<`cBNc2{*h&f5KQRRJN2oUwkmNtczk;@&9H#Xy#!?xOlL9 zNRBl%!8OL;ek^`fDK0+l1fgI@H!-IfOZ!0=nRrl-av>V!9xh3QCIQ*nDYgX0 zu(MzK>8wthL>(Lrio5{9KvJEvB-5F{V){?i&szt*i>ONrdVD#GeM1d!_Hdd%pR|PS z;pO5|s9Q;)X2HS91g}pvAG*BkoE<34^F|~A1ZJ_kmHY;0O&!FlB7YmARYi$l1>r~= z0cf+(5Wpua&W>nG000000ssI2SpWb4s7L?+s5k%sQd2}z+R`vAi?FUouWntRPAgTH ev%EM!OAswDl6Lit7(<4@@2n=%4-c~pg!C&(cwf-~ diff --git a/lib/Net/1.1/DotNetMock.dll b/lib/Net/1.1/DotNetMock.dll index 5e94669b1dee8b544689e2043dccf6e277f06b35..794065d35b9466b93f23612c6abfa11ec1c26c68 100644 GIT binary patch delta 4004 zcmbW(dsNg_9suy~_xJk^%x`3vVTOQhe1IAbf`*UcAu6&E4@p2ko+iEk72{<^q7D`z z$8|Tx>!P*lp`y}O&q6=iMVDO6V(D=TcR43pJ35|KR#z)J(!+9T@4dgvRR8unXYTO1 z-}}DzcZVjA+~kqlS|#_md+$`dAguW<$Z@gy2URwFzJ{ z`4Xc@5zfM^+HQ3D2ldm!>`9{^iGB{zLZh`L$QtjecRwnK5(8D={|gV9gjO?n1ll$K#{BeL=Gf= zXY8WA+0faowJ*CPK;;?7Dyd`ml?XG1(k`tp;o zkNl9ofT#D8hgWTomgl zMTR`O12y#2$j<$AtWi>Ax+GT*(6FGj;)#lCwqjux5HG zMFrBF{9Nd&0I<>~W~An)C)4kK>S*#+(NY}L9w;ucyJAymF0{kFhGFR%WD6}ZT$HXu zrB@#52J8@8Kw~%IfL9*r790~I=5Fb8c-yOCX%s#cnq}Azw_(()5$QH4v)O$JEg_mA z7{(yPtDDjoEaV!1cyqP%HC!NZkEXbGr1Rk#zct(Bak$0h4jJ{?598p+7fo+#974Ss zpe2)a!5{oTk^x(}cEd^kj{(rSoVB?d-sK9-WMZw{lmHXB^f5>n;(Aywdel57DcHxQ z7d7AoF1@HP2GTcXVqz*5>VgsfVOhm4E;o$%Uy>(b9@}DY!!=(-e>@@N=W|20;B}#5 zp9ToPkZcz#I)cZ{-$^#i&ert?l^t7!&YM9F#15fP%tko~d%5(L3C0h&+QDY|QVz!J zLenf?%OR-bur}Kv#&TEw6^3%TseF}tF)arkq(L{Vwpf+PcvS=|E%zu>uxur(=!VBF z)0Am=Ko{SbPWF%V#v(CP=pQr| zg~>vfRi;v*|El3sH9}9**c@!-YUW344)*&0j6=%kM9FkH{DbPzs8IDS+ zm?p&D-!$Ckl}Ad)AtCnOFUP<_e$LuqiNPafVqu})%q+u*v;q%%wI8z3!==B0S@@2^);Qz{S`j#MZYMhq+peBw&S9jJK$0|1HLjfD9}~V=1fH zVmwKMB^WByOJgONtc#A@0j1c?HDJ78ja63TVWH2sdbr+(bM#!S#&3U8?-885`p2QI z!DuEI9Vr{z8q5?yHj6d5kBbfF3RS02Z$LQJpb(+4GV};_&{!GX)x`(87M+jiQ|buF zSJq)Nm%cLVv5?E9cfTIDi6HBKJ>JqQ!W!L#o!wq;?s5ig?8?ax9 z(AY-2Ak;x)8*z+F@4g(3WvtBs7oUAO&eX~GupCRd*tu{(IquWNJFLKdA=Y69UKe5= zR$}y8pby(n2UKDT3BhK+3~3t<>J^QeEeyAzN2t%{fNeOYi_Rh#9z$n2pD&-&V_2xmc-s~Zk7JdP z(S8MtZK}WgJ2)$cs`sgL)i`yrnyKcf ztJE^JTs;SM>R$Et>JjxtwOc)in VtL8uSokj92(gHkRSlrRR{|8Dlu;%~( delta 4120 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 diff --git a/lib/Net/2.0/DotNetMock.dll b/lib/Net/2.0/DotNetMock.dll index 5e94669b1dee8b544689e2043dccf6e277f06b35..794065d35b9466b93f23612c6abfa11ec1c26c68 100644 GIT binary patch delta 4004 zcmbW(dsNg_9suy~_xJk^%x`3vVTOQhe1IAbf`*UcAu6&E4@p2ko+iEk72{<^q7D`z z$8|Tx>!P*lp`y}O&q6=iMVDO6V(D=TcR43pJ35|KR#z)J(!+9T@4dgvRR8unXYTO1 z-}}DzcZVjA+~kqlS|#_md+$`dAguW<$Z@gy2URwFzJ{ z`4Xc@5zfM^+HQ3D2ldm!>`9{^iGB{zLZh`L$QtjecRwnK5(8D={|gV9gjO?n1ll$K#{BeL=Gf= zXY8WA+0faowJ*CPK;;?7Dyd`ml?XG1(k`tp;o zkNl9ofT#D8hgWTomgl zMTR`O12y#2$j<$AtWi>Ax+GT*(6FGj;)#lCwqjux5HG zMFrBF{9Nd&0I<>~W~An)C)4kK>S*#+(NY}L9w;ucyJAymF0{kFhGFR%WD6}ZT$HXu zrB@#52J8@8Kw~%IfL9*r790~I=5Fb8c-yOCX%s#cnq}Azw_(()5$QH4v)O$JEg_mA z7{(yPtDDjoEaV!1cyqP%HC!NZkEXbGr1Rk#zct(Bak$0h4jJ{?598p+7fo+#974Ss zpe2)a!5{oTk^x(}cEd^kj{(rSoVB?d-sK9-WMZw{lmHXB^f5>n;(Aywdel57DcHxQ z7d7AoF1@HP2GTcXVqz*5>VgsfVOhm4E;o$%Uy>(b9@}DY!!=(-e>@@N=W|20;B}#5 zp9ToPkZcz#I)cZ{-$^#i&ert?l^t7!&YM9F#15fP%tko~d%5(L3C0h&+QDY|QVz!J zLenf?%OR-bur}Kv#&TEw6^3%TseF}tF)arkq(L{Vwpf+PcvS=|E%zu>uxur(=!VBF z)0Am=Ko{SbPWF%V#v(CP=pQr| zg~>vfRi;v*|El3sH9}9**c@!-YUW344)*&0j6=%kM9FkH{DbPzs8IDS+ zm?p&D-!$Ckl}Ad)AtCnOFUP<_e$LuqiNPafVqu})%q+u*v;q%%wI8z3!==B0S@@2^);Qz{S`j#MZYMhq+peBw&S9jJK$0|1HLjfD9}~V=1fH zVmwKMB^WByOJgONtc#A@0j1c?HDJ78ja63TVWH2sdbr+(bM#!S#&3U8?-885`p2QI z!DuEI9Vr{z8q5?yHj6d5kBbfF3RS02Z$LQJpb(+4GV};_&{!GX)x`(87M+jiQ|buF zSJq)Nm%cLVv5?E9cfTIDi6HBKJ>JqQ!W!L#o!wq;?s5ig?8?ax9 z(AY-2Ak;x)8*z+F@4g(3WvtBs7oUAO&eX~GupCRd*tu{(IquWNJFLKdA=Y69UKe5= zR$}y8pby(n2UKDT3BhK+3~3t<>J^QeEeyAzN2t%{fNeOYi_Rh#9z$n2pD&-&V_2xmc-s~Zk7JdP z(S8MtZK}WgJ2)$cs`sgL)i`yrnyKcf ztJE^JTs;SM>R$Et>JjxtwOc)in VtL8uSokj92(gHkRSlrRR{|8Dlu;%~( delta 4120 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 i6A>!)T%rHht7rZ>MOK4)el|&ilT}Oqw Local - 9.0.30729 + 9.0.21022 2.0 {2111596A-0327-4C9D-8919-294FBD988A23} Debug @@ -45,6 +45,7 @@ full prompt false + 0612 ..\..\..\build\VS.Net.2008\Spring.Aop.Tests\Release\ diff --git a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs index ee2dced7..72e2fe65 100644 --- a/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs +++ b/test/Spring/Spring.Core.Tests/Context/Support/AbstractMessageSourceTests.cs @@ -23,6 +23,7 @@ using System; using System.Globalization; using NUnit.Framework; +using Rhino.Mocks; #endregion @@ -31,9 +32,11 @@ namespace Spring.Context.Support [TestFixture] public sealed class AbstractMessageSourceTests : AbstractMessageSource { + private MockRepository mocks; [SetUp] public void Init() { + mocks = new MockRepository(); resetMe(); } diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj index 0d8f3925..f5c39f7f 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj @@ -1,7 +1,7 @@  Local - 9.0.30729 + 9.0.21022 2.0 {44B16BAA-6DF8-447C-9D7F-3AD3D854D904} Debug @@ -78,7 +78,7 @@ False ..\..\..\lib\Net\2.0\Common.Logging.dll - + False ..\..\..\lib\Net\2.0\DotNetMock.dll diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config index 02a7287f..a7cd6a6d 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.dll.config @@ -222,6 +222,7 @@ limitations under the License. + diff --git a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs index fda8bfa0..330ae007 100644 --- a/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs +++ b/test/Spring/Spring.Data.NHibernate.Integration.Tests/Data/NHibernate/TemplateTests.cs @@ -121,8 +121,7 @@ namespace Spring.Data.NHibernate IAdoExceptionTranslator translator = template.AdoExceptionTranslator; Assert.IsNotNull(translator, "ADO.NET exception translator should not be null"); - - Assert.IsInstanceOfType(typeof(ErrorCodeExceptionTranslator), translator); + Assert.That(translator, Is.InstanceOf(typeof(ErrorCodeExceptionTranslator))); } [Test] diff --git a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj index c329294c..6a0a3141 100644 --- a/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj +++ b/test/Spring/Spring.Data.Tests/Spring.Data.Tests.2008.csproj @@ -1,7 +1,7 @@  Local - 9.0.30729 + 9.0.21022 2.0 {ACD39D47-1811-40FA-9E7E-5DEA5B9CE6C0} Debug @@ -73,7 +73,7 @@ False ..\..\..\lib\Net\2.0\Common.Logging.dll - + False ..\..\..\lib\Net\2.0\DotNetMock.dll diff --git a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj index aabc194f..de3e880f 100644 --- a/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj +++ b/test/Spring/Spring.Messaging.Nms.Tests/Spring.Messaging.Nms.Tests.2008.csproj @@ -46,10 +46,6 @@ False ..\..\..\lib\Net\2.0\Common.Logging.dll - - False - ..\..\..\lib\Net\2.0\log4net.dll - False ..\..\..\lib\net\2.0\nunit.framework.dll diff --git a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj index 3312e1c1..57a136d7 100644 --- a/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj +++ b/test/Spring/Spring.Messaging.Tests/Spring.Messaging.Tests.2008.csproj @@ -2,7 +2,7 @@ Debug AnyCPU - 9.0.30729 + 9.0.21022 2.0 {41BC3AEA-7EB3-48BF-B1EC-84119376AC98} Library @@ -33,10 +33,6 @@ False ..\..\..\lib\Net\2.0\Common.Logging.dll - - False - ..\..\..\lib\Net\2.0\log4net.dll - False ..\..\..\lib\Net\2.0\nunit.framework.dll