Add Guid type in mock samples and add a custom message when a conversion fails

Denis Voituron · Denis Voituron · commit 9bfd35d8bf68 · 2021-01-13T13:50:47.000+01:00
diff --git a/DbMocker.Tests/DbMockResourceTests.cs b/DbMocker.Tests/DbMockResourceTests.cs
@@ -93,6 +93,17 @@ public void MockTable_DateTime_Test()
             Assert.AreEqual(new DateTime(2020, 01, 15), table.Rows[0, 0]);
         }
 
+        [TestMethod]
+        [ExpectedException(typeof(InvalidCastException))]
+        public void MockTable_InvalidDate_Test()
+        {
+            string content = "Col1       \n" +
+                             "(date)     \n" +
+                             "2020-01-32   ";
+
+            var table = MockTable.FromFixed(content);
+        }
+
         [TestMethod]
         public void MockTable_Boolean_Test()
         {
@@ -132,6 +143,30 @@ public void MockTable_StringGuillemets_Test()
             Assert.AreEqual("ABC DEF", table.Rows[0, 0]);
         }
 
+        [TestMethod]
+        public void MockTable_Guid_Test()
+        {
+            string content = "Col1                                 \n" +
+                             "(guid)                               \n" +
+                             "b5acc392-3b9d-4059-9851-3d7344db6e91   ";
+
+            var table = MockTable.FromFixed(content);
+
+            Assert.AreEqual(typeof(Guid), table.Columns[0].Type);
+            Assert.AreEqual(new Guid("b5acc392-3b9d-4059-9851-3d7344db6e91"), table.Rows[0, 0]);
+        }
+
+        [TestMethod]
+        [ExpectedException(typeof(InvalidCastException))]
+        public void MockTable_InvalidGuid_Test()
+        {
+            string content = "Col1                                 \n" +
+                             "(guid)                               \n" +
+                             "b5acc392-XXXX-XXXX-XXXX-3d7344db6e91   ";
+
+            var table = MockTable.FromFixed(content);
+        }
+
         [TestMethod]
         public void MockTable_FixedColumns_MissingColumn_Test()
         {
diff --git a/DbMocker.Tests/Samples_EFTests.cs b/DbMocker.Tests/Samples_EFTests.cs
@@ -50,9 +50,9 @@ public void EF_AllEmployees_Test()
 
             conn.Mocks
                 .WhenTag("ALL_EMPLOYEES")
-                .ReturnsTable(new MockTable().AddColumns("Id", "Name")
-                                             .AddRow(1, "Scott")
-                                             .AddRow(2, "Bill"));
+                .ReturnsTable(new MockTable().AddColumns("Id", "Code", "Name")
+                                             .AddRow(1, "802f2ae2-fd99-4f67-b01a-ccc5a72b4f72", "Scott")
+                                             .AddRow(2, "649d095b-0dda-4cb6-a8c9-aafc56bab78f", "Bill"));
 
             using (var context = new CompanyContext(conn))
             {
@@ -88,7 +88,8 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     public class Employee
     {
         public int Id { get; set; }
-        public string Name { get; set; }
+        public Guid Code { get; set; }
+        public string Name { get; set; }        
     }
 
     #endregion
diff --git a/DbMocker/Data/MockDbDataReader.cs b/DbMocker/Data/MockDbDataReader.cs
@@ -99,7 +99,15 @@ public override float GetFloat(int ordinal)
 
         public override Guid GetGuid(int ordinal)
         {
-            return (Guid)GetValue(ordinal);
+            object value = GetValue(ordinal);
+            if (value.GetType() == typeof(string))
+            {
+                return new Guid(Convert.ToString(value));
+            }
+            else
+            {
+                return (Guid)value;
+            }
         }
 
         public override short GetInt16(int ordinal)
diff --git a/DbMocker/DbMocker.csproj b/DbMocker/DbMocker.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AssemblyName>Apps72.Dev.Data.DbMocker</AssemblyName>
     <RootNamespace>Apps72.Dev.Data.DbMocker</RootNamespace>
-    <Version>1.13.0</Version>
+    <Version>1.14.0</Version>
     <PackageId>DbMocker</PackageId>
 	<PackageLicenseExpression>MIT</PackageLicenseExpression>
     <Authors>Denis Voituron</Authors>
@@ -25,10 +25,10 @@ conn.Mocks
     <PackageTags>DbMocker, Mocker, SQLServer, Oracle, Sqlite, EntityFramework, EF, Dapper, UnitTest</PackageTags>
     <PackageReleaseNotes>https://github.com/Apps72/DbMocker</PackageReleaseNotes>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <AssemblyVersion>1.13.0.0</AssemblyVersion>
+    <AssemblyVersion>1.14.0.0</AssemblyVersion>
     <PackageProjectUrl>https://github.com/Apps72/DbMocker</PackageProjectUrl>
     <RepositoryUrl>https://github.com/Apps72/DbMocker</RepositoryUrl>
-    <FileVersion>1.13.0.0</FileVersion>
+    <FileVersion>1.14.0.0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/DbMocker/Helpers/TypeExtension.cs b/DbMocker/Helpers/TypeExtension.cs
@@ -59,6 +59,12 @@ public static Type NameToType(this string value)
                     case "timespan":
                         return typeof(TimeSpan);
 
+                    case "guid":
+                    case "id":
+                    case "uniqueidentifier":
+                    case "unique":
+                        return typeof(Guid);
+
                     case "decimal":
                         return typeof(decimal);
 
diff --git a/DbMocker/MockTableImportFixed.cs b/DbMocker/MockTableImportFixed.cs
@@ -104,24 +104,31 @@ private IEnumerable<object[]> GetRowsConverted(IEnumerable<string[]> rows)
                 var rowConverted = new object[fieldsCount];
                 for (int i = 0; i < fieldsCount; i++)
                 {
-                    // If not a string => String.Empty = NULL
-                    if (fieldsType[i] != typeof(string) && String.IsNullOrEmpty(row[i]))
+                    try
                     {
-                        row[i] = "NULL";
-                    }
-
-                    if (fieldsType[i] != null && String.Compare(row[i], "NULL", ignoreCase: true) != 0)
-                    {
-                        // Convert
-                        var converter = System.ComponentModel.TypeDescriptor.GetConverter(fieldsType[i]);
-                        rowConverted[i] = Convert.ChangeType(converter.ConvertFromInvariantString(row[i]), fieldsType[i]);
+                        // If not a string => String.Empty = NULL
+                        if (fieldsType[i] != typeof(string) && String.IsNullOrEmpty(row[i]))
+                        {
+                            row[i] = "NULL";
+                        }
 
-                        // Guillemets
-                        if (fieldsType[i] == typeof(string) && row[i].Length >= 2 && row[i][0] == '"' && row[i][row[i].Length -1] == '"')
+                        if (fieldsType[i] != null && String.Compare(row[i], "NULL", ignoreCase: true) != 0)
                         {
-                            rowConverted[i] = row[i].Substring(1, row[i].Length - 2);
+                            // Convert
+                            var converter = System.ComponentModel.TypeDescriptor.GetConverter(fieldsType[i]);
+                            rowConverted[i] = Convert.ChangeType(converter.ConvertFromInvariantString(row[i]), fieldsType[i]);
+
+                            // Guillemets
+                            if (fieldsType[i] == typeof(string) && row[i].Length >= 2 && row[i][0] == '"' && row[i][row[i].Length - 1] == '"')
+                            {
+                                rowConverted[i] = row[i].Substring(1, row[i].Length - 2);
+                            }
                         }
                     }
+                    catch (Exception)
+                    {
+                        throw new InvalidCastException($"Invalid conversion of \"{row[i]}\" to \"{fieldsType[i].Name}\", for column \"{Fields.ElementAt(i).Name}\".");
+                    }
                 }
                 yield return rowConverted;
             }
@@ -206,7 +213,7 @@ private static string ReadResourceFile(Assembly assembly, string resourceName)
             using (Stream stream = assembly.GetManifestResourceStream(resourceName))
             using (StreamReader reader = new StreamReader(stream))
             {
-                return reader.ReadToEnd();                
+                return reader.ReadToEnd();
             }
         }
 
diff --git a/ReadMe.md b/ReadMe.md
@@ -228,6 +228,10 @@ var conn = new MockDbConnection()
 
 ## Releases
 
+## Version 1.14
+- Add 'Guid' type in `MockTable.FromFixed` and resource sample files.
+- Add a custom message when a sample conversion fails. Ex: `Invalid conversion of "2020-01-32" to "DateTime", for column "Col1"`.
+
 ## Version 1.13
 - Set output value for DbParameter, using `MockResturns.SetParameterValue` method.
   Thanks [unby](https://github.com/unby).

Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,9 @@ public void EF_AllEmployees_Test()`
`50`	`50`
`51`	`51`	`conn.Mocks`
`52`	`52`	`.WhenTag("ALL_EMPLOYEES")`
`53`		`- .ReturnsTable(new MockTable().AddColumns("Id", "Name")`
`54`		`- .AddRow(1, "Scott")`
`55`		`- .AddRow(2, "Bill"));`
	`53`	`+ .ReturnsTable(new MockTable().AddColumns("Id", "Code", "Name")`
	`54`	`+ .AddRow(1, "802f2ae2-fd99-4f67-b01a-ccc5a72b4f72", "Scott")`
	`55`	`+ .AddRow(2, "649d095b-0dda-4cb6-a8c9-aafc56bab78f", "Bill"));`
`56`	`56`
`57`	`57`	`using (var context = new CompanyContext(conn))`
`58`	`58`	`{`
`@@ -88,7 +88,8 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)`
`88`	`88`	`public class Employee`
`89`	`89`	`{`
`90`	`90`	`public int Id { get; set; }`
`91`		`- public string Name { get; set; }`
	`91`	`+ public Guid Code { get; set; }`
	`92`	`+ public string Name { get; set; }`
`92`	`93`	`}`
`93`	`94`
`94`	`95`	`#endregion`
Original file line number	Diff line number	Diff line change
`@@ -104,24 +104,31 @@ private IEnumerable<object[]> GetRowsConverted(IEnumerable<string[]> rows)`
`104`	`104`	`var rowConverted = new object[fieldsCount];`
`105`	`105`	`for (int i = 0; i < fieldsCount; i++)`
`106`	`106`	`{`
`107`		`- // If not a string => String.Empty = NULL`
`108`		`- if (fieldsType[i] != typeof(string) && String.IsNullOrEmpty(row[i]))`
	`107`	`+ try`
`109`	`108`	`{`
`110`		`- row[i] = "NULL";`
`111`		`- }`
`112`		`-`
`113`		`- if (fieldsType[i] != null && String.Compare(row[i], "NULL", ignoreCase: true) != 0)`
`114`		`- {`
`115`		`- // Convert`
`116`		`- var converter = System.ComponentModel.TypeDescriptor.GetConverter(fieldsType[i]);`
`117`		`- rowConverted[i] = Convert.ChangeType(converter.ConvertFromInvariantString(row[i]), fieldsType[i]);`
	`109`	`+ // If not a string => String.Empty = NULL`
	`110`	`+ if (fieldsType[i] != typeof(string) && String.IsNullOrEmpty(row[i]))`
	`111`	`+ {`
	`112`	`+ row[i] = "NULL";`
	`113`	`+ }`
`118`	`114`
`119`		`- // Guillemets`
`120`		`- if (fieldsType[i] == typeof(string) && row[i].Length >= 2 && row[i][0] == '"' && row[i][row[i].Length -1] == '"')`
	`115`	`+ if (fieldsType[i] != null && String.Compare(row[i], "NULL", ignoreCase: true) != 0)`
`121`	`116`	`{`
`122`		`- rowConverted[i] = row[i].Substring(1, row[i].Length - 2);`
	`117`	`+ // Convert`
	`118`	`+ var converter = System.ComponentModel.TypeDescriptor.GetConverter(fieldsType[i]);`
	`119`	`+ rowConverted[i] = Convert.ChangeType(converter.ConvertFromInvariantString(row[i]), fieldsType[i]);`
	`120`	`+`
	`121`	`+ // Guillemets`
	`122`	`+ if (fieldsType[i] == typeof(string) && row[i].Length >= 2 && row[i][0] == '"' && row[i][row[i].Length - 1] == '"')`
	`123`	`+ {`
	`124`	`+ rowConverted[i] = row[i].Substring(1, row[i].Length - 2);`
	`125`	`+ }`
`123`	`126`	`}`
`124`	`127`	`}`
	`128`	`+ catch (Exception)`
	`129`	`+ {`
	`130`	`+ throw new InvalidCastException($"Invalid conversion of \"{row[i]}\" to \"{fieldsType[i].Name}\", for column \"{Fields.ElementAt(i).Name}\".");`
	`131`	`+ }`
`125`	`132`	`}`
`126`	`133`	`yield return rowConverted;`
`127`	`134`	`}`
`@@ -206,7 +213,7 @@ private static string ReadResourceFile(Assembly assembly, string resourceName)`
`206`	`213`	`using (Stream stream = assembly.GetManifestResourceStream(resourceName))`
`207`	`214`	`using (StreamReader reader = new StreamReader(stream))`
`208`	`215`	`{`
`209`		`- return reader.ReadToEnd();`
	`216`	`+ return reader.ReadToEnd();`
`210`	`217`	`}`
`211`	`218`	`}`
`212`	`219`