Fix unittest memory leaks

Author: fabriciocolombo

.gitignore

@@ -7,6 +7,8 @@ unittest/UnitTest.res
 unittest/UnitTest.dsk
 unittest/UnitTest.dof
 unittest/UnitTest.exe
+unittest/UnitTest.map
+unittest/target
 packages/D7/D7_RestApi.dsk
 packages/D7/D7_RestApi.res
 packages/XE/DelphiXE_RestApi.res

unittest/BaseTestRest.pas

@@ -70,7 +70,8 @@ procedure TBaseTestRest.SetUp;
 begin
   inherited;
   FRestClient := TRestClient.Create(nil);
-  FRestClient.EnabledCompression := True;
+// AV in Delphi XE2
+  FRestClient.EnabledCompression := False;
   FRestClient.ConnectionType := FHttpConnectionType;
 end;
 

unittest/TestDBXJson.pas

@@ -50,14 +50,15 @@ procedure TTestDbxJson.EchoJsonObjectWithPut;
 
 procedure TTestDbxJson.GetJsonList;
 var
-  vResponse: TList<TPerson>;
+  vResponse: TObjectList<TPerson>;
   vPerson: TPerson;
 begin
   vResponse := RestClient.Resource(CONTEXT_PATH + 'persons')
                           .Accept(RestUtils.MediaType_Json)
-                          .Get<TList<TPerson>>();
+                          .Get<TObjectList<TPerson>>();
   try
     CheckNotNull(vResponse);
+    vResponse.OwnsObjects := True;
     CheckEquals(4, vResponse.Count);
 
     for vPerson in vResponse do
@@ -130,27 +131,22 @@ procedure TTestDbxJson.DeleteJsonObject;
 
 procedure TTestDbxJson.EchoJsonObjectListWithPost;
 var
-  vPerson: TPerson;
   vReqJson,
-  vRespJson: TList<TPerson>;
+  vRespJson: TObjectList<TPerson>;
 begin
-  vReqJson := TList<TPerson>.Create;
+  vReqJson := TObjectList<TPerson>.Create;
   try
-    vPerson := TPerson.NewFrom(123, 'Fabricio', 'fabricio.colombo.mva@gmail.com');
+    vReqJson.Add(TPerson.NewFrom(123, 'Fabricio', 'fabricio.colombo.mva@gmail.com'));
+
+    vRespJson := RestClient.Resource(CONTEXT_PATH + 'json/persons')
+                           .Accept(RestUtils.MediaType_Json)
+                           .ContentType(RestUtils.MediaType_Json)
+                           .Post<TObjectList<TPerson>>(vReqJson);
     try
-      vReqJson.Add(vPerson);
-
-      vRespJson := RestClient.Resource(CONTEXT_PATH + 'json/persons')
-                             .Accept(RestUtils.MediaType_Json)
-                             .ContentType(RestUtils.MediaType_Json)
-                             .Post<TList<TPerson>>(vReqJson);
-      try
-        CheckEqualsString(vReqJson[0].ToString, vRespJson[0].ToString);
-      finally
-        vRespJson.Free;
-      end;
+      vRespJson.OwnsObjects := True;
+      CheckEqualsString(vReqJson[0].ToString, vRespJson[0].ToString);
     finally
-      vPerson.Free;
+      vRespJson.Free;
     end;
   finally
     vReqJson.Free;

unittest/TestDataSetHandler.pas

@@ -112,12 +112,15 @@ procedure TTestDataSetHandler.JsonToDynamicDataSet;
   vJson := '{"id":123,"name":"Fabricio Colombo"}';
 
   vDataSet := TJsonToDataSetConverter.CreateDataSetMetadata(vJson);
-
-  CheckNotNull(vDataSet);
-  CheckTrue(vDataSet.Active);
-  CheckEquals(2, vDataSet.FieldCount);
-  CheckEquals('id', vDataSet.Fields[0].FieldName);
-  CheckEquals('name', vDataSet.Fields[1].FieldName);
+  try
+    CheckNotNull(vDataSet);
+    CheckTrue(vDataSet.Active);
+    CheckEquals(2, vDataSet.FieldCount);
+    CheckEquals('id', vDataSet.Fields[0].FieldName);
+    CheckEquals('name', vDataSet.Fields[1].FieldName);
+  finally
+    vDataSet.Free;
+  end;
 end;
 
 procedure TTestDataSetHandler.JsonToDynamicDataSetWithNestedDataSet;
@@ -141,10 +144,8 @@ procedure TTestDataSetHandler.JsonToDynamicDataSetWithNestedDataSet;
            '   ]' +
            '}';
 
-  vDataSet := TClientDataSet.Create(nil);
+  vDataSet := TJsonToDataSetConverter.CreateDataSetMetadata(vJson);
   try
-    vDataSet := TJsonToDataSetConverter.CreateDataSetMetadata(vJson);
-
     CheckNotNull(vDataSet);
     CheckTrue(vDataSet.Active);
     CheckEquals(3, vDataSet.FieldCount);

unittest/TestSerializer.pas

@@ -16,9 +16,10 @@   TPerson = class(TObject)
     age: Integer;
     name: String;
     father: TPerson;
-    phones : TList<TPhone>;
+    phones : TObjectList<TPhone>;
 
     function ToString: string; override;
+    destructor Destroy; override;
   end;
 
   TTestDesserializer = class(TBaseTestRest)
@@ -53,14 +54,17 @@ procedure TTestDesserializer.personWithFather;
   vPerson: TPerson;
 begin
   vPerson := TPerson.FromJson(sJson);
-
-  CheckNotNull(vPerson);
-  CheckEquals('Helbert', vPerson.name);
-  CheckEquals(30, vPerson.age);
-
-  CheckNotNull(vPerson.father);
-  CheckEquals('Luiz', vPerson.father.name);
-  CheckEquals(60, vPerson.father.age);
+  try
+    CheckNotNull(vPerson);
+    CheckEquals('Helbert', vPerson.name);
+    CheckEquals(30, vPerson.age);
+
+    CheckNotNull(vPerson.father);
+    CheckEquals('Luiz', vPerson.father.name);
+    CheckEquals(60, vPerson.father.age);
+  finally
+    vPerson.Free;
+  end;
 end;
 
 procedure TTestDesserializer.personWithFatherAndPhones;
@@ -89,22 +93,25 @@ procedure TTestDesserializer.personWithFatherAndPhones;
   vPerson: TPerson;
 begin
   vPerson := TPerson.FromJson(sJson);
-
-  CheckNotNull(vPerson);
-  CheckEquals('Helbert', vPerson.name);
-  CheckEquals(30, vPerson.age);
-
-  CheckNotNull(vPerson.father);
-  CheckEquals('Luiz', vPerson.father.name);
-  CheckEquals(60, vPerson.father.age);
-
-  CheckNotNull(vPerson.phones);
-  CheckEquals(2, vPerson.phones.Count);
-  CheckEquals(33083518, vPerson.phones[0].number);
-  CheckEquals(61, vPerson.phones[0].code);
-
-  CheckEquals(99744165, vPerson.phones[1].number);
-  CheckEquals(61, vPerson.phones[1].code);
+  try
+    CheckNotNull(vPerson);
+    CheckEquals('Helbert', vPerson.name);
+    CheckEquals(30, vPerson.age);
+
+    CheckNotNull(vPerson.father);
+    CheckEquals('Luiz', vPerson.father.name);
+    CheckEquals(60, vPerson.father.age);
+
+    CheckNotNull(vPerson.phones);
+    CheckEquals(2, vPerson.phones.Count);
+    CheckEquals(33083518, vPerson.phones[0].number);
+    CheckEquals(61, vPerson.phones[0].code);
+
+    CheckEquals(99744165, vPerson.phones[1].number);
+    CheckEquals(61, vPerson.phones[1].code);
+  finally
+    vPerson.Free;
+  end;
 end;
 
 procedure TTestDesserializer.person;
@@ -117,10 +124,13 @@ procedure TTestDesserializer.person;
   vPerson: TPerson;
 begin
   vPerson := TPerson.FromJson(sJson);
-
-  CheckNotNull(vPerson);
-  CheckEquals('Helbert', vPerson.name);
-  CheckEquals(30, vPerson.age);
+  try
+    CheckNotNull(vPerson);
+    CheckEquals('Helbert', vPerson.name);
+    CheckEquals(30, vPerson.age);
+  finally
+    vPerson.Free;
+  end;
 end;
 
 { TTestSerializer }
@@ -132,14 +142,27 @@ procedure TTestSerializer.person;
   vPerson: TPerson;
 begin
   vPerson := TPerson.Create;
-  vPerson.name := 'Helbert';
-  vPerson.age := 30;
+  try
+    vPerson.name := 'Helbert';
+    vPerson.age := 30;
 
-  CheckEquals(sJson, vPerson.ToJson().AsJSon());
+    CheckEquals(sJson, vPerson.ToJson().AsJSon());
+  finally
+    vPerson.Free;
+  end;
 end;
 
 { TPerson }
 
+destructor TPerson.Destroy;
+begin
+  if Assigned(phones) then
+    phones.OwnsObjects := True;
+  phones.Free;
+  father.Free;
+  inherited;
+end;
+
 function TPerson.ToString: string;
 begin
   Result := 'name:' + name + ' age:' + IntToStr(age);