Skip to content

Commit 8c4611e

Browse files
Refactor names
1 parent e7a2c03 commit 8c4611e

7 files changed

Lines changed: 51 additions & 44 deletions

File tree

SQLiteAbstractCrud.sln

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,14 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteAbstractCrud.Tests",
99
EndProject
1010
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sample", "samples\AbstractCrud\Sample.csproj", "{D12D818D-F419-4B69-9EDD-EFBE51282761}"
1111
EndProject
12-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SQLiteAbstractCrud.Proxy", "src\SQLiteAbstractCrud.Proxy\SQLiteAbstractCrud.Proxy.csproj", "{7CD84ECD-82CC-4E48-8B41-0DBB77923393}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SQLiteAbstractCrud.Proxy", "src\SQLiteAbstractCrud.Proxy\SQLiteAbstractCrud.Proxy.csproj", "{7CD84ECD-82CC-4E48-8B41-0DBB77923393}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Util", "src\Util\Util.csproj", "{0524CDD3-2878-407E-AA53-CE9AE121A80A}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Util", "src\Util\Util.csproj", "{0524CDD3-2878-407E-AA53-CE9AE121A80A}"
15+
EndProject
16+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{41AC606A-E352-4597-BD28-B72FE353C639}"
17+
ProjectSection(SolutionItems) = preProject
18+
README.md = README.md
19+
EndProjectSection
1520
EndProject
1621
Global
1722
GlobalSection(SolutionConfigurationPlatforms) = preSolution

tests/SQLiteAbstractCrud.Tests/CompositePrimaryKey/NumFields03/StrPk_StrPk_Str_RepositoryTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@ public void MustGet()
3131
sut.Insert(new StrPk_StrPk_Str(abcValue, cdeValue, barValue));
3232

3333
// act
34-
var result = sut.Get(abcValue);
34+
var actual = sut.Get(abcValue);
3535

3636
// assert
37-
Assert.NotNull(result);
38-
Assert.AreEqual(abcValue, result.Abc);
39-
Assert.AreEqual(barValue, result.Bar);
40-
Assert.AreEqual(cdeValue, result.Cde);
37+
Assert.NotNull(actual);
38+
Assert.AreEqual(abcValue, actual.Abc);
39+
Assert.AreEqual(barValue, actual.Bar);
40+
Assert.AreEqual(cdeValue, actual.Cde);
4141
}
4242

4343
[Test]

tests/SQLiteAbstractCrud.Tests/SimplePrimaryKey/NumFields02/IntPkAi_Int_RepositoryTests.cs

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,17 @@ public void TearDown()
2626
public void MustGet()
2727
{
2828
// arrange
29-
const int valueMyProperty = 123;
29+
int id = 1;
30+
int intField = 123;
3031
var sut = new IntPkAi_Int_Repository(_pathFileDb);
31-
sut.Insert(new IntPkAi_Int(1, valueMyProperty));
32+
sut.Insert(new IntPkAi_Int(id, intField));
3233

3334
// act
34-
var result = sut.GetAll().First();
35+
var actual = sut.GetAll().First();
3536

3637
// assert
37-
Assert.NotNull(result);
38-
Assert.AreEqual(valueMyProperty, result.MyProperty);
38+
Assert.NotNull(actual);
39+
Assert.AreEqual(intField, actual.IntField);
3940
}
4041

4142
[Test]
@@ -52,7 +53,7 @@ public void MustInsert()
5253
// assert
5354
var insertedEntity = sut.GetAll().First();
5455
Assert.NotNull(insertedEntity);
55-
Assert.AreEqual(valueMyProperty, insertedEntity.MyProperty);
56+
Assert.AreEqual(valueMyProperty, insertedEntity.IntField);
5657
}
5758

5859
[Test]
@@ -67,12 +68,12 @@ public void MustUpdate()
6768

6869
// act
6970
var insertedEntity = sut.GetAll().First();
70-
insertedEntity.MyProperty = newValueMyProperty;
71-
_ = sut.Update(insertedEntity, nameof(insertedEntity.MyProperty), newValueMyProperty);
71+
insertedEntity.IntField = newValueMyProperty;
72+
_ = sut.Update(insertedEntity, nameof(insertedEntity.IntField), newValueMyProperty);
7273

7374
// assert
7475
Assert.NotNull(insertedEntity);
75-
Assert.AreEqual(newValueMyProperty, insertedEntity.MyProperty);
76+
Assert.AreEqual(newValueMyProperty, insertedEntity.IntField);
7677
}
7778

7879
[Test]
@@ -92,15 +93,15 @@ public void MustInsertBatch()
9293
sut.InsertBatch(new List<IntPkAi_Int> { entity1, entity2, entity3 });
9394

9495
// assert
95-
var insertedEntity1 = sut.GetAll().Where(x => x.MyProperty == valueMyProperty1);
96-
var insertedEntity2 = sut.GetAll().Where(x => x.MyProperty == valueMyProperty2);
97-
var insertedEntity3 = sut.GetAll().Where(x => x.MyProperty == valueMyProperty3);
96+
var insertedEntity1 = sut.GetAll().Where(x => x.IntField == valueMyProperty1);
97+
var insertedEntity2 = sut.GetAll().Where(x => x.IntField == valueMyProperty2);
98+
var insertedEntity3 = sut.GetAll().Where(x => x.IntField == valueMyProperty3);
9899
Assert.NotNull(insertedEntity1);
99100
Assert.NotNull(insertedEntity2);
100101
Assert.NotNull(insertedEntity3);
101-
Assert.AreEqual(valueMyProperty1, entity1.MyProperty);
102-
Assert.AreEqual(valueMyProperty2, entity2.MyProperty);
103-
Assert.AreEqual(valueMyProperty3, entity3.MyProperty);
102+
Assert.AreEqual(valueMyProperty1, entity1.IntField);
103+
Assert.AreEqual(valueMyProperty2, entity2.IntField);
104+
Assert.AreEqual(valueMyProperty3, entity3.IntField);
104105
}
105106
}
106107

@@ -116,12 +117,13 @@ public class IntPkAi_Int
116117
[PrimaryKey]
117118
[AutoIncrement]
118119
public int Id { get; }
119-
public int MyProperty { get; set; }
120120

121-
public IntPkAi_Int(int id, int myProperty)
121+
public int IntField { get; set; }
122+
123+
public IntPkAi_Int(int id, int intField)
122124
{
123125
Id = id;
124-
MyProperty = myProperty;
126+
IntField = intField;
125127
}
126128
}
127129
}

tests/SQLiteAbstractCrud.Tests/SimplePrimaryKey/NumFields02/StrPk_Int_RepositoryTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ public void MustGet()
3131
sut.Insert(new StrPk_Int(stringValue, intValue));
3232

3333
// act
34-
var result = sut.Get(stringValue);
34+
var actual = sut.Get(stringValue);
3535

3636
// assert
37-
Assert.NotNull(result);
38-
Assert.AreEqual(stringValue, result.StringField);
39-
Assert.AreEqual(intValue, result.IntField);
37+
Assert.NotNull(actual);
38+
Assert.AreEqual(stringValue, actual.StringField);
39+
Assert.AreEqual(intValue, actual.IntField);
4040
}
4141

4242
[Test]

tests/SQLiteAbstractCrud.Tests/SimplePrimaryKey/NumFields03/StrPk_Int_Datetime_RepositoryTests.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,11 @@ public void MustGetByRange()
6363
sut.Insert(new StrPk_Int_Datetime(stringValue3, dateTimeValue3, intValue3));
6464

6565
// act
66-
var result = sut.GetByDateRange("cDateTimeField", new DateTime(2020, 3, 30), new DateTime(2021, 1, 1));
66+
var actual = sut.GetByDateRange("cDateTimeField", new DateTime(2020, 3, 30), new DateTime(2021, 1, 1));
6767

6868
// assert
69-
Assert.NotNull(result);
70-
Assert.AreEqual(2, result.Count);
69+
Assert.NotNull(actual);
70+
Assert.AreEqual(2, actual.Count);
7171
}
7272

7373
[Test]

tests/SQLiteAbstractCrud.Tests/SimplePrimaryKey/NumFields03/StrPk_Int_Str_RepositoryTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ public void MustGet()
3333
sut.Insert(new StrPk_Int_Str(fooValue, barValue, asdfgValue));
3434

3535
// act
36-
var result = sut.Get(fooValue);
36+
var actual = sut.Get(fooValue);
3737

3838
// assert
39-
Assert.NotNull(result);
40-
Assert.AreEqual(fooValue, result.Abc);
41-
Assert.AreEqual(barValue, result.Bar);
42-
Assert.AreEqual(asdfgValue, result.Cde);
39+
Assert.NotNull(actual);
40+
Assert.AreEqual(fooValue, actual.Abc);
41+
Assert.AreEqual(barValue, actual.Bar);
42+
Assert.AreEqual(asdfgValue, actual.Cde);
4343
}
4444

4545
[Test]

tests/SQLiteAbstractCrud.Tests/SimplePrimaryKey/NumFields05/StrPk_Str_Str_Bool_Bool_RepositoryTests.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ public void MustGet()
3333
sut.Insert(new StrPk_Str_Str_Bool_Bool(value1, value2, value3, value4, value5));
3434

3535
// act
36-
var result = sut.Get(value1);
36+
var actual = sut.Get(value1);
3737

3838
// assert
39-
Assert.NotNull(result);
40-
Assert.AreEqual(value1, result.Field1);
41-
Assert.AreEqual(value2, result.Field2);
42-
Assert.AreEqual(value3, result.Field3);
43-
Assert.AreEqual(value4, result.Field4);
44-
Assert.AreEqual(value5, result.Field5);
39+
Assert.NotNull(actual);
40+
Assert.AreEqual(value1, actual.Field1);
41+
Assert.AreEqual(value2, actual.Field2);
42+
Assert.AreEqual(value3, actual.Field3);
43+
Assert.AreEqual(value4, actual.Field4);
44+
Assert.AreEqual(value5, actual.Field5);
4545
}
4646

4747
[Test]

0 commit comments

Comments
 (0)