Skip to content

Commit 12dabf8

Browse files
Xor-elXor-el
committed
some tests refactorings
1 parent 1b79457 commit 12dabf8

File tree

13 files changed

+176
-89
lines changed

13 files changed

+176
-89
lines changed

‎SimpleBaseLib.Tests/Delphi.Tests/SimpleBaseLib.Tests.dpr‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ uses
5050
Base58AlphabetTests in '..\src\Base58\Base58AlphabetTests.pas',
5151
Base64Tests in '..\src\Base64\Base64Tests.pas',
5252
BaseZ85Tests in '..\src\Base85\BaseZ85Tests.pas',
53-
Ascii85Tests in '..\src\Base85\Ascii85Tests.pas';
53+
Ascii85Tests in '..\src\Base85\Ascii85Tests.pas',
54+
SimpleBaseLibTestBase in '..\src\SimpleBaseLibTestBase.pas';
5455

5556
begin
5657
Application.Initialize;

‎SimpleBaseLib.Tests/FreePascal.Tests/SimpleBaseLib.Tests.lpi‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<PathDelim Value="\"/>
2222
<SearchPaths>
2323
<IncludeFiles Value="$(ProjOutDir)"/>
24-
<OtherUnitFiles Value="..\src\Base16;..\src\Base32;..\src\Base58;..\src\Base64;..\src\Base85"/>
24+
<OtherUnitFiles Value="..\src\Base16;..\src\Base32;..\src\Base58;..\src\Base64;..\src\Base85;..\src"/>
2525
</SearchPaths>
2626
<Parsing>
2727
<SyntaxOptions>
@@ -69,7 +69,7 @@
6969
<PackageName Value="FCL"/>
7070
</Item4>
7171
</RequiredPackages>
72-
<Units Count="10">
72+
<Units Count="11">
7373
<Unit0>
7474
<Filename Value="SimpleBaseLib.lpr"/>
7575
<IsPartOfProject Value="True"/>
@@ -111,6 +111,10 @@
111111
<Filename Value="..\src\Base85\BaseZ85Tests.pas"/>
112112
<IsPartOfProject Value="True"/>
113113
</Unit9>
114+
<Unit10>
115+
<Filename Value="..\src\SimpleBaseLibTestBase.pas"/>
116+
<IsPartOfProject Value="True"/>
117+
</Unit10>
114118
</Units>
115119
</ProjectOptions>
116120
<CompilerOptions>
@@ -121,7 +125,7 @@
121125
</Target>
122126
<SearchPaths>
123127
<IncludeFiles Value="$(ProjOutDir)"/>
124-
<OtherUnitFiles Value="..\src\Base16;..\src\Base32;..\src\Base58;..\src\Base64;..\src\Base85"/>
128+
<OtherUnitFiles Value="..\src\Base16;..\src\Base32;..\src\Base58;..\src\Base64;..\src\Base85;..\src"/>
125129
</SearchPaths>
126130
<Linking>
127131
<Debugging>

‎SimpleBaseLib.Tests/FreePascal.Tests/SimpleBaseLibConsole.lpi‎

Lines changed: 105 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<CONFIG>
3+
<ProjectOptions>
4+
<Version Value="12"/>
5+
<PathDelim Value="\"/>
6+
<General>
7+
<Flags>
8+
<MainUnitHasCreateFormStatements Value="False"/>
9+
<MainUnitHasTitleStatement Value="False"/>
10+
<MainUnitHasScaledStatement Value="False"/>
11+
<UseDefaultCompilerOptions Value="True"/>
12+
</Flags>
13+
<SessionStorage Value="InProjectDir"/>
14+
<Title Value="SimpleBaseLibConsole"/>
15+
<UseAppBundle Value="False"/>
16+
<ResourceType Value="res"/>
17+
</General>
18+
<BuildModes>
19+
<Item Name="Default" Default="True"/>
20+
</BuildModes>
21+
<PublishOptions>
22+
<Version Value="2"/>
23+
<UseFileFilters Value="True"/>
24+
</PublishOptions>
25+
<RunParams>
26+
<FormatVersion Value="2"/>
27+
</RunParams>
28+
<RequiredPackages>
29+
<Item>
30+
<PackageName Value="SimpleBaseLib4PascalPackage"/>
31+
</Item>
32+
</RequiredPackages>
33+
<Units>
34+
<Unit>
35+
<Filename Value="SimpleBaseLibConsole.lpr"/>
36+
<IsPartOfProject Value="True"/>
37+
<UnitName Value="SimpleBaseLib.Tests"/>
38+
</Unit>
39+
<Unit>
40+
<Filename Value="..\src\Base58\Base58AlphabetTests.pas"/>
41+
<IsPartOfProject Value="True"/>
42+
</Unit>
43+
<Unit>
44+
<Filename Value="..\src\Base58\Base58Tests.pas"/>
45+
<IsPartOfProject Value="True"/>
46+
</Unit>
47+
<Unit>
48+
<Filename Value="..\src\Base32\Rfc4648Tests.pas"/>
49+
<IsPartOfProject Value="True"/>
50+
</Unit>
51+
<Unit>
52+
<Filename Value="..\src\Base32\ExtendedHexTests.pas"/>
53+
<IsPartOfProject Value="True"/>
54+
</Unit>
55+
<Unit>
56+
<Filename Value="..\src\Base32\CrockfordTests.pas"/>
57+
<IsPartOfProject Value="True"/>
58+
</Unit>
59+
<Unit>
60+
<Filename Value="..\src\Base16\Base16Tests.pas"/>
61+
<IsPartOfProject Value="True"/>
62+
</Unit>
63+
<Unit>
64+
<Filename Value="..\src\Base85\BaseZ85Tests.pas"/>
65+
<IsPartOfProject Value="True"/>
66+
</Unit>
67+
<Unit>
68+
<Filename Value="..\src\Base85\Ascii85Tests.pas"/>
69+
<IsPartOfProject Value="True"/>
70+
</Unit>
71+
<Unit>
72+
<Filename Value="..\src\Base64\Base64Tests.pas"/>
73+
<IsPartOfProject Value="True"/>
74+
</Unit>
75+
<Unit>
76+
<Filename Value="..\src\SimpleBaseLibTestBase.pas"/>
77+
<IsPartOfProject Value="True"/>
78+
</Unit>
79+
</Units>
80+
</ProjectOptions>
81+
<CompilerOptions>
82+
<Version Value="11"/>
83+
<PathDelim Value="\"/>
84+
<Target>
85+
<Filename Value="SimpleBaseLibConsole"/>
86+
</Target>
87+
<SearchPaths>
88+
<OtherUnitFiles Value="..\src\Base58;..\src\Base32;..\src\Base16;..\src\Base85;..\src\Base64;..\src"/>
89+
<UnitOutputDirectory Value="lib\$(TargetCPU)-$(TargetOS)"/>
90+
</SearchPaths>
91+
</CompilerOptions>
92+
<Debugging>
93+
<Exceptions>
94+
<Item>
95+
<Name Value="EAbort"/>
96+
</Item>
97+
<Item>
98+
<Name Value="ECodetoolError"/>
99+
</Item>
100+
<Item>
101+
<Name Value="EFOpenError"/>
102+
</Item>
103+
</Exceptions>
104+
</Debugging>
105+
</CONFIG>

‎SimpleBaseLib.Tests/src/Base16/Base16Tests.pas‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,15 @@ interface
1818
SbpUtilities,
1919
SbpSimpleBaseLibTypes,
2020
SbpBase16,
21-
SbpBase58;
21+
SimpleBaseLibTestBase;
2222

2323
type
2424

25-
TCryptoLibTestCase = class abstract(TTestCase)
26-
27-
end;
28-
29-
type
30-
31-
TTestBase16 = class(TCryptoLibTestCase)
25+
TTestBase16 = class(TSimpleBaseLibTestCase)
3226
private
3327
var
34-
FtestDataBytes: TSimpleBaseLibMatrixByteArray;
35-
FtestDataString: TSimpleBaseLibStringArray;
28+
FTestDataBytes: TSimpleBaseLibMatrixByteArray;
29+
FTestDataString: TSimpleBaseLibStringArray;
3630
protected
3731
procedure SetUp; override;
3832
procedure TearDown; override;
@@ -50,14 +44,14 @@ implementation
5044
procedure TTestBase16.SetUp;
5145
begin
5246
inherited;
53-
FtestDataBytes := TSimpleBaseLibMatrixByteArray.Create(Nil,
47+
FTestDataBytes := TSimpleBaseLibMatrixByteArray.Create(Nil,
5448
TSimpleBaseLibByteArray.Create($AB), TSimpleBaseLibByteArray.Create($00,
5549
$01, $02, $03), TSimpleBaseLibByteArray.Create($10, $11, $12, $13),
5650
TSimpleBaseLibByteArray.Create($AB, $CD, $EF, $BA)
5751

5852
);
5953

60-
FtestDataString := TSimpleBaseLibStringArray.Create('', 'AB', '00010203',
54+
FTestDataString := TSimpleBaseLibStringArray.Create('', 'AB', '00010203',
6155
'10111213', 'ABCDEFBA'
6256

6357
);
@@ -158,10 +152,10 @@ procedure TTestBase16.Test_Decode_LowerCase;
158152
Idx: Int32;
159153
result: TSimpleBaseLibByteArray;
160154
begin
161-
for Idx := System.Low(FtestDataBytes) to System.High(FtestDataBytes) do
155+
for Idx := System.Low(FTestDataBytes) to System.High(FTestDataBytes) do
162156
begin
163-
result := TBase16.Decode(FtestDataString[Idx]);
164-
CheckTrue(TUtilities.AreArraysEqual(FtestDataBytes[Idx], result),
157+
result := TBase16.Decode(FTestDataString[Idx]);
158+
CheckTrue(TUtilities.AreArraysEqual(FTestDataBytes[Idx], result),
165159
Format('Decode_LowerCase Failed at Index %d', [Idx]));
166160
end;
167161
end;
@@ -171,10 +165,10 @@ procedure TTestBase16.Test_Encode_Lower;
171165
Idx: Int32;
172166
result: String;
173167
begin
174-
for Idx := System.Low(FtestDataBytes) to System.High(FtestDataBytes) do
168+
for Idx := System.Low(FTestDataBytes) to System.High(FTestDataBytes) do
175169
begin
176-
result := TBase16.EncodeLower(FtestDataBytes[Idx]);
177-
CheckEquals(LowerCase(FtestDataString[Idx]), result,
170+
result := TBase16.EncodeLower(FTestDataBytes[Idx]);
171+
CheckEquals(LowerCase(FTestDataString[Idx]), result,
178172
Format('EncodeLower Failed at Index %d', [Idx]));
179173
end;
180174
end;
@@ -184,10 +178,10 @@ procedure TTestBase16.Test_Encode_Upper;
184178
Idx: Int32;
185179
result: String;
186180
begin
187-
for Idx := System.Low(FtestDataBytes) to System.High(FtestDataBytes) do
181+
for Idx := System.Low(FTestDataBytes) to System.High(FTestDataBytes) do
188182
begin
189-
result := TBase16.EncodeUpper(FtestDataBytes[Idx]);
190-
CheckEquals(FtestDataString[Idx], result,
183+
result := TBase16.EncodeUpper(FTestDataBytes[Idx]);
184+
CheckEquals(FTestDataString[Idx], result,
191185
Format('EncodeUpper Failed at Index %d', [Idx]));
192186
end;
193187
end;

‎SimpleBaseLib.Tests/src/Base32/CrockfordTests.pas‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ interface
1212
{$ENDIF FPC}
1313
SbpUtilities,
1414
SbpSimpleBaseLibTypes,
15-
SbpBase32;
15+
SbpBase32,
16+
SimpleBaseLibTestBase;
1617

1718
type
1819

19-
TCryptoLibTestCase = class abstract(TTestCase)
20-
21-
end;
22-
23-
type
24-
25-
TTestCrockford = class(TCryptoLibTestCase)
20+
TTestCrockford = class(TSimpleBaseLibTestCase)
2621
private
2722
var
2823
FRawData, FEncodedData, FSpecialRaw, FSpecialEncoded

‎SimpleBaseLib.Tests/src/Base32/ExtendedHexTests.pas‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,12 @@ interface
1111
TestFramework,
1212
{$ENDIF FPC}
1313
SbpSimpleBaseLibTypes,
14-
SbpBase32;
14+
SbpBase32,
15+
SimpleBaseLibTestBase;
1516

1617
type
1718

18-
TCryptoLibTestCase = class abstract(TTestCase)
19-
20-
end;
21-
22-
type
23-
24-
TTestExtendedHex = class(TCryptoLibTestCase)
19+
TTestExtendedHex = class(TSimpleBaseLibTestCase)
2520
private
2621
var
2722
FRawData, FEncodedData: TSimpleBaseLibStringArray;

‎SimpleBaseLib.Tests/src/Base32/Rfc4648Tests.pas‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,12 @@ interface
1111
TestFramework,
1212
{$ENDIF FPC}
1313
SbpSimpleBaseLibTypes,
14-
SbpBase32;
14+
SbpBase32,
15+
SimpleBaseLibTestBase;
1516

1617
type
1718

18-
TCryptoLibTestCase = class abstract(TTestCase)
19-
20-
end;
21-
22-
type
23-
24-
TTestRfc4648 = class(TCryptoLibTestCase)
19+
TTestRfc4648 = class(TSimpleBaseLibTestCase)
2520
private
2621
var
2722
FRawData, FEncodedData: TSimpleBaseLibStringArray;

‎SimpleBaseLib.Tests/src/Base58/Base58AlphabetTests.pas‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,12 @@ interface
1111
TestFramework,
1212
{$ENDIF FPC}
1313
SbpSimpleBaseLibTypes,
14-
SbpBase58Alphabet;
14+
SbpBase58Alphabet,
15+
SimpleBaseLibTestBase;
1516

1617
type
1718

18-
TCryptoLibTestCase = class abstract(TTestCase)
19-
20-
end;
21-
22-
type
23-
24-
TTestBase58Alphabet = class(TCryptoLibTestCase)
19+
TTestBase58Alphabet = class(TSimpleBaseLibTestCase)
2520

2621
protected
2722
procedure SetUp; override;

‎SimpleBaseLib.Tests/src/Base58/Base58Tests.pas‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ interface
1212
{$ENDIF FPC}
1313
SbpSimpleBaseLibTypes,
1414
SbpBase16,
15-
SbpBase58;
15+
SbpBase58,
16+
SimpleBaseLibTestBase;
1617

1718
type
1819

19-
TCryptoLibTestCase = class abstract(TTestCase)
20-
21-
end;
22-
23-
type
24-
25-
TTestBase58 = class(TCryptoLibTestCase)
20+
TTestBase58 = class(TSimpleBaseLibTestCase)
2621
private
2722
var
2823
FRawDataInHex, FBase58EncodedData: TSimpleBaseLibStringArray;

‎SimpleBaseLib.Tests/src/Base64/Base64Tests.pas‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,12 @@ interface
1212
{$ENDIF FPC}
1313
SbpSimpleBaseLibTypes,
1414
SbpUtilities,
15-
SbpBase64;
15+
SbpBase64,
16+
SimpleBaseLibTestBase;
1617

1718
type
1819

19-
TCryptoLibTestCase = class abstract(TTestCase)
20-
21-
end;
22-
23-
type
24-
25-
TTestBase64 = class(TCryptoLibTestCase)
20+
TTestBase64 = class(TSimpleBaseLibTestCase)
2621
private
2722
var
2823
FRawData, FEncodedDataBase64Default: TSimpleBaseLibStringArray;

0 commit comments

Comments
 (0)