From 7214d3ca9ff12d98265147a337bd4eb3b31d5ca9 Mon Sep 17 00:00:00 2001
From: Laurents Meyer <laucomm@gmail.com>
Date: Sun, 12 Jun 2022 11:06:31 +0200
Subject: [PATCH] Improve test infrastructure.

---
 test/EFCore.Jet.Tests/JetMigrationTest.cs | 23 -----------------------
 test/EFCore.Jet.Tests/TestBase.cs         |  3 ++-
 2 files changed, 2 insertions(+), 24 deletions(-)

diff --git a/test/EFCore.Jet.Tests/JetMigrationTest.cs b/test/EFCore.Jet.Tests/JetMigrationTest.cs
index 9c6094c..b86f8f8 100644
--- a/test/EFCore.Jet.Tests/JetMigrationTest.cs
+++ b/test/EFCore.Jet.Tests/JetMigrationTest.cs
@@ -42,11 +42,9 @@ namespace EntityFrameworkCore.Jet
     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,7 +106,6 @@ FROM `Cookie` AS `c`");
     CONSTRAINT `PK_Backery` PRIMARY KEY (`BackeryId`)
 );
 
-
 CREATE TABLE `Cookie` (
     `CookieId` counter NOT NULL,
     `Name` longchar NULL,
@@ -116,7 +113,6 @@ CREATE TABLE `Cookie` (
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 CREATE TABLE `CookieBackery` (
     `CookieId` integer NOT NULL,
     `BackeryId` integer NOT NULL,
@@ -125,22 +121,17 @@ CREATE TABLE `CookieBackery` (
     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,7 +195,6 @@ INNER JOIN `Backery` AS `b` ON `c`.`BackeryId` = `b`.`BackeryId`");
     CONSTRAINT `PK_Backery` PRIMARY KEY (`BackeryId`)
 );
 
-
 CREATE TABLE `Cookie` (
     `CookieId` counter NOT NULL,
     `Name` longchar NULL,
@@ -212,7 +202,6 @@ CREATE TABLE `Cookie` (
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 CREATE TABLE `CookieBackery` (
     `CookieId` integer NOT NULL,
     `BackeryId` integer NOT NULL,
@@ -221,22 +210,17 @@ CREATE TABLE `CookieBackery` (
     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,7 +290,6 @@ INNER JOIN `Backery` AS `b` ON `c`.`BackeryId` = `b`.`BackeryId`");
     CONSTRAINT `PK_Backery` PRIMARY KEY (`BackeryId`)
 );
 
-
 CREATE TABLE `Cookie` (
     `CookieId` counter NOT NULL,
     `Name` longchar NULL,
@@ -314,7 +297,6 @@ CREATE TABLE `Cookie` (
     CONSTRAINT `PK_Cookie` PRIMARY KEY (`CookieId`)
 );
 
-
 CREATE TABLE `CookieBackery` (
     `CookieId` integer NOT NULL,
     `BackeryId` integer NOT NULL,
@@ -323,22 +305,17 @@ CREATE TABLE `CookieBackery` (
     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`)
diff --git a/test/EFCore.Jet.Tests/TestBase.cs b/test/EFCore.Jet.Tests/TestBase.cs
index 78b5f9d..99bfa33 100644
--- a/test/EFCore.Jet.Tests/TestBase.cs
+++ b/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 @@ namespace EntityFrameworkCore.Jet
         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,