Skip to content
This repository was archived by the owner on Dec 24, 2022. It is now read-only.

Commit 4f73cee

Browse files
madalenomadaleno
committed
updated FirebirdTests to fix transactions use.
It seems that the FirebirdTest project is outdated, and Transaction didn't work. It had to do with the way connections were initialized. Changed: using (var db = ConnectionString.OpenDbConnection()) To: using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open()) With this change the Firebird provider works as expected, at least regarding the use of Transactions. Also added app.config and changed OrmLiteTestBase.GetFileConnectionString() to use it, to allow an easy connection string setup. Only remaining problem now is at OrmLiteQueryTest.Can_select_with_filter_from_ModelWithOnlyStringFields_table(). db.ByExampleWhere() doesn't ignore NULL properties and the query returns 0 rows.
1 parent 86f580d commit 4f73cee

22 files changed

+103
-96
lines changed

‎tests/ServiceStack.OrmLite.FirebirdTests/DateTimeColumnTest.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public class DateTimeColumnTest
1515
[Test]
1616
public void Can_create_table_containing_DateTime_column()
1717
{
18-
using (var db = ConnectionString.OpenDbConnection())
18+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
1919
{
2020
db.CreateTable<Analyze>(true);
2121
}
@@ -24,7 +24,7 @@ public void Can_create_table_containing_DateTime_column()
2424
[Test]
2525
public void Can_store_DateTime_Value()
2626
{
27-
using (var db = ConnectionString.OpenDbConnection())
27+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
2828
{
2929
db.CreateTable<Analyze>(true);
3030

@@ -41,7 +41,7 @@ public void Can_store_DateTime_Value()
4141
[Test]
4242
public void Can_store_and_retrieve_DateTime_Value()
4343
{
44-
using (var db = ConnectionString.OpenDbConnection())
44+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
4545
{
4646
db.CreateTable<Analyze>(true);
4747

‎tests/ServiceStack.OrmLite.FirebirdTests/ForeignKeyAttributeTests.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ForeignKeyAttributeTests : OrmLiteTestBase
99
[TestFixtureSetUp]
1010
public void Setup()
1111
{
12-
using (var db = ConnectionString.OpenDbConnection())
12+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
1313
{
1414
db.CreateTable<ReferencedType>(true);
1515
}
@@ -18,7 +18,7 @@ public void Setup()
1818
[Test]
1919
public void CanCreateSimpleForeignKey()
2020
{
21-
using (var db = ConnectionString.OpenDbConnection())
21+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
2222
{
2323
db.CreateTable<TypeWithSimpleForeignKey>(true);
2424
}
@@ -27,7 +27,7 @@ public void CanCreateSimpleForeignKey()
2727
[Test]
2828
public void CanCreateForeignWithOnDeleteCascade()
2929
{
30-
using (var db = ConnectionString.OpenDbConnection())
30+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
3131
{
3232
db.CreateTable<TypeWithOnDeleteCascade>(true);
3333
}
@@ -36,7 +36,7 @@ public void CanCreateForeignWithOnDeleteCascade()
3636
[Test]
3737
public void CascadesOnDelete()
3838
{
39-
using (var db = ConnectionString.OpenDbConnection())
39+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
4040
{
4141
db.CreateTable<TypeWithOnDeleteCascade>(true);
4242

@@ -56,7 +56,7 @@ public void CascadesOnDelete()
5656
[Test]
5757
public void CanCreateForeignWithOnDeleteCascadeAndOnUpdateCascade()
5858
{
59-
using (var db = ConnectionString.OpenDbConnection())
59+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
6060
{
6161
db.CreateTable<TypeWithOnDeleteAndUpdateCascade>(true);
6262
}
@@ -65,7 +65,7 @@ public void CanCreateForeignWithOnDeleteCascadeAndOnUpdateCascade()
6565
[Test]
6666
public void CanCreateForeignWithOnDeleteNoAction()
6767
{
68-
using (var db = ConnectionString.OpenDbConnection())
68+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
6969
{
7070
db.CreateTable<TypeWithOnDeleteNoAction>(true);
7171
}
@@ -74,7 +74,7 @@ public void CanCreateForeignWithOnDeleteNoAction()
7474
[Test]
7575
public void CanCreateForeignWithOnDeleteRestrict()
7676
{
77-
using (var db = ConnectionString.OpenDbConnection())
77+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
7878
{
7979
db.CreateTable<TypeWithOnDeleteRestrict>(true);
8080
}
@@ -84,7 +84,7 @@ public void CanCreateForeignWithOnDeleteRestrict()
8484
[Test]
8585
public void CanCreateForeignWithOnDeleteSetDefault()
8686
{
87-
using (var db = ConnectionString.OpenDbConnection())
87+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
8888
{
8989
db.CreateTable<TypeWithOnDeleteSetDefault>(true);
9090
}
@@ -93,7 +93,7 @@ public void CanCreateForeignWithOnDeleteSetDefault()
9393
[Test]
9494
public void CanCreateForeignWithOnDeleteSetNull()
9595
{
96-
using (var db = ConnectionString.OpenDbConnection())
96+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
9797
{
9898
db.CreateTable<TypeWithOnDeleteSetNull>(true);
9999
}
@@ -102,7 +102,7 @@ public void CanCreateForeignWithOnDeleteSetNull()
102102
[TestFixtureTearDown]
103103
public void TearDwon()
104104
{
105-
using (var db = ConnectionString.OpenDbConnection())
105+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
106106
{
107107
db.DropTable<TypeWithOnDeleteAndUpdateCascade>();
108108
db.DropTable<TypeWithOnDeleteSetNull>();

‎tests/ServiceStack.OrmLite.FirebirdTests/LocalizationTests.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ public class Point
4242
[Test]
4343
public void Can_query_using_float_in_alernate_culuture()
4444
{
45-
var dbFactory = new OrmLiteConnectionFactory(
46-
GetFileConnectionString(),
47-
FirebirdOrmLiteDialectProvider.Instance);
48-
49-
using (var db = dbFactory.Open())
45+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
5046
{
5147
db.CreateTable<Point>(true);
5248

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteBasicPersistenceProviderTest.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void SetUp()
1919
[Test]
2020
public void Can_GetById_from_basic_persistence_provider()
2121
{
22-
using (var db = ConnectionString.OpenDbConnection())
22+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
2323
{
2424
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
2525

@@ -38,7 +38,7 @@ public void Can_GetById_from_basic_persistence_provider()
3838
[Test]
3939
public void Can_GetByIds_from_basic_persistence_provider()
4040
{
41-
using (var db = ConnectionString.OpenDbConnection())
41+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
4242
{
4343
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
4444

@@ -61,7 +61,7 @@ public void Can_GetByIds_from_basic_persistence_provider()
6161
[Test]
6262
public void Can_Store_from_basic_persistence_provider()
6363
{
64-
using (var db = ConnectionString.OpenDbConnection())
64+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
6565
{
6666
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
6767

@@ -84,7 +84,7 @@ public void Can_Store_from_basic_persistence_provider()
8484
[Test]
8585
public void Can_Delete_from_basic_persistence_provider()
8686
{
87-
using (var db = ConnectionString.OpenDbConnection())
87+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
8888
{
8989
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
9090

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteComplexTypesTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class OrmLiteComplexTypesTests
1414
[Test]
1515
public void Can_insert_into_ModelWithComplexTypes_table()
1616
{
17-
using (var db = ConnectionString.OpenDbConnection())
17+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
1818
{
1919
db.CreateTable<ModelWithComplexTypes>(true);
2020

@@ -28,7 +28,7 @@ public void Can_insert_into_ModelWithComplexTypes_table()
2828
[Test]
2929
public void Can_insert_and_select_from_ModelWithComplexTypes_table()
3030
{
31-
using (var db = ConnectionString.OpenDbConnection())
31+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
3232
{
3333
db.CreateTable<ModelWithComplexTypes>(true);
3434

@@ -47,7 +47,7 @@ public void Can_insert_and_select_from_ModelWithComplexTypes_table()
4747
[Test]
4848
public void Can_insert_and_select_from_OrderLineData()
4949
{
50-
using (var db = ConnectionString.OpenDbConnection())
50+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
5151
{
5252
db.CreateTable<SampleOrderLine>(true);
5353

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteConnectionTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void Can_create_connection_to_blank_database()
2121
[Test]
2222
public void Can_create_connection()
2323
{
24-
using (var db = ConnectionString.OpenDbConnection())
24+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
2525
{
2626
}
2727
}
@@ -56,11 +56,11 @@ public void Can_create_table_with_ReadOnly_connection()
5656
[Test]
5757
public void Can_open_two_ReadOnlyConnections_to_same_database()
5858
{
59-
var db = "User=SYSDBA;Password=masterkey;Database=ormlite-tests.fdb;DataSource=localhost;Dialect=3;charset=ISO8859_1;".OpenDbConnection();
59+
var db = ConnectionString.OpenReadOnlyDbConnection();
6060
db.CreateTable<ModelWithIdAndName>(true);
6161
db.Insert(new ModelWithIdAndName(1));
6262

63-
var dbReadOnly = "User=SYSDBA;Password=masterkey;Database=ormlite-tests.fdb;DataSource=localhost;Dialect=3;charset=ISO8859_1;".OpenDbConnection();
63+
var dbReadOnly = ConnectionString.OpenReadOnlyDbConnection();
6464
dbReadOnly.Insert(new ModelWithIdAndName(2));
6565
var rows = dbReadOnly.Select<ModelWithIdAndName>();
6666
Assert.That(rows, Has.Count.EqualTo(2));

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteCreateTableTests.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class OrmLiteCreateTableTests
1212
[Test]
1313
public void Does_table_Exists()
1414
{
15-
using (var db = ConnectionString.OpenDbConnection())
15+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
1616
{
1717
db.DropTable<ModelWithIdOnly>();
1818

@@ -31,7 +31,7 @@ public void Does_table_Exists()
3131
[Test]
3232
public void Can_create_ModelWithIdOnly_table()
3333
{
34-
using (var db = ConnectionString.OpenDbConnection())
34+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
3535
{
3636
db.CreateTable<ModelWithIdOnly>(true);
3737
}
@@ -40,7 +40,7 @@ public void Can_create_ModelWithIdOnly_table()
4040
[Test]
4141
public void Can_create_ModelWithOnlyStringFields_table()
4242
{
43-
using (var db = ConnectionString.OpenDbConnection())
43+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
4444
{
4545
db.CreateTable<ModelWithOnlyStringFields>(true);
4646
}
@@ -49,7 +49,7 @@ public void Can_create_ModelWithOnlyStringFields_table()
4949
[Test]
5050
public void Can_create_ModelWithLongIdAndStringFields_table()
5151
{
52-
using (var db = ConnectionString.OpenDbConnection())
52+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
5353
{
5454
db.CreateTable<ModelWithLongIdAndStringFields>(true);
5555
}
@@ -58,7 +58,7 @@ public void Can_create_ModelWithLongIdAndStringFields_table()
5858
[Test]
5959
public void Can_create_ModelWithFieldsOfDifferentTypes_table()
6060
{
61-
using (var db = ConnectionString.OpenDbConnection())
61+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
6262
{
6363
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
6464
}
@@ -67,7 +67,7 @@ public void Can_create_ModelWithFieldsOfDifferentTypes_table()
6767
[Test]
6868
public void Can_preserve_ModelWithIdOnly_table()
6969
{
70-
using (var db = ConnectionString.OpenDbConnection())
70+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
7171
{
7272
db.CreateTable<ModelWithIdOnly>(true);
7373

@@ -85,7 +85,7 @@ public void Can_preserve_ModelWithIdOnly_table()
8585
[Test]
8686
public void Can_preserve_ModelWithIdAndName_table()
8787
{
88-
using (var db = ConnectionString.OpenDbConnection())
88+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
8989
{
9090
db.CreateTable<ModelWithIdAndName>(true);
9191
db.DeleteAll<ModelWithIdAndName>();
@@ -104,7 +104,7 @@ public void Can_preserve_ModelWithIdAndName_table()
104104
[Test]
105105
public void Can_overwrite_ModelWithIdOnly_table()
106106
{
107-
using (var db = ConnectionString.OpenDbConnection())
107+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
108108
{
109109
db.CreateTable<ModelWithIdOnly>(true);
110110

@@ -122,7 +122,7 @@ public void Can_overwrite_ModelWithIdOnly_table()
122122
[Test]
123123
public void Can_create_multiple_tables()
124124
{
125-
using (var db = ConnectionString.OpenDbConnection())
125+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
126126
{
127127
db.CreateTables(true, typeof(ModelWithIdOnly), typeof(ModelWithIdAndName));
128128

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteCreateTableWithIndexesTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class OrmLiteCreateTableWithIndexesTests
1414
public void Can_create_ModelWithIndexFields_table()
1515
{
1616
OrmLiteConfig.DialectProvider.DefaultStringLength=128;
17-
using (var db = ConnectionString.OpenDbConnection())
17+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
1818
{
1919
db.CreateTable<ModelWithIndexFields>(true);
2020

@@ -29,7 +29,7 @@ public void Can_create_ModelWithIndexFields_table()
2929
public void Can_create_ModelWithCompositeIndexFields_table()
3030
{
3131
OrmLiteConfig.DialectProvider.DefaultStringLength=128;
32-
using (var db = ConnectionString.OpenDbConnection())
32+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
3333
{
3434
db.CreateTable<ModelWithCompositeIndexFields>(true);
3535

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteCreateTableWithNamigStrategyTests.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public void Can_create_TableWithNamigStrategy_table_nameUnderscoreCoumpound()
1616
{
1717
OrmLite.OrmLiteConfig.DialectProvider.NamingStrategy = new UnderscoreSeparatedCompoundNamingStrategy();
1818

19-
using (var db = ConnectionString.OpenDbConnection())
19+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
2020
{
2121
db.CreateTable<ModelWithOnlyStringFields>(true);
2222
}
@@ -33,7 +33,7 @@ public void Can_get_data_from_TableWithNamigStrategy_with_GetById()
3333
ColumnPrefix = "col_",
3434
};
3535

36-
using (var db = ConnectionString.OpenDbConnection())
36+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
3737
{
3838
db.CreateTable<ModelWithOnlyStringFields>(true);
3939
ModelWithOnlyStringFields m = new ModelWithOnlyStringFields() { Id= "999", AlbumId = "112", AlbumName="ElectroShip", Name = "MyNameIsBatman"};
@@ -56,7 +56,7 @@ public void Can_get_data_from_TableWithNamigStrategy_with_query_by_example()
5656
ColumnPrefix = "col_",
5757
};
5858

59-
using (var db = ConnectionString.OpenDbConnection())
59+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
6060
{
6161
db.CreateTable<ModelWithOnlyStringFields>(true);
6262
ModelWithOnlyStringFields m = new ModelWithOnlyStringFields() { Id = "998", AlbumId = "112", AlbumName = "ElectroShip", Name = "QueryByExample" };
@@ -78,7 +78,7 @@ public void Can_get_data_from_TableWithNamigStrategy_AfterChangingNamingStrategy
7878
ColumnPrefix = "col_",
7979
};
8080

81-
using (var db = ConnectionString.OpenDbConnection())
81+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
8282
{
8383
db.CreateTable<ModelWithOnlyStringFields>(true);
8484
ModelWithOnlyStringFields m = new ModelWithOnlyStringFields() { Id = "998", AlbumId = "112", AlbumName = "ElectroShip", Name = "QueryByExample" };
@@ -95,7 +95,7 @@ public void Can_get_data_from_TableWithNamigStrategy_AfterChangingNamingStrategy
9595

9696
OrmLite.OrmLiteConfig.DialectProvider.NamingStrategy= new OrmLiteNamingStrategyBase();
9797

98-
using (var db = ConnectionString.OpenDbConnection())
98+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
9999
{
100100
db.CreateTable<ModelWithOnlyStringFields>(true);
101101
ModelWithOnlyStringFields m = new ModelWithOnlyStringFields() { Id = "998", AlbumId = "112", AlbumName = "ElectroShip", Name = "QueryByExample" };
@@ -116,7 +116,7 @@ public void Can_get_data_from_TableWithNamigStrategy_AfterChangingNamingStrategy
116116
ColumnPrefix = "col_",
117117
};
118118

119-
using (var db = ConnectionString.OpenDbConnection())
119+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
120120
{
121121
db.CreateTable<ModelWithOnlyStringFields>(true);
122122
ModelWithOnlyStringFields m = new ModelWithOnlyStringFields() { Id = "998", AlbumId = "112", AlbumName = "ElectroShip", Name = "QueryByExample" };

‎tests/ServiceStack.OrmLite.FirebirdTests/OrmLiteDeleteTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public void SetUp()
1919
[Test]
2020
public void Can_Delete_from_ModelWithFieldsOfDifferentTypes_table()
2121
{
22-
using (var db = ConnectionString.OpenDbConnection())
22+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
2323
{
2424
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
2525

@@ -41,7 +41,7 @@ public void Can_Delete_from_ModelWithFieldsOfDifferentTypes_table()
4141
[Test]
4242
public void Can_DeleteById_from_ModelWithFieldsOfDifferentTypes_table()
4343
{
44-
using (var db = ConnectionString.OpenDbConnection())
44+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
4545
{
4646
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
4747

@@ -60,7 +60,7 @@ public void Can_DeleteById_from_ModelWithFieldsOfDifferentTypes_table()
6060
[Test]
6161
public void Can_DeleteByIds_from_ModelWithFieldsOfDifferentTypes_table()
6262
{
63-
using (var db = ConnectionString.OpenDbConnection())
63+
using (var db = new OrmLiteConnectionFactory(ConnectionString, FirebirdDialect.Provider).Open())
6464
{
6565
db.CreateTable<ModelWithFieldsOfDifferentTypes>(true);
6666

0 commit comments

Comments
 (0)