Delphi/delphimvcframework
1
0
Fork 0
mirror of https://github.com/danieleteti/delphimvcframework.git synced 2024-11-15 15:55:54 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed TMVCRESTClient from unittests

Browse Source
This commit is contained in:
João Antônio Duarte 2020-09-04 16:26:16 -03:00
parent 72e3c06952
commit 78263cbdc4
4 changed files with 537 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
unittests/general/RESTClient/MVCFramework.Tests.RESTClient.pas
View File

@ -15,8 +15,7 @@ uses
MVCFramework.Commons,
MVCFramework.Serializer.Defaults,
MVCFramework.Serializer.Commons,
MVCFramework.Tests.AppController,
MVCFramework.RESTClient.Intf;
MVCFramework.Tests.AppController;
type
@ -45,7 +44,7 @@ type
TTestRESTClient = class(TObject)
strict private
FServerListener: IMVCListener;
FRESTClient: IMVCRESTClient;
FRESTClient: TRESTClient;
FRESTAdapter: TRESTAdapter<IAppResource>;
FAppResource: IAppResource;
public
@ -90,7 +89,7 @@ begin
);
FServerListener.Start;
FRESTClient := TMVCRESTClient.New.BaseURL('localhost', 3000);
FRESTClient := TRESTClient.Create('localhost', 3000);
FRESTAdapter := TRESTAdapter<IAppResource>.Create;
FRESTAdapter.Build(FRESTClient);
@ -102,36 +101,40 @@ procedure TTestRESTClient.TearDown;
begin
inherited;
FServerListener.Stop;
FRESTClient := nil;
FRESTClient.Free;
end;
procedure TTestRESTClient.TestCreateAndDestroy;
var
LClient: IMVCRESTClient;
LClient: TRESTClient;
begin
LClient := TMVCRESTClient.New.BaseURL('localhost', 80);
LClient := TRESTClient.Create('', 80, nil);
Assert.IsTrue(LClient <> nil);
FreeAndNil(LClient);
Assert.IsTrue(LClient = nil);
end;
procedure TTestRESTClient.TestGetUser;
var
LUser: TAppUser;
LResp: IMVCRESTResponse;
LResp: IRESTResponse;
begin
FRESTClient.Resource('/user');
FRESTClient.SetBasicAuthorization('dmvc', '123');
FRESTClient.Resource('/user').Params([]);
FRESTClient.Authentication('dmvc', '123');
// String
LResp := FRESTClient.Get;
LResp := FRESTClient.doGET;
Assert.IsTrue(
('{"Cod":1,"Name":"Ezequiel","Pass":"123"}' = LResp.Content) and
(LResp.StatusCode = 200)
('{"Cod":1,"Name":"Ezequiel","Pass":"123"}' = LResp.BodyAsString) and
(LResp.ResponseCode = 200)
);
// Object
// lJObj := TSystemJSON.BodyAsJSONObject(FRESTClient.doGET);
LUser := TAppUser.Create;
LUser := TAppUser.Create; // TSystemJSON.BodyAsJSONObject(FRESTClient.doGET).BodyAsJSONObject.AsObject<TAppUser>();
try
GetDefaultSerializer.DeserializeObject(FRESTClient.Get.Content, LUser);
GetDefaultSerializer.DeserializeObject(FRESTClient.doGET.BodyAsString, LUser);
Assert.IsTrue((LUser <> nil) and (LUser.Cod > 0));
finally
FreeAndNil(LUser);
@ -151,10 +154,10 @@ var
LUsers: TObjectList<TAppUser>;
lBody: string;
begin
FRESTClient.Resource('/users');
FRESTClient.SetBasicAuthorization('dmvc', '123');
FRESTClient.Resource('/users').Params([]);
FRESTClient.Authentication('dmvc', '123');
lBody := FRESTClient.Get.Content;
lBody := FRESTClient.doGET.BodyAsString;
// String
Assert.AreEqual('[{"Cod":0,"Name":"Ezequiel 0","Pass":"0"},{"Cod":1,"Name":"Ezequiel 1","Pass":"1"},' +
'{"Cod":2,"Name":"Ezequiel 2","Pass":"2"},{"Cod":3,"Name":"Ezequiel 3","Pass":"3"},{"Cod":4,"Name":"Ezequiel 4","Pass":"4"},' +
@ -184,12 +187,11 @@ end;
procedure TTestRESTClient.TestHelloWorld;
begin
FRESTClient
.Resource('/hello')
.SetBasicAuthorization('dmvc', '123');
FRESTClient.Resource('/hello').Params([]);
FRESTClient.Authentication('dmvc', '123');
// String
Assert.AreEqual('Hello World called with GET', FRESTClient.Get.Content);
Assert.AreEqual('Hello World called with GET', FRESTClient.doGET.BodyAsString);
// Adapter
Assert.AreEqual('Hello World called with GET', FAppResource.HelloWorld);
@ -197,54 +199,55 @@ end;
procedure TTestRESTClient.TestInformation;
var
LClient: IMVCRESTClient;
LClient: TRESTClient;
begin
LClient := TMVCRESTClient.New;
LClient := TRESTClient.Create('', 80, nil);
LClient
.ReadTimeout(100)
.ConnectTimeout(100)
.SetBasicAuthorization('dmvc', 'dmvc')
.ReadTimeOut(100)
.ConnectionTimeOut(100)
.Authentication('dmvc', 'dmvc', True)
.Accept(TMVCMediaType.APPLICATION_JSON)
.AcceptCharset(TMVCCharset.UTF_8);
// .ContentType(TMVCMediaType.APPLICATION_JSON)
// .ContentCharSet(TMVCCharset.UTF_8)
// .ContentEncoding(TMVCCharset.UTF_8)
.AcceptCharSet(TMVCCharset.UTF_8)
.ContentType(TMVCMediaType.APPLICATION_JSON)
.ContentCharSet(TMVCCharset.UTF_8)
.ContentEncoding(TMVCCharset.UTF_8)
.SSL
.Compression;
Assert.IsTrue(LClient.ReadTimeout = 100);
Assert.IsTrue(LClient.ConnectTimeout = 100);
// Assert.IsTrue(LClient.Username = 'dmvc');
// Assert.IsTrue(LClient.Password = 'dmvc');
// Assert.IsTrue(LClient.UseBasicAuthentication);
Assert.IsTrue(LClient.Accept = 'application/json');
// Assert.IsTrue(LClient.ContentType = 'application/json;charset=UTF-8');
// Assert.IsTrue(LClient.ContentEncoding = 'UTF-8');
// Assert.IsTrue(LClient.HasSSL);
// Assert.IsTrue(LClient.HasCompression);
Assert.IsTrue(LClient.ReadTimeOut = 100);
Assert.IsTrue(LClient.ConnectionTimeOut = 100);
Assert.IsTrue(LClient.Username = 'dmvc');
Assert.IsTrue(LClient.Password = 'dmvc');
Assert.IsTrue(LClient.UseBasicAuthentication);
Assert.IsTrue(LClient.Accept = 'application/json;charset=UTF-8');
Assert.IsTrue(LClient.ContentType = 'application/json;charset=UTF-8');
Assert.IsTrue(LClient.ContentEncoding = 'UTF-8');
Assert.IsTrue(LClient.HasSSL);
Assert.IsTrue(LClient.HasCompression);
// Assert.IsTrue(LClient.RawBody <> nil);
// Assert.IsTrue(LClient.MultiPartFormData <> nil);
// Assert.IsTrue(LClient.BodyParams <> nil);
// Assert.IsTrue(LClient.RequestHeaders <> nil);
// Assert.IsTrue(LClient.QueryStringParams <> nil);
Assert.IsTrue(LClient.RawBody <> nil);
Assert.IsTrue(LClient.MultiPartFormData <> nil);
Assert.IsTrue(LClient.BodyParams <> nil);
Assert.IsTrue(LClient.RequestHeaders <> nil);
Assert.IsTrue(LClient.QueryStringParams <> nil);
// FreeAndNil(LClient);
FreeAndNil(LClient);
end;
procedure TTestRESTClient.TestPostUser;
var
LUser: TAppUser;
LResp: IMVCRESTResponse;
LResp: IRESTResponse;
begin
FRESTClient
.Resource('/user/save')
.SetBasicAuthorization('dmvc', '123');
FRESTClient.Resource('/user/save').Params([]);
FRESTClient.Authentication('dmvc', '123');
LUser := TAppUser.Create;
LUser.Cod := 1;
LUser.Name := 'Ezequiel';
LUser.Pass := '123';
LResp := FRESTClient.AddBody(LUser, True).Post;
Assert.IsTrue(('Success!' = LResp.Content) and (LResp.StatusCode = 200));
LResp := FRESTClient.doPOST<TAppUser>(LUser, True);
Assert.IsTrue(('Success!' = LResp.BodyAsString) and (LResp.ResponseCode = 200));
// Adapter
LUser := TAppUser.Create;
@ -257,16 +260,14 @@ end;
procedure TTestRESTClient.TestPostUsers;
var
LUsers: TObjectList<TAppUser>;
LResp: IMVCRESTResponse;
LResp: IRESTResponse;
I: Integer;
LUser: TAppUser;
begin
FRESTClient
.Resource('/users/save')
.SetBasicAuthorization('dmvc', '123')
.Accept('application/json')
.AcceptCharset('utf-8');
FRESTClient.Resource('/users/save').Params([]);
FRESTClient.Authentication('dmvc', '123');
FRESTClient.Accept('application/json;charset=utf-8');
FRESTClient.ContentType('application/json;charset=utf-8');
LUsers := TObjectList<TAppUser>.Create(True);
try
@ -278,11 +279,11 @@ begin
LUser.Pass := IntToStr(I);
LUsers.Add(LUser);
end;
LResp := FRESTClient.AddBody(LUsers, False).Post;
LResp := FRESTClient.doPOST<TAppUser>(LUsers);
finally
LUsers.Free;
end;
Assert.IsTrue(('Success!' = LResp.Content) and (LResp.StatusCode = 200));
Assert.IsTrue(('Success!' = LResp.BodyAsString) and (LResp.ResponseCode = 200));
// Adapter
LUsers := TObjectList<TAppUser>.Create(True);

944
unittests/general/Several/LiveServerTestU.pas
View File

File diff suppressed because it is too large Load Diff

11
unittests/general/Several/RESTAdapterTestsU.pas
View File

@ -29,13 +29,10 @@ unit RESTAdapterTestsU;
interface
uses
MVCFramework.RESTAdapter,
DUnitX.TestFramework,
BusinessObjectsU,
MVCFramework.RESTAdapter, DUnitX.TestFramework, BusinessObjectsU,
Generics.Collections,
System.JSON,
MVCFramework.RESTClient,
MVCFramework.RESTClient.Intf,
MVCFramework.Commons,
MVCFramework.Serializer.Commons;
@ -83,7 +80,7 @@ type
[Headers('Accept', 'text/plain')]
[Headers('ContentType', 'text/plain')]
[RESTResource(HttpGet, '/adapter/testconsumejson')]
function ApplicationJSONWithTextPlainHeader: IMVCRESTResponse;
function ApplicationJSONWithTextPlainHeader: IRESTResponse;
end;
@ -241,11 +238,11 @@ end;
procedure TTestRESTAdapter.TestApplicationJSONWithHeaderTextPlain;
var
Resp: IMVCRESTResponse;
Resp: IRESTResponse;
begin
// expected 404 because is not consumed text/plain
Resp := TESTService.ApplicationJSONWithTextPlainHeader;
Assert.AreEqual<Integer>(404, Resp.StatusCode);
Assert.AreEqual<Integer>(404, Resp.ResponseCode);
end;
procedure TTestRESTAdapter.TestGetPeople;

33
unittests/general/StandaloneServer/MVCFramework.Tests.StandaloneServer.pas
View File

@ -45,8 +45,7 @@ implementation
uses
MVCFramework.Tests.WebModule2,
MVCFramework.RESTClient,
MVCFramework.RESTClient.Intf;
MVCFramework.RESTClient;
{ TTestMVCFrameworkServer }
@ -84,29 +83,32 @@ end;
procedure TTestMVCFrameworkServer.TestServerListenerAndClient;
var
lListener: IMVCListener;
lRes: IMVCRESTResponse;
LListener: IMVCListener;
LClient: TRESTClient;
begin
lListener := TMVCListener.Create(TMVCListenerProperties.New
LListener := TMVCListener.Create(TMVCListenerProperties.New
.SetName('Listener1')
.SetPort(6000)
.SetMaxConnections(1024)
.SetWebModuleClass(TestWebModuleClass)
);
Assert.isTrue(Assigned(lListener));
Assert.isTrue(Assigned(LListener));
lListener.Start;
Assert.isTrue(lListener.Active);
LListener.Start;
Assert.isTrue(LListener.Active);
lRes := TMVCRESTClient.New
.BaseURL('localhost', 6000)
.SetBasicAuthorization('dmvc', '123')
.Get('/hello');
Assert.AreEqual('Hello World called with GET', lRes.Content);
LClient := TRESTClient.Create('localhost', 6000);
try
LClient.UserName := 'dmvc';
LClient.Password := '123';
Assert.AreEqual('Hello World called with GET', LClient.doGET('/hello', []).BodyAsString);
finally
FreeAndNil(LClient);
end;
lListener.Stop;
Assert.isFalse(lListener.Active);
LListener.Stop;
Assert.isFalse(LListener.Active);
end;
procedure TTestMVCFrameworkServer.TestListenerContext;
@ -162,3 +164,4 @@ initialization
TDUnitX.RegisterTestFixture(TTestMVCFrameworkServer);
end.