Skip to content

Commit e4fd537

Browse files
committed
Update Test
1 parent ee07825 commit e4fd537

File tree

4 files changed

+44
-13
lines changed

4 files changed

+44
-13
lines changed

.gitignore

+11-5
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,15 @@ Lazarus/HproseLnet.pas
1313
*.ico
1414
*.identcache
1515
*.rsj
16-
1716
*.~pas
18-
19-
Test/HproseTest.exe
20-
21-
Test/dunit.ini
17+
*.~dpr
18+
*.cfg
19+
*.exe
20+
*.deployproj
21+
*.dof
22+
*.stat
23+
dunit.ini
24+
__recovery
25+
Debug
26+
Release
27+
*.xml

Test/ArrayListTestCases.pas Test/ArrayListTestCase.pas

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
unit ArrayListTestCases;
1+
unit ArrayListTestCase;
22

33
interface
44

Test/HproseTest.dpr

+32-7
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ program HproseTest;
44
Delphi DUnit Test Project
55
-------------------------
66
This project contains the DUnit test framework and the GUI/Console test runners.
7-
Add "CONSOLE_TESTRUNNER" to the conditional defines entry in the project options
8-
to use the console test runner. Otherwise the GUI test runner will be used by
7+
Add "CONSOLE_TESTRUNNER" to the conditional defines entry in the project options
8+
to use the console test runner. Otherwise the GUI test runner will be used by
99
default.
1010
1111
}
@@ -15,11 +15,19 @@ program HproseTest;
1515
{$ENDIF}
1616

1717
uses
18+
SysUtils,
19+
TextTestRunner,
20+
{$IFDEF FASTMM}
21+
FastMM4,
22+
{$ENDIF}
23+
{$IFDEF MSWINDOWS}
24+
{$IFNDEF NEXTGEN}
1825
Forms,
26+
GuiTestRunner,
27+
{$ENDIF NEXTGEN}
28+
{$ENDIF}
1929
TestFramework,
20-
GUITestRunner,
21-
TextTestRunner,
22-
ArrayListTestCases in 'ArrayListTestCases.pas',
30+
ArrayListTestCase in 'ArrayListTestCase.pas',
2331
HproseClient in '..\Source\HproseClient.pas',
2432
HproseCommon in '..\Source\HproseCommon.pas',
2533
HproseIO in '..\Source\HproseIO.pas',
@@ -28,10 +36,27 @@ uses
2836
{$R *.RES}
2937

3038
begin
39+
{$IFDEF MSWINDOWS}
40+
{$IFNDEF NEXTGEN}
3141
Application.Initialize;
42+
{$ENDIF NEXTGEN}
43+
{$ENDIF}
3244
if IsConsole then
33-
TextTestRunner.RunRegisteredTests
45+
begin
46+
{$IFNDEF NEXTGEN}
47+
with TextTestRunner.RunRegisteredTests do
48+
Free;
49+
{$ELSE NEXTGEN}
50+
TextTestRunner.RunRegisteredTests
51+
{$ENDIF NEXTGEN}
52+
end
3453
else
35-
GUITestRunner.RunRegisteredTests;
54+
begin
55+
{$IFDEF MSWINDOWS}
56+
{$IFNDEF NEXTGEN}
57+
GuiTestRunner.RunRegisteredTests;
58+
{$ENDIF NEXTGEN}
59+
{$ENDIF}
60+
end;
3661
end.
3762

Test/HproseTest.res

50.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)