Improve test infrastructure.

Author: lauxjpn

test/EFCore.Jet.Tests/JetMigrationTest.cs

@@ -42,11 +42,9 @@ public virtual void Create_table_with_HasDefaultValueSql()
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 INSERT INTO `Cookie` (`CookieId`, `Name`)
 VALUES (1, 'Basic');
 
-
 SELECT `c`.`CookieId`, `c`.`BestServedBefore`, `c`.`Name`
 FROM `Cookie` AS `c`");
         }
@@ -108,15 +106,13 @@ public virtual void Create_many_to_many_table_with_explicit_counter_column_type(
     CONSTRAINT `PK_Backery` PRIMARY KEY (`BackeryId`)
 );
 
-
 CREATE TABLE `Cookie` (
     `CookieId` counter NOT NULL,
     `Name` longchar NULL,
     `BestServedBefore` datetime NOT NULL,
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 CREATE TABLE `CookieBackery` (
     `CookieId` integer NOT NULL,
     `BackeryId` integer NOT NULL,
@@ -125,22 +121,17 @@ public virtual void Create_many_to_many_table_with_explicit_counter_column_type(
     CONSTRAINT `FK_CookieBackery_Cookie_CookieId` FOREIGN KEY (`CookieId`) REFERENCES `Cookie` (`CookieId`) ON DELETE CASCADE
 );
 
-
 INSERT INTO `Backery` (`BackeryId`, `Name`)
 VALUES (1, 'Bread & Cookies');
 
-
 INSERT INTO `Cookie` (`CookieId`, `BestServedBefore`, `Name`)
 VALUES (1, #1899-12-30#, 'Chocolate Chip');
 
-
 INSERT INTO `CookieBackery` (`BackeryId`, `CookieId`)
 VALUES (1, 1);
 
-
 CREATE INDEX `IX_CookieBackery_BackeryId` ON `CookieBackery` (`BackeryId`);
 
-
 SELECT `c`.`CookieId`, `c`.`BackeryId`, `c0`.`CookieId`, `c0`.`BestServedBefore`, `c0`.`Name`, `b`.`BackeryId`, `b`.`Name`
 FROM (`CookieBackery` AS `c`
 INNER JOIN `Cookie` AS `c0` ON `c`.`CookieId` = `c0`.`CookieId`)
@@ -204,15 +195,13 @@ public virtual void Create_many_to_many_table_with_explicit_int_column_type()
     CONSTRAINT `PK_Backery` PRIMARY KEY (`BackeryId`)
 );
 
-
 CREATE TABLE `Cookie` (
     `CookieId` counter NOT NULL,
     `Name` longchar NULL,
     `BestServedBefore` datetime NOT NULL,
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 CREATE TABLE `CookieBackery` (
     `CookieId` integer NOT NULL,
     `BackeryId` integer NOT NULL,
@@ -221,22 +210,17 @@ public virtual void Create_many_to_many_table_with_explicit_int_column_type()
     CONSTRAINT `FK_CookieBackery_Cookie_CookieId` FOREIGN KEY (`CookieId`) REFERENCES `Cookie` (`CookieId`) ON DELETE CASCADE
 );
 
-
 INSERT INTO `Backery` (`BackeryId`, `Name`)
 VALUES (1, 'Bread & Cookies');
 
-
 INSERT INTO `Cookie` (`CookieId`, `BestServedBefore`, `Name`)
 VALUES (1, #1899-12-30#, 'Chocolate Chip');
 
-
 INSERT INTO `CookieBackery` (`BackeryId`, `CookieId`)
 VALUES (1, 1);
 
-
 CREATE INDEX `IX_CookieBackery_BackeryId` ON `CookieBackery` (`BackeryId`);
 
-
 SELECT `c`.`CookieId`, `c`.`BackeryId`, `c0`.`CookieId`, `c0`.`BestServedBefore`, `c0`.`Name`, `b`.`BackeryId`, `b`.`Name`
 FROM (`CookieBackery` AS `c`
 INNER JOIN `Cookie` AS `c0` ON `c`.`CookieId` = `c0`.`CookieId`)
@@ -306,15 +290,13 @@ public virtual void Create_many_to_many_table_with_inappropriate_counter_column_
     CONSTRAINT `PK_Backery` PRIMARY KEY (`BackeryId`)
 );
 
-
 CREATE TABLE `Cookie` (
     `CookieId` counter NOT NULL,
     `Name` longchar NULL,
     `BestServedBefore` datetime NOT NULL,
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 CREATE TABLE `CookieBackery` (
     `CookieId` integer NOT NULL,
     `BackeryId` integer NOT NULL,
@@ -323,22 +305,17 @@ public virtual void Create_many_to_many_table_with_inappropriate_counter_column_
     CONSTRAINT `FK_CookieBackery_Cookie_CookieId` FOREIGN KEY (`CookieId`) REFERENCES `Cookie` (`CookieId`) ON DELETE CASCADE
 );
 
-
 INSERT INTO `Backery` (`BackeryId`, `Name`)
 VALUES (1, 'Bread & Cookies');
 
-
 INSERT INTO `Cookie` (`CookieId`, `BestServedBefore`, `Name`)
 VALUES (1, #1899-12-30#, 'Chocolate Chip');
 
-
 INSERT INTO `CookieBackery` (`BackeryId`, `CookieId`)
 VALUES (1, 1);
 
-
 CREATE INDEX `IX_CookieBackery_BackeryId` ON `CookieBackery` (`BackeryId`);
 
-
 SELECT `c`.`CookieId`, `c`.`BackeryId`, `c0`.`CookieId`, `c0`.`BestServedBefore`, `c0`.`Name`, `b`.`BackeryId`, `b`.`Name`
 FROM (`CookieBackery` AS `c`
 INNER JOIN `Cookie` AS `c0` ON `c`.`CookieId` = `c0`.`CookieId`)

test/EFCore.Jet.Tests/TestBase.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using EntityFrameworkCore.Jet.FunctionalTests.TestUtilities;
 using EntityFrameworkCore.Jet.Infrastructure;
 using Microsoft.EntityFrameworkCore;
@@ -19,7 +20,7 @@ public TestBase()
         public virtual string StoreName => GetType().Name;
         public virtual JetTestStore TestStore { get; }
         public virtual List<string> SqlCommands { get; } = new List<string>();
-        public virtual string Sql => string.Join("\n\n", SqlCommands);
+        public virtual string Sql => string.Join("\n\n", SqlCommands.Select(c => c.Trim('\r', '\n')));
 
         public virtual TContext CreateContext(
             Action<JetDbContextOptionsBuilder> jetOptions = null,