Non-string parameters for bindings are not converted using the featu…

…re language (Issue 26)
xerxesb · Nov 25, 2009 · 1dfdd1c · 1dfdd1c
1 parent 70b796d
commit 1dfdd1c
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 11 deletions.
diff --git a/Languages.xml b/Languages.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <SpecFlowLanguages>
-  <Language code="en">
+  <Language code="en" defaultSpecificCulture="en-US">
     <Feature>Feature</Feature>
     <Background>Background</Background>
     <Scenario>Scenario</Scenario>
@@ -13,7 +13,7 @@
     <And>And</And>
     <But>But</But>
   </Language>
-  <Language code="de">
+  <Language code="de" defaultSpecificCulture="de-DE">
     <Feature>Funktionalität</Feature>
     <Background>Grundlage</Background>
     <Scenario>Szenario</Scenario>
@@ -25,7 +25,7 @@
     <And>Und</And>
     <But>Aber</But>
   </Language>
-  <Language code="fr">
+  <Language code="fr" defaultSpecificCulture="fr-FR">
     <Feature>Fonctionnalité</Feature>
     <Background>Contexte</Background>
     <Scenario>Scénario</Scenario>
@@ -37,7 +37,7 @@
     <And>Et</And>
     <But>Mais</But>
   </Language>
-  <Language code="hu">
+  <Language code="hu" defaultSpecificCulture="hu-HU">
     <Feature>Jellemző</Feature>
     <Background>Háttér</Background>
     <Scenario>Forgatókönyv</Scenario>
@@ -49,7 +49,7 @@
     <And>És</And>
     <But>De</But>
   </Language>
-  <Language code="nl">
+  <Language code="nl" defaultSpecificCulture="nl-NL">
     <Feature>Functionaliteit</Feature>
     <Background>Achtergrond</Background>
     <Scenario>Scenario</Scenario>

diff --git a/Runtime/Configuration/ConfigurationSectionHandler.cs b/Runtime/Configuration/ConfigurationSectionHandler.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Configuration;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Xml;
@@ -15,7 +16,7 @@ public enum MissingOrPendingStepsOutcome
 
     public static class ConfigDefaults
     {
-        internal const string FeatureLanguage = "en";
+        internal const string FeatureLanguage = "en-US";
         internal const string ToolLanguage = "";
 
         internal const string UnitTestProviderName = "NUnit";

diff --git a/Runtime/FeatureInfo.cs b/Runtime/FeatureInfo.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Globalization;
 using System.Linq;
+using TechTalk.SpecFlow.Tracing;
 
 namespace TechTalk.SpecFlow
 {
@@ -10,6 +11,13 @@ public class FeatureInfo
         public string Title { get; private set; }
         public string Description { get; private set; }
         public CultureInfo Language { get; private set; }
+        public CultureInfo CultureInfo
+        {
+            get
+            {
+                return LanguageHelper.GetSpecificCultureInfo(Language);
+            }
+        }
 
         public FeatureInfo(CultureInfo language, string title, string description, params string[] tags)
         {

diff --git a/Runtime/TestRunner.cs b/Runtime/TestRunner.cs
@@ -391,7 +391,8 @@ private object[] GetExecuteArguments(BindingMatch match)
 
             for (int argIndex = 0; argIndex < regexArgs.Length; argIndex++)
             {
-                object convertedArg = Convert.ChangeType(regexArgs[argIndex], match.StepBinding.ParameterTypes[argIndex]);
+                object convertedArg = Convert.ChangeType(regexArgs[argIndex], match.StepBinding.ParameterTypes[argIndex], 
+                    FeatureContext.Current.FeatureInfo.CultureInfo);
                 arguments.Add(convertedArg);
             }
 

diff --git a/Runtime/Tracing/LanguageHelper.cs b/Runtime/Tracing/LanguageHelper.cs
@@ -11,7 +11,10 @@ namespace TechTalk.SpecFlow.Tracing
 {
     internal static class LanguageHelper
     {
-        class KeywordTranslation : Dictionary<StepDefinitionKeyword, string> {}
+        class KeywordTranslation : Dictionary<StepDefinitionKeyword, string>
+        {
+            public CultureInfo DefaultSpecificCulture { get; set; }
+        }
 
         private static readonly Dictionary<CultureInfo, KeywordTranslation> translationCache = new Dictionary<CultureInfo, KeywordTranslation>();
 
@@ -21,17 +24,33 @@ public static string GetKeyword(CultureInfo language, BindingType bindingType)
         }
 
         public static string GetKeyword(CultureInfo language, StepDefinitionKeyword keyword)
+        {
+            KeywordTranslation translation = GetTranslation(language);
+            return translation[keyword];
+        }
+
+        private static KeywordTranslation GetTranslation(CultureInfo language)
         {
             KeywordTranslation translation;
             if (!translationCache.TryGetValue(language, out translation))
             {
-                translation = GetTranslation(language);
+                translation = LoadTranslation(language);
             }
+            return translation;
+        }
 
-            return translation[keyword];
+        static public CultureInfo GetSpecificCultureInfo(CultureInfo language)
+        {
+            //HACK: we need to have a better solution
+            if (!language.IsNeutralCulture)
+                return language;
+
+            KeywordTranslation translation = GetTranslation(language);
+            return translation.DefaultSpecificCulture;
         }
 
-        private static KeywordTranslation GetTranslation(CultureInfo language)
+
+        private static KeywordTranslation LoadTranslation(CultureInfo language)
         {
             var docStream = typeof(LanguageHelper).Assembly.GetManifestResourceStream("TechTalk.SpecFlow.Languages.xml");
             if (docStream == null)
@@ -47,6 +66,10 @@ private static KeywordTranslation GetTranslation(CultureInfo language)
 
             KeywordTranslation result = new KeywordTranslation();
 
+            result.DefaultSpecificCulture = language.IsNeutralCulture ?
+                new CultureInfo(langElm.Attribute(XName.Get("defaultSpecificCulture", "")).Value) :
+                language;
+
             foreach (StepDefinitionKeyword keyword in Enum.GetValues(typeof(StepDefinitionKeyword)))
             {
                 XElement keywordElm = langElm.Element(keyword.ToString());

diff --git a/changelog.txt b/changelog.txt
@@ -7,6 +7,7 @@ New features:
 Fixed issues:
 + MsTest does not refresh tests automatically (Issue 25)
 + Fixes in report localization
++ Non-string parameters for bindings are not converted using the feature language (Issue 26)
 
 1.1.0 - 2009/11/11