updated teardown.sql for SQLite3; initialize Orders and LineItems tables in Setup() of ModuleTest;

mikhaild908@gmail.com · mikhaild908@gmail.com · commit b15b15bd40eb · 2013-06-21T17:00:43.000Z
diff --git a/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.Net45.2012.csproj b/src/IBatisNet.DataMapper.Test/IBatisNet.DataMapper.Test.Net45.2012.csproj
@@ -377,7 +377,9 @@
     <Content Include="Maps\MSSQL\SqlClient\LineItem.xml" />
     <Content Include="Maps\MSSQL\SqlClient\NewsPaper.xml" />
     <Content Include="Maps\MSSQL\SqlClient\Nullable.xml" />
-    <Content Include="Maps\MSSQL\SqlClient\Order.xml" />
+    <Content Include="Maps\MSSQL\SqlClient\Order.xml">
+      <SubType>Designer</SubType>
+    </Content>
     <Content Include="Maps\MSSQL\SqlClient\Other.xml" />
     <Content Include="Maps\MSSQL\SqlClient\ParameterClass.xml" />
     <Content Include="Maps\MSSQL\SqlClient\ParentChild1.xml" />
@@ -458,8 +460,10 @@
     <Content Include="Maps\SQLite3\Enumeration.xml" />
     <Content Include="Maps\SQLite3\GroupByMapping.xml" />
     <Content Include="Maps\SQLite3\LineItem.xml" />
-    <EmbeddedResource Include="Maps\SQLite3\Module\Order2.xml" />
-    <Content Include="Maps\SQLite3\MapModule.xml" />
+    <EmbeddedResource Include="Maps\SQLite3\Module\Order2.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Maps\SQLite3\MapModule.xml" />
     <Content Include="Maps\SQLite3\NewsPaper.xml" />
     <Content Include="Maps\SQLite3\Nullable.xml" />
     <Content Include="Maps\SQLite3\Order.xml" />
diff --git a/src/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ModuleTest.cs b/src/IBatisNet.DataMapper.Test/NUnit/SqlMapTests/ModuleTest.cs
@@ -25,8 +25,10 @@ public class ModuleTest : BaseTest
 		[SetUp] 
 		public void SetUp() 
 		{
-			InitScript( sqlMap.DataSource, ScriptDirectory + "account-init.sql" );
-            InitScript(sqlMap.DataSource, ScriptDirectory + "account-procedure.sql", false);    
+			InitScript(sqlMap.DataSource, ScriptDirectory + "account-init.sql" );
+            InitScript(sqlMap.DataSource, ScriptDirectory + "account-procedure.sql", false);
+            InitScript(sqlMap.DataSource, ScriptDirectory + "order-init.sql");
+            InitScript(sqlMap.DataSource, ScriptDirectory + "line-item-init.sql");
 		}
 
 		/// <summary>
diff --git a/src/IBatisNet.DataMapper.Test/Scripts/SQLite3/teardown.sql b/src/IBatisNet.DataMapper.Test/Scripts/SQLite3/teardown.sql
@@ -1 +1,5 @@
-DROP TABLE Accounts;
+DROP TABLE Accounts;
+
+DROP TABLE Orders;
+
+DROP TABLE LineItems;

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,10 @@ public class ModuleTest : BaseTest`
`25`	`25`	`[SetUp]`
`26`	`26`	`public void SetUp()`
`27`	`27`	`{`
`28`		`- InitScript( sqlMap.DataSource, ScriptDirectory + "account-init.sql" );`
`29`		`- InitScript(sqlMap.DataSource, ScriptDirectory + "account-procedure.sql", false);`
	`28`	`+ InitScript(sqlMap.DataSource, ScriptDirectory + "account-init.sql" );`
	`29`	`+ InitScript(sqlMap.DataSource, ScriptDirectory + "account-procedure.sql", false);`
	`30`	`+ InitScript(sqlMap.DataSource, ScriptDirectory + "order-init.sql");`
	`31`	`+ InitScript(sqlMap.DataSource, ScriptDirectory + "line-item-init.sql");`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`/// <summary>`