Fixing tests

StanleyGoldman · StanleyGoldman · commit e80a7017d00f · 2018-09-19T17:09:15.000-04:00
diff --git a/ReadableExpressions.UnitTests/Extensions/WhenGeneratingVariableNames.cs b/ReadableExpressions.UnitTests/Extensions/WhenGeneratingVariableNames.cs
@@ -14,61 +14,61 @@ public class WhenGeneratingVariableNames
         [Fact]
         public void ShouldNameAVariableForAnArrayType()
         {
-            typeof(Box[]).GetVariableNameInCamelCase().ShouldBe("boxArray");
+            typeof(Box[]).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("boxArray");
         }
 
         [Fact]
         public void ShouldNameAVariableForACollectionTypeEndingInX()
         {
-            typeof(ICollection<Box>).GetVariableNameInCamelCase().ShouldBe("boxes");
+            typeof(ICollection<Box>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("boxes");
         }
 
         [Fact]
         public void ShouldNameAVariableForAnEnumerableTypeEndingInZ()
         {
-            typeof(IEnumerable<Fuzz>).GetVariableNameInPascalCase().ShouldBe("Fuzzes");
+            typeof(IEnumerable<Fuzz>).GetVariableNameInPascalCase(new TranslationSettings()).ShouldBe("Fuzzes");
         }
 
         [Fact]
         public void ShouldNameAVariableForAnEnumerableTypeEndingInDoubleS()
         {
-            typeof(IEnumerable<Glass>).GetVariableNameInPascalCase().ShouldBe("Glasses");
+            typeof(IEnumerable<Glass>).GetVariableNameInPascalCase(new TranslationSettings()).ShouldBe("Glasses");
         }
 
         [Fact]
         public void ShouldNameAVariableForAListTypeEndingInCh()
         {
-            typeof(List<Church>).GetVariableNameInCamelCase().ShouldBe("churches");
+            typeof(List<Church>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("churches");
         }
 
         [Fact]
         public void ShouldNameAVariableForAListTypeEndingInSh()
         {
-            typeof(List<Hush>).GetVariableNameInCamelCase().ShouldBe("hushes");
+            typeof(List<Hush>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("hushes");
         }
 
         [Fact]
         public void ShouldNameAVariableForAListTypeEndingInVowelY()
         {
-            typeof(List<Journey>).GetVariableNameInCamelCase().ShouldBe("journeys");
+            typeof(List<Journey>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("journeys");
         }
 
         [Fact]
         public void ShouldNameAVariableForAnIListTypeEndingInConsonantY()
         {
-            typeof(IList<Body>).GetVariableNameInPascalCase().ShouldBe("Bodies");
+            typeof(IList<Body>).GetVariableNameInPascalCase(new TranslationSettings()).ShouldBe("Bodies");
         }
 
         [Fact]
         public void ShouldNameANullableLongVariable()
         {
-            typeof(long?).GetVariableNameInCamelCase().ShouldBe("nullableLong");
+            typeof(long?).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("nullableLong");
         }
 
         [Fact]
         public void ShouldNameAnArrayOfArraysVariable()
         {
-            typeof(int?[][]).GetVariableNameInCamelCase().ShouldBe("nullableIntArrayArray");
+            typeof(int?[][]).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("nullableIntArrayArray");
         }
 
         // ReSharper disable ClassNeverInstantiated.Local
diff --git a/ReadableExpressions.UnitTests/Extensions/WhenGettingFriendlyNames.cs b/ReadableExpressions.UnitTests/Extensions/WhenGettingFriendlyNames.cs
@@ -41,11 +41,21 @@ public void ShouldUseFriendlyNamesForAnonymousTypes()
         {
             var anon = new { One = 1, Two = "two" };
 
-            var friendlyName = anon.GetType().GetFriendlyName();
+            var friendlyName = anon.GetType().GetFriendlyName(new TranslationSettings());
 
             friendlyName.ShouldBe("AnonymousType<int, string>");
         }
 
+        [Fact]
+        public void ShouldUseObjectForAnonymousTypesIfConfigured()
+        {
+            var anon = new { One = 1, Two = "two" };
+
+            var friendlyName = anon.GetType().GetFriendlyName(new TranslationSettings().SerializeAnonymousTypesAsObject);
+
+            friendlyName.ShouldBe("object");
+        }
+
         // See https://github.com/agileobjects/ReadableExpressions/issues/6
         [Fact]
         public void ShouldUseFriendlyNamesForMultiplyNestedTypes()
diff --git a/ReadableExpressions.UnitTests/ShouldExtensions.cs b/ReadableExpressions.UnitTests/ShouldExtensions.cs
@@ -396,8 +396,8 @@ public static void ShouldBeOfType<TExpected>(this object actual)
             if (!(actual is TExpected))
             {
                 Asplode(
-                    "An object of type " + typeof(TExpected).GetFriendlyName(),
-                    actual.GetType().GetFriendlyName());
+                    "An object of type " + typeof(TExpected).GetFriendlyName(new TranslationSettings()),
+                    actual.GetType().GetFriendlyName(new TranslationSettings()));
             }
         }
 
diff --git a/ReadableExpressions/TranslationSettings.cs b/ReadableExpressions/TranslationSettings.cs
@@ -7,7 +7,10 @@ public class TranslationSettings
     {
         internal static readonly TranslationSettings Default = new TranslationSettings();
 
-        internal TranslationSettings()
+        /// <summary>
+        /// Creates a Translation Settings instance.
+        /// </summary>
+        public TranslationSettings()
         {
             UseImplicitGenericParameters = true;
         }

Original file line number	Diff line number	Diff line change
`@@ -14,61 +14,61 @@ public class WhenGeneratingVariableNames`
`14`	`14`	`[Fact]`
`15`	`15`	`public void ShouldNameAVariableForAnArrayType()`
`16`	`16`	`{`
`17`		`- typeof(Box[]).GetVariableNameInCamelCase().ShouldBe("boxArray");`
	`17`	`+ typeof(Box[]).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("boxArray");`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`[Fact]`
`21`	`21`	`public void ShouldNameAVariableForACollectionTypeEndingInX()`
`22`	`22`	`{`
`23`		`- typeof(ICollection<Box>).GetVariableNameInCamelCase().ShouldBe("boxes");`
	`23`	`+ typeof(ICollection<Box>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("boxes");`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`[Fact]`
`27`	`27`	`public void ShouldNameAVariableForAnEnumerableTypeEndingInZ()`
`28`	`28`	`{`
`29`		`- typeof(IEnumerable<Fuzz>).GetVariableNameInPascalCase().ShouldBe("Fuzzes");`
	`29`	`+ typeof(IEnumerable<Fuzz>).GetVariableNameInPascalCase(new TranslationSettings()).ShouldBe("Fuzzes");`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`[Fact]`
`33`	`33`	`public void ShouldNameAVariableForAnEnumerableTypeEndingInDoubleS()`
`34`	`34`	`{`
`35`		`- typeof(IEnumerable<Glass>).GetVariableNameInPascalCase().ShouldBe("Glasses");`
	`35`	`+ typeof(IEnumerable<Glass>).GetVariableNameInPascalCase(new TranslationSettings()).ShouldBe("Glasses");`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`[Fact]`
`39`	`39`	`public void ShouldNameAVariableForAListTypeEndingInCh()`
`40`	`40`	`{`
`41`		`- typeof(List<Church>).GetVariableNameInCamelCase().ShouldBe("churches");`
	`41`	`+ typeof(List<Church>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("churches");`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`[Fact]`
`45`	`45`	`public void ShouldNameAVariableForAListTypeEndingInSh()`
`46`	`46`	`{`
`47`		`- typeof(List<Hush>).GetVariableNameInCamelCase().ShouldBe("hushes");`
	`47`	`+ typeof(List<Hush>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("hushes");`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`[Fact]`
`51`	`51`	`public void ShouldNameAVariableForAListTypeEndingInVowelY()`
`52`	`52`	`{`
`53`		`- typeof(List<Journey>).GetVariableNameInCamelCase().ShouldBe("journeys");`
	`53`	`+ typeof(List<Journey>).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("journeys");`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`[Fact]`
`57`	`57`	`public void ShouldNameAVariableForAnIListTypeEndingInConsonantY()`
`58`	`58`	`{`
`59`		`- typeof(IList<Body>).GetVariableNameInPascalCase().ShouldBe("Bodies");`
	`59`	`+ typeof(IList<Body>).GetVariableNameInPascalCase(new TranslationSettings()).ShouldBe("Bodies");`
`60`	`60`	`}`
`61`	`61`
`62`	`62`	`[Fact]`
`63`	`63`	`public void ShouldNameANullableLongVariable()`
`64`	`64`	`{`
`65`		`- typeof(long?).GetVariableNameInCamelCase().ShouldBe("nullableLong");`
	`65`	`+ typeof(long?).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("nullableLong");`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`[Fact]`
`69`	`69`	`public void ShouldNameAnArrayOfArraysVariable()`
`70`	`70`	`{`
`71`		`- typeof(int?[][]).GetVariableNameInCamelCase().ShouldBe("nullableIntArrayArray");`
	`71`	`+ typeof(int?[][]).GetVariableNameInCamelCase(new TranslationSettings()).ShouldBe("nullableIntArrayArray");`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`// ReSharper disable ClassNeverInstantiated.Local`
Original file line number	Diff line number	Diff line change
`@@ -396,8 +396,8 @@ public static void ShouldBeOfType<TExpected>(this object actual)`
`396`	`396`	`if (!(actual is TExpected))`
`397`	`397`	`{`
`398`	`398`	`Asplode(`
`399`		`- "An object of type " + typeof(TExpected).GetFriendlyName(),`
`400`		`- actual.GetType().GetFriendlyName());`
	`399`	`+ "An object of type " + typeof(TExpected).GetFriendlyName(new TranslationSettings()),`
	`400`	`+ actual.GetType().GetFriendlyName(new TranslationSettings()));`
`401`	`401`	`}`
`402`	`402`	`}`
`403`	`403`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,10 @@ public class TranslationSettings`
`7`	`7`	`{`
`8`	`8`	`internal static readonly TranslationSettings Default = new TranslationSettings();`
`9`	`9`
`10`		`- internal TranslationSettings()`
	`10`	`+ /// <summary>`
	`11`	`+ /// Creates a Translation Settings instance.`
	`12`	`+ /// </summary>`
	`13`	`+ public TranslationSettings()`
`11`	`14`	`{`
`12`	`15`	`UseImplicitGenericParameters = true;`
`13`	`16`	`}`