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

Commit d1e37b0

Browse files
mythzmythz
committed
Update old expression tests to use an explicit and disposed DB connection
1 parent 91e5f6d commit d1e37b0

11 files changed

+721
-585
lines changed

‎src/ServiceStack.OrmLite.VistaDB.Tests/Expressions/PrimaryExpressionsTest.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ public class PrimaryExpressionsTest : ExpressionsTestBase
88
private static class TestClass
99
{
1010
public static int StaticProperty { get { return 12; } }
11-
public static int _staticField = 12;
11+
public static int staticField = 12;
1212
}
1313

1414
private class TestClass<T>
@@ -20,34 +20,34 @@ public static T StaticMethod(T value)
2020

2121
public T Property { get; set; }
2222

23-
public T _field;
23+
public T field;
2424

2525
public T Mehtod()
2626
{
27-
return _field;
27+
return field;
2828
}
2929

3030
public TestClass(T value)
3131
{
3232
Property = value;
33-
_field = value;
33+
field = value;
3434
}
3535
}
3636

3737
private struct TestStruct<T>
3838
{
39-
public T Property { get { return _field; } }
39+
public T Property { get { return field; } }
4040

41-
public T _field;
41+
public T field;
4242

4343
public T Mehtod()
4444
{
45-
return _field;
45+
return field;
4646
}
4747

4848
public TestStruct(T value)
4949
{
50-
_field = value;
50+
field = value;
5151
}
5252
}
5353

@@ -93,7 +93,7 @@ public void Can_select_int_field_expression()
9393

9494
using (var db = OpenDbConnection())
9595
{
96-
var actual = db.Select<TestType>(q => q.IntColumn == tmp._field);
96+
var actual = db.Select<TestType>(q => q.IntColumn == tmp.field);
9797

9898
Assert.IsNotNull(actual);
9999
Assert.AreEqual(1, actual.Count);
@@ -161,7 +161,7 @@ public void Can_select_static_int_field_expression()
161161

162162
using (var db = OpenDbConnection())
163163
{
164-
var actual = db.Select<TestType>(q => q.IntColumn == TestClass._staticField);
164+
var actual = db.Select<TestType>(q => q.IntColumn == TestClass.staticField);
165165

166166
Assert.IsNotNull(actual);
167167
Assert.AreEqual(1, actual.Count);
@@ -229,7 +229,7 @@ public void Can_select_struct_int_field_expression()
229229

230230
using (var db = OpenDbConnection())
231231
{
232-
var actual = db.Select<TestType>(q => q.IntColumn == tmp._field);
232+
var actual = db.Select<TestType>(q => q.IntColumn == tmp.field);
233233

234234
Assert.IsNotNull(actual);
235235
Assert.AreEqual(1, actual.Count);
@@ -330,7 +330,7 @@ public void Can_select_bool_field_expression()
330330

331331
using (var db = OpenDbConnection())
332332
{
333-
var actual = db.Select<TestType>(q => q.BoolColumn == tmp._field);
333+
var actual = db.Select<TestType>(q => q.BoolColumn == tmp.field);
334334

335335
Assert.IsNotNull(actual);
336336
Assert.Greater(actual.Count, 1);

‎tests/ServiceStack.OrmLite.Tests/Expression/AdditiveExpressionsTest.cs

Lines changed: 51 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class AdditiveExpressionsTest : ExpressionsTestBase
77
[Test]
88
public void Can_select_constant_add_expression()
99
{
10-
var expected = new TestType()
10+
var expected = new TestType
1111
{
1212
IntColumn = 7,
1313
BoolColumn = true,
@@ -16,17 +16,20 @@ public void Can_select_constant_add_expression()
1616

1717
EstablishContext(10, expected);
1818

19-
var actual = OpenDbConnection().Select<TestType>(q => q.IntColumn == 4 + 3);
19+
using (var db = OpenDbConnection())
20+
{
21+
var actual = db.Select<TestType>(q => q.IntColumn == 4 + 3);
2022

21-
Assert.IsNotNull(actual);
22-
Assert.AreEqual(1, actual.Count);
23-
CollectionAssert.Contains(actual, expected);
23+
Assert.IsNotNull(actual);
24+
Assert.AreEqual(1, actual.Count);
25+
CollectionAssert.Contains(actual, expected);
26+
}
2427
}
2528

2629
[Test]
2730
public void Can_select_constant_subtract_expression()
2831
{
29-
var expected = new TestType()
32+
var expected = new TestType
3033
{
3134
IntColumn = 7,
3235
BoolColumn = true,
@@ -35,22 +38,25 @@ public void Can_select_constant_subtract_expression()
3538

3639
EstablishContext(10, expected);
3740

38-
var actual = OpenDbConnection().Select<TestType>(q => q.IntColumn == 10 - 3);
41+
using (var db = OpenDbConnection())
42+
{
43+
var actual = db.Select<TestType>(q => q.IntColumn == 10 - 3);
3944

40-
Assert.IsNotNull(actual);
41-
Assert.AreEqual(1, actual.Count);
42-
CollectionAssert.Contains(actual, expected);
45+
Assert.IsNotNull(actual);
46+
Assert.AreEqual(1, actual.Count);
47+
CollectionAssert.Contains(actual, expected);
48+
}
4349
}
4450

4551
[Test]
4652
public void Can_select_variable_add_expression()
4753
{
48-
// ReSharper disable ConvertToConstant.Local
54+
// ReSharper disable ConvertToConstant.Local
4955
var a = 4;
5056
var b = 3;
51-
// ReSharper restore ConvertToConstant.Local
57+
// ReSharper restore ConvertToConstant.Local
5258

53-
var expected = new TestType()
59+
var expected = new TestType
5460
{
5561
IntColumn = 7,
5662
BoolColumn = true,
@@ -59,11 +65,14 @@ public void Can_select_variable_add_expression()
5965

6066
EstablishContext(10, expected);
6167

62-
var actual = OpenDbConnection().Select<TestType>(q => q.IntColumn == a + b);
68+
using (var db = OpenDbConnection())
69+
{
70+
var actual = db.Select<TestType>(q => q.IntColumn == a + b);
6371

64-
Assert.IsNotNull(actual);
65-
Assert.AreEqual(1, actual.Count);
66-
CollectionAssert.Contains(actual, expected);
72+
Assert.IsNotNull(actual);
73+
Assert.AreEqual(1, actual.Count);
74+
CollectionAssert.Contains(actual, expected);
75+
}
6776
}
6877

6978
[Test]
@@ -74,7 +83,7 @@ public void Can_select_variable_subtract_expression()
7483
var b = 3;
7584
// ReSharper restore ConvertToConstant.Local
7685

77-
var expected = new TestType()
86+
var expected = new TestType
7887
{
7988
IntColumn = 7,
8089
BoolColumn = true,
@@ -83,17 +92,20 @@ public void Can_select_variable_subtract_expression()
8392

8493
EstablishContext(10, expected);
8594

86-
var actual = OpenDbConnection().Select<TestType>(q => q.IntColumn == a - b);
95+
using (var db = OpenDbConnection())
96+
{
97+
var actual = db.Select<TestType>(q => q.IntColumn == a - b);
8798

88-
Assert.IsNotNull(actual);
89-
Assert.AreEqual(1, actual.Count);
90-
CollectionAssert.Contains(actual, expected);
99+
Assert.IsNotNull(actual);
100+
Assert.AreEqual(1, actual.Count);
101+
CollectionAssert.Contains(actual, expected);
102+
}
91103
}
92104

93105
[Test]
94106
public void Can_select_method_add_expression()
95107
{
96-
var expected = new TestType()
108+
var expected = new TestType
97109
{
98110
IntColumn = 7,
99111
BoolColumn = true,
@@ -102,17 +114,20 @@ public void Can_select_method_add_expression()
102114

103115
EstablishContext(10, expected);
104116

105-
var actual = OpenDbConnection().Select<TestType>(q => q.IntColumn == GetValue(4) + GetValue(3));
117+
using (var db = OpenDbConnection())
118+
{
119+
var actual = db.Select<TestType>(q => q.IntColumn == GetValue(4) + GetValue(3));
106120

107-
Assert.IsNotNull(actual);
108-
Assert.AreEqual(1, actual.Count);
109-
CollectionAssert.Contains(actual, expected);
121+
Assert.IsNotNull(actual);
122+
Assert.AreEqual(1, actual.Count);
123+
CollectionAssert.Contains(actual, expected);
124+
}
110125
}
111126

112127
[Test]
113128
public void Can_select_method_subtract_expression()
114129
{
115-
var expected = new TestType()
130+
var expected = new TestType
116131
{
117132
IntColumn = 7,
118133
BoolColumn = true,
@@ -121,11 +136,15 @@ public void Can_select_method_subtract_expression()
121136

122137
EstablishContext(10, expected);
123138

124-
var actual = OpenDbConnection().Select<TestType>(q => q.IntColumn == GetValue(10) - GetValue(3));
139+
using (var db = OpenDbConnection())
140+
{
141+
var actual = db.Select<TestType>(q => q.IntColumn == GetValue(10) - GetValue(3));
142+
143+
Assert.IsNotNull(actual);
144+
Assert.AreEqual(1, actual.Count);
145+
CollectionAssert.Contains(actual, expected);
125146

126-
Assert.IsNotNull(actual);
127-
Assert.AreEqual(1, actual.Count);
128-
CollectionAssert.Contains(actual, expected);
147+
}
129148
}
130149
}
131150
}

0 commit comments

Comments
 (0)