From a3ce00e94f7eecb4f1afecc9dde9fdc159e9cdd4 Mon Sep 17 00:00:00 2001 From: ayende Date: Tue, 26 Feb 2008 14:20:56 +0000 Subject: [PATCH] More passing tests. git-svn-id: https://svn.castleproject.org/svn/castle/trunk@4849 73e77b4c-caa6-f847-a29a-24ab75ae54b6 --- .../Castle.MonoRail.Views.Brail.Tests.build | 4 +- .../ResourceTestCase.cs | 9 +- .../Controllers/ResourceFile.Designer.cs | 72 ++++++++++++ .../Controllers/ResourceFile.resources | Bin 322 -> 0 bytes .../TestSiteBrail/Controllers/ResourceFile.resx | 123 +++++++++++++++++++++ MonoRail/TestSiteBrail/TestSiteBrail-vs2008.csproj | 15 ++- .../Views/layouts/defaultlayout.brail | 4 +- 7 files changed, 214 insertions(+), 13 deletions(-) create mode 100644 MonoRail/TestSiteBrail/Controllers/ResourceFile.Designer.cs delete mode 100644 MonoRail/TestSiteBrail/Controllers/ResourceFile.resources create mode 100644 MonoRail/TestSiteBrail/Controllers/ResourceFile.resx diff --git a/MonoRail/Castle.MonoRail.Views.Brail.Tests/Castle.MonoRail.Views.Brail.Tests.build b/MonoRail/Castle.MonoRail.Views.Brail.Tests/Castle.MonoRail.Views.Brail.Tests.build index 1c302533b..ae9479dc2 100644 --- a/MonoRail/Castle.MonoRail.Views.Brail.Tests/Castle.MonoRail.Views.Brail.Tests.build +++ b/MonoRail/Castle.MonoRail.Views.Brail.Tests/Castle.MonoRail.Views.Brail.Tests.build @@ -6,6 +6,7 @@ xmlns="http://nant.sf.net/release/0.85/nant.xsd" > + @@ -13,8 +14,9 @@ + - + diff --git a/MonoRail/Castle.MonoRail.Views.Brail.Tests/ResourceTestCase.cs b/MonoRail/Castle.MonoRail.Views.Brail.Tests/ResourceTestCase.cs index a561ae372..753c5790a 100644 --- a/MonoRail/Castle.MonoRail.Views.Brail.Tests/ResourceTestCase.cs +++ b/MonoRail/Castle.MonoRail.Views.Brail.Tests/ResourceTestCase.cs @@ -26,15 +26,14 @@ namespace Castle.MonoRail.Views.Brail.Tests { protected override void BeforEachTest() { - AddResource("resx", "TestSiteBrail.Controllers.ResourceFile", + Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; + AddResource("resx", "TestSiteBrail.Controllers.ResourceFile", typeof(ResourcedController).Assembly); } [Test] public void GetIndexedResources() { - Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; string expected = "testValue"; ProcessView_StripRailsExtension("resourced/indexingResources.rails"); AssertReplyEqualTo(expected); @@ -43,8 +42,6 @@ namespace Castle.MonoRail.Views.Brail.Tests [Test] public void GetResources() { - Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; string expected = "testValue"; ProcessView_StripRailsExtension("resourced/getresources.rails"); AssertReplyEqualTo(expected); @@ -53,8 +50,6 @@ namespace Castle.MonoRail.Views.Brail.Tests [Test] public void IterateOnResources() { - Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; - Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture; string expected = "testKey: testValue"; ProcessView_StripRailsExtension("resourced/iterating.rails"); AssertReplyEqualTo(expected); diff --git a/MonoRail/TestSiteBrail/Controllers/ResourceFile.Designer.cs b/MonoRail/TestSiteBrail/Controllers/ResourceFile.Designer.cs new file mode 100644 index 000000000..601b28e38 --- /dev/null +++ b/MonoRail/TestSiteBrail/Controllers/ResourceFile.Designer.cs @@ -0,0 +1,72 @@ +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Runtime Version:2.0.50727.1434 +// +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +namespace TestSiteBrail.Controllers { + using System; + + + /// + /// A strongly-typed resource class, for looking up localized strings, etc. + /// + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "2.0.0.0")] + [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] + [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + internal class ResourceFile { + + private static global::System.Resources.ResourceManager resourceMan; + + private static global::System.Globalization.CultureInfo resourceCulture; + + [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + internal ResourceFile() { + } + + /// + /// Returns the cached ResourceManager instance used by this class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Resources.ResourceManager ResourceManager { + get { + if (object.ReferenceEquals(resourceMan, null)) { + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TestSiteBrail.Controllers.ResourceFile", typeof(ResourceFile).Assembly); + resourceMan = temp; + } + return resourceMan; + } + } + + /// + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. + /// + [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] + internal static global::System.Globalization.CultureInfo Culture { + get { + return resourceCulture; + } + set { + resourceCulture = value; + } + } + + /// + /// Looks up a localized string similar to testValue. + /// + internal static string testKey { + get { + return ResourceManager.GetString("testKey", resourceCulture); + } + } + } +} diff --git a/MonoRail/TestSiteBrail/Controllers/ResourceFile.resources b/MonoRail/TestSiteBrail/Controllers/ResourceFile.resources deleted file mode 100644 index e4b8a851fd2cf8fdda56fee7149b77a4df215f36..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcwPel00001 literal 322 zcwReq>is@O1_p+CK&%;DSzMBus~417oL^d$oLUTL1*ImYq!#HYrrnMb!78Pga=h+(S8R(fB7#Qdo=qNas=9H8crP}7DmX;JH=IAH{ zlqTh5CVQt=hU90b=Gi8hn + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + testValue + + \ No newline at end of file diff --git a/MonoRail/TestSiteBrail/TestSiteBrail-vs2008.csproj b/MonoRail/TestSiteBrail/TestSiteBrail-vs2008.csproj index 35730ce6e..458f9b936 100644 --- a/MonoRail/TestSiteBrail/TestSiteBrail-vs2008.csproj +++ b/MonoRail/TestSiteBrail/TestSiteBrail-vs2008.csproj @@ -131,6 +131,11 @@ + + True + True + ResourceFile.resx + @@ -222,9 +227,6 @@ - - - @@ -238,6 +240,13 @@ + + ResXFileCodeGenerator + ResourceFile.Designer.cs + Designer + + + diff --git a/MonoRail/TestSiteBrail/Views/layouts/defaultlayout.brail b/MonoRail/TestSiteBrail/Views/layouts/defaultlayout.brail index 0c3d3ccf1..a830ef811 100644 --- a/MonoRail/TestSiteBrail/Views/layouts/defaultlayout.brail +++ b/MonoRail/TestSiteBrail/Views/layouts/defaultlayout.brail @@ -1,3 +1,3 @@ -start +start modified ${ChildOutput} -end +end \ No newline at end of file -- 2.11.4.GIT