Skip to content

Commit

Permalink
Merge branch 'release/1.0.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelJustin committed Apr 5, 2016
2 parents d6ae5ad + 0f01459 commit 9923e55
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,8 @@ https://github.com/michaelJustin/slf4p

You can find this project at https://github.com/michaelJustin/daraja-framework

### Getting Started PDF

A Getting Started document (PDF) is available at https://darajaframework.com/docs/1.0/DarajaFrameworkGettingStarted.pdf


19 changes: 10 additions & 9 deletions test/unittests/Unittests.lpr
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@

var
Tests: TTestSuite;
ConsoleTests: Boolean;
UseConsoleTestRunner: Boolean;
begin
{$IFDEF LINUX}
GIdIconvUseTransliteration := True;
{$ENDIF}

ConsoleTests := IsConsole;
UseConsoleTestRunner := ParamCount > 0;

{$IFDEF DARAJA_LOGGING}
SimpleLogger.Configure('showDateTime', 'true');
Expand All @@ -79,21 +79,22 @@

Tests := TTestSuite.Create(DWF_SERVER_FULL_NAME);
Tests.AddTest(TTestSuite.Create(TdjPathMapTests));
Tests.AddTest(TTestSuite.Create(TdjWebComponentHolderTests));
Tests.AddTest(TTestSuite.Create(TdjWebComponentHandlerTests));
Tests.AddTest(TTestSuite.Create(TdjWebAppContextTests));
Tests.AddTest(TTestSuite.Create(TdjDefaultWebComponentTests));

if not ConsoleTests then
begin
Tests.AddTest(TTestSuite.Create(TdjWebComponentHolderTests));
Tests.AddTest(TTestSuite.Create(TdjWebComponentHandlerTests));
Tests.AddTest(TTestSuite.Create(TdjWebAppContextTests));
Tests.AddTest(TTestSuite.Create(TdjDefaultWebComponentTests));

if not UseConsoleTestRunner then
begin

Tests.AddTest(TTestSuite.Create(TSessionTests));
Tests.AddTest(TTestSuite.Create(TAPIConfigTests));
end;

RegisterTest('', Tests);

if ConsoleTests then
if UseConsoleTestRunner then
begin
// Launch console Test Runner --------------------------------------------
consoletestrunner.TTestRunner.Create(nil).Run;
Expand Down

0 comments on commit 9923e55

Please sign in to comment.