Added tests and upgraded to version 2.6.1.

MiracleDevs · Feb 25, 2021 · 44cf1ee · 44cf1ee
1 parent e4f9901
commit 44cf1ee
Show file tree

Hide file tree

Showing 13 changed files with 155 additions and 11 deletions.
diff --git a/src/Paradigm.ORM.Data.Cassandra/CqlDatabaseConnector.cs b/src/Paradigm.ORM.Data.Cassandra/CqlDatabaseConnector.cs
@@ -239,6 +239,9 @@ public bool IsOpen()
         /// </returns>
         public IDatabaseTransaction CreateTransaction()
         {
+            if (!this.IsOpen())
+                this.Open();
+
             return this.CreateTransaction(IsolationLevel.Serializable);
         }
 

diff --git a/src/Paradigm.ORM.Data.Cassandra/Paradigm.ORM.Data.Cassandra.csproj b/src/Paradigm.ORM.Data.Cassandra/Paradigm.ORM.Data.Cassandra.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>netstandard2.1</TargetFramework>
-        <Version>2.6.0</Version>
+        <Version>2.6.1</Version>
         <Authors>Miracle Devs</Authors>
         <Company>Miracle Devs</Company>
         <Product>Paradigm.ORM</Product>

diff --git a/src/Paradigm.ORM.Data.MySql/MySqlDatabaseConnector.cs b/src/Paradigm.ORM.Data.MySql/MySqlDatabaseConnector.cs
@@ -239,6 +239,9 @@ public bool IsOpen()
         /// </returns>
         public IDatabaseTransaction CreateTransaction()
         {
+            if (!this.IsOpen())
+                this.Open();
+
             return this.CreateTransaction(IsolationLevel.Serializable);
         }
 

diff --git a/src/Paradigm.ORM.Data.MySql/Paradigm.ORM.Data.MySql.csproj b/src/Paradigm.ORM.Data.MySql/Paradigm.ORM.Data.MySql.csproj
@@ -12,7 +12,7 @@
         <RepositoryType>git</RepositoryType>
         <Authors>Miracle Devs</Authors>
         <Company>Miracle Devs</Company>
-        <Version>2.6.0</Version>
+        <Version>2.6.1</Version>
         <Product>Paradigm.ORM</Product>
     </PropertyGroup>
 

diff --git a/src/Paradigm.ORM.Data.PostgreSql/Paradigm.ORM.Data.PostgreSql.csproj b/src/Paradigm.ORM.Data.PostgreSql/Paradigm.ORM.Data.PostgreSql.csproj
@@ -11,7 +11,7 @@
         <Company>Miracle Devs</Company>
         <Copyright>Miracle Devs</Copyright>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Version>2.6.0</Version>
+        <Version>2.6.1</Version>
         <Product>Paradigm.ORM</Product>
     </PropertyGroup>
 

diff --git a/src/Paradigm.ORM.Data.PostgreSql/PostgreSqlDatabaseConnector.cs b/src/Paradigm.ORM.Data.PostgreSql/PostgreSqlDatabaseConnector.cs
@@ -239,6 +239,9 @@ public bool IsOpen()
         /// </returns>
         public IDatabaseTransaction CreateTransaction()
         {
+            if (!this.IsOpen())
+                this.Open();
+
             return this.CreateTransaction(IsolationLevel.Serializable);
         }
 

diff --git a/src/Paradigm.ORM.Data.SqlServer/Paradigm.ORM.Data.SqlServer.csproj b/src/Paradigm.ORM.Data.SqlServer/Paradigm.ORM.Data.SqlServer.csproj
@@ -12,7 +12,7 @@
         <PackageIcon>icon.png</PackageIcon>
         <RepositoryUrl>https://github.com/MiracleDevs/Paradigm.ORM.git</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
-        <Version>2.6.0</Version>
+        <Version>2.6.1</Version>
         <Product>Paradigm.ORM</Product>
     </PropertyGroup>
 

diff --git a/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseConnector.cs b/src/Paradigm.ORM.Data.SqlServer/SqlDatabaseConnector.cs
@@ -239,6 +239,9 @@ public bool IsOpen()
         /// </returns>
         public IDatabaseTransaction CreateTransaction()
         {
+            if (!this.IsOpen())
+                this.Open();
+
             return this.CreateTransaction(IsolationLevel.Serializable);
         }
 

diff --git a/src/Paradigm.ORM.Data/Paradigm.ORM.Data.csproj b/src/Paradigm.ORM.Data/Paradigm.ORM.Data.csproj
@@ -14,7 +14,7 @@
         <RepositoryType>git</RepositoryType>
         <Authors>Miracle Devs</Authors>
         <Company>Miracle Devs</Company>
-        <Version>2.6.0</Version>
+        <Version>2.6.1</Version>
         <Product>Paradigm.ORM</Product>
     </PropertyGroup>
 

diff --git a/src/Paradigm.ORM.Tests/Fixtures/ConnectionStrings.cs b/src/Paradigm.ORM.Tests/Fixtures/ConnectionStrings.cs
@@ -2,12 +2,12 @@
 {
     public class ConnectionStrings
     {
-        public const string Cql = "Contact Points=localhost;Port=9042;Default Keyspace=test;Username=root";
+        public const string Cql = "Contact Points=127.0.0.1;Port=9042;Default Keyspace=test;Username=root";
 
-        public const string MySql = "Server=localhost;Database=test;User=root;Password=Paradigm_Test_1234;Connection Timeout=3600;Allow User Variables=True;POOLING=true";
+        public const string MySql = "Server=127.0.0.1;Database=test;User=root;Password=Paradigm_Test_1234;Connection Timeout=3600;Allow User Variables=True;POOLING=true";
 
-        public const string PSql = "Server=localhost;User Id=postgres;Password=Paradigm_Test_1234;Timeout=3;Database=test";
+        public const string PSql = "Server=127.0.0.1;User Id=postgres;Password=Paradigm_Test_1234;Timeout=3;Database=test";
 
-        public const string MsSql = "Server=localhost;User=sa;Password=Paradigm_Test_1234;Connection Timeout=3600";
+        public const string MsSql = "Server=127.0.0.1;User=sa;Password=Paradigm_Test_1234;Connection Timeout=3600";
     }
 }
diff --git a/src/Paradigm.ORM.Tests/Tests/TransactionTest.cs b/src/Paradigm.ORM.Tests/Tests/TransactionTest.cs
@@ -0,0 +1,132 @@
+using System;
+using System.Collections.Generic;
+using FluentAssertions;
+using Paradigm.ORM.Data.ValueProviders;
+using Paradigm.ORM.Tests.Fixtures;
+using Paradigm.ORM.Tests.Fixtures.MySql;
+using Paradigm.ORM.Tests.Fixtures.PostgreSql;
+using Paradigm.ORM.Tests.Fixtures.Sql;
+using Paradigm.ORM.Tests.Fixtures.Cql;
+using NUnit.Framework;
+using Paradigm.ORM.Data.Mappers;
+
+
+namespace Paradigm.ORM.Tests.Tests
+{
+    [TestFixture]
+    public class TransactionTest
+    {
+        [Order(1)]
+        [TestCase(typeof(MySqlCrudCommandFixture))]
+        [TestCase(typeof(SqlCrudCommandFixture))]
+        [TestCase(typeof(PostgreSqlCrudCommandFixture))]
+        public void ShouldCreateATransaction(Type fixtureType)
+        {
+            var fixture = Activator.CreateInstance(fixtureType) as CrudCommandFixtureBase;
+
+            fixture.CreateDatabase();
+            fixture.CreateTables();
+
+            var insertCommandBuilder = fixture.Connector.GetCommandBuilderFactory().CreateInsertCommandBuilder(fixture.GetParentDescriptor());
+            var entityToInsert = fixture.CreateNewEntity();
+            var valueProvider = new ClassValueProvider(fixture.Connector, new List<object> { entityToInsert });
+            valueProvider.MoveNext();
+            var insertCommand = insertCommandBuilder.GetCommand(valueProvider);
+
+            using (var transaction = fixture.Connector.CreateTransaction())
+            {
+                if (fixtureType == typeof(CqlCrudCommandFixture))
+                    insertCommand.ExecuteNonQuery().Should().Be(-1);
+                else
+                    insertCommand.ExecuteNonQuery().Should().Be(1);
+            }
+
+            fixture.DropDatabase();
+        }
+
+        [Order(2)]
+        [TestCase(typeof(MySqlCrudCommandFixture))]
+        [TestCase(typeof(SqlCrudCommandFixture))]
+        [TestCase(typeof(PostgreSqlCrudCommandFixture))]
+        public void ShouldCommitATransaction(Type fixtureType)
+        {
+            var fixture = Activator.CreateInstance(fixtureType) as CrudCommandFixtureBase;
+
+            fixture.CreateDatabase();
+            fixture.CreateTables();
+
+            var insertCommandBuilder = fixture.Connector.GetCommandBuilderFactory().CreateInsertCommandBuilder(fixture.GetParentDescriptor());
+            var selectCommandBuilder = fixture.Connector.GetCommandBuilderFactory().CreateSelectCommandBuilder(fixture.GetParentDescriptor());
+            var entityToInsert = fixture.CreateNewEntity();
+            var valueProvider = new ClassValueProvider(fixture.Connector, new List<object> { entityToInsert });
+            valueProvider.MoveNext();
+            var insertCommand = insertCommandBuilder.GetCommand(valueProvider);
+            var selectCommand = selectCommandBuilder.GetCommand();
+
+            using (var transaction = fixture.Connector.CreateTransaction())
+            {
+                if (fixtureType == typeof(CqlCrudCommandFixture))
+                    insertCommand.ExecuteNonQuery().Should().Be(-1);
+                else
+                    insertCommand.ExecuteNonQuery().Should().Be(1);
+
+                transaction.Commit();
+            }
+
+            using (var reader = selectCommand.ExecuteReader())
+            {
+                reader.Should().NotBeNull();
+
+                var mapper = new DatabaseReaderMapper(fixture.Connector, fixture.GetParentDescriptor());
+                var results = mapper.Map(reader);
+
+                results.Should().NotBeNull().And.HaveCount(1);
+            }
+
+            fixture.DropDatabase();
+        }
+
+        [Order(3)]
+        [TestCase(typeof(MySqlCrudCommandFixture))]
+        [TestCase(typeof(SqlCrudCommandFixture))]
+        [TestCase(typeof(PostgreSqlCrudCommandFixture))]
+        public void ShouldRollbackATransaction(Type fixtureType)
+        {
+            var fixture = Activator.CreateInstance(fixtureType) as CrudCommandFixtureBase;
+
+            fixture.CreateDatabase();
+            fixture.CreateTables();
+
+            var insertCommandBuilder = fixture.Connector.GetCommandBuilderFactory().CreateInsertCommandBuilder(fixture.GetParentDescriptor());
+            var selectCommandBuilder = fixture.Connector.GetCommandBuilderFactory().CreateSelectCommandBuilder(fixture.GetParentDescriptor());
+            var entityToInsert = fixture.CreateNewEntity();
+            var valueProvider = new ClassValueProvider(fixture.Connector, new List<object> { entityToInsert });
+            valueProvider.MoveNext();
+            var insertCommand = insertCommandBuilder.GetCommand(valueProvider);
+            var selectCommand = selectCommandBuilder.GetCommand();
+
+            using (var transaction = fixture.Connector.CreateTransaction())
+            {
+                if (fixtureType == typeof(CqlCrudCommandFixture))
+                    insertCommand.ExecuteNonQuery().Should().Be(-1);
+                else
+                    insertCommand.ExecuteNonQuery().Should().Be(1);
+
+                transaction.Rollback();
+            }
+
+            using (var reader = selectCommand.ExecuteReader())
+            {
+                reader.Should().NotBeNull();
+
+                var mapper = new DatabaseReaderMapper(fixture.Connector, fixture.GetParentDescriptor());
+                var results = mapper.Map(reader);
+
+                results.Should().NotBeNull().And.HaveCount(0);
+            }
+
+            fixture.DropDatabase();
+        }
+
+    }
+}
diff --git a/src/Paradigm.ORM.Vb.Tests/Tests/MySql/DatabaseAccessTest.vb b/src/Paradigm.ORM.Vb.Tests/Tests/MySql/DatabaseAccessTest.vb
@@ -15,7 +15,7 @@ Namespace Tests.MySql
         <TestInitialize()>
         Public Sub Initialize()
 
-            Connector = New MySqlDatabaseConnector("Server=localhost;Database=test;User=root;Password=Paradigm_Test_1234;Connection Timeout=3600")
+            Connector = New MySqlDatabaseConnector("Server=127.0.0.1;Database=test;User=root;Password=Paradigm_Test_1234;Connection Timeout=3600")
             Connector.Open()
 
             Connector.ExecuteNonQuery("

diff --git a/src/Paradigm.ORM.Vb.Tests/Tests/MySql/StoredProcedureTest.vb b/src/Paradigm.ORM.Vb.Tests/Tests/MySql/StoredProcedureTest.vb
@@ -14,7 +14,7 @@ Namespace Tests.MySql
         <TestInitialize()>
         Public Sub Initialize()
 
-            Connector = New MySqlDatabaseConnector("Server=localhost;Database=test;User=root;Password=Paradigm_Test_1234;Connection Timeout=3600")
+            Connector = New MySqlDatabaseConnector("Server=127.0.0.1;Database=test;User=root;Password=Paradigm_Test_1234;Connection Timeout=3600")
             Connector.Open()
 
             Connector.ExecuteNonQuery("