Merge branch 'release/1.0.1'

appercept · Nov 12, 2019 · 3c66a7d · 3c66a7d
2 parents c45ce20 + 08605a8
commit 3c66a7d
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log
 
+## [1.0.1](https://github.com/appercept/Delphi-WebMocks/tree/1.0.1) (2019-11-12)
+
+[Full Changelog](https://github.com/appercept/Delphi-WebMocks/compare/1.0.0...1.0.1)
+
+**Fixed bugs:**
+
+- Some warnings in Berlin [\#17](https://github.com/appercept/Delphi-WebMocks/issues/17)
+
+**Merged pull requests:**
+
+- Clean up warning \(W1010\) and silence warnings \(W1029\) [\#18](https://github.com/appercept/Delphi-WebMocks/pull/18) ([rhatherall](https://github.com/rhatherall))
+
 ## [1.0.0](https://github.com/appercept/Delphi-WebMocks/tree/1.0.0) (2019-11-03)
 
 [Full Changelog](https://github.com/appercept/Delphi-WebMocks/compare/0.2.0...1.0.0)

diff --git a/Delphi.WebMock.ResponseStatus.pas b/Delphi.WebMock.ResponseStatus.pas
@@ -25,6 +25,8 @@
 
 unit Delphi.WebMock.ResponseStatus;
 
+{$WARN DUPLICATE_CTOR_DTOR OFF}
+
 interface
 
 type

diff --git a/Delphi.WebMock.StringRegExMatcher.pas b/Delphi.WebMock.StringRegExMatcher.pas
@@ -38,7 +38,7 @@   TWebMockStringRegExMatcher = class(TInterfacedObject, IStringMatcher)
   public
     constructor Create(ARegEx: TRegEx);
     function IsMatch(AValue: string): Boolean;
-    function ToString: string;
+    function ToString: string; reintroduce;
     property RegEx: TRegEx read FRegEx;
   end;
 

diff --git a/Tests/Delphi.WebMock.Assertion.Tests.pas b/Tests/Delphi.WebMock.Assertion.Tests.pas
@@ -121,7 +121,7 @@ procedure TWebMockAssertionTests.Delete_Always_ReturnsSelf;
 
 procedure TWebMockAssertionTests.Delete_GivenMethodAndURI_SetsMatcherValues;
 var
-  LMethod, LURI: string;
+  LURI: string;
 begin
   LURI := '/resource';
 
@@ -141,7 +141,7 @@ procedure TWebMockAssertionTests.Get_Always_ReturnsSelf;
 
 procedure TWebMockAssertionTests.Get_GivenMethodAndURI_SetsMatcherValues;
 var
-  LMethod, LURI: string;
+  LURI: string;
 begin
   LURI := '/resource';
 
@@ -161,7 +161,7 @@ procedure TWebMockAssertionTests.Patch_Always_ReturnsSelf;
 
 procedure TWebMockAssertionTests.Patch_GivenMethodAndURI_SetsMatcherValues;
 var
-  LMethod, LURI: string;
+  LURI: string;
 begin
   LURI := '/resource';
 
@@ -181,7 +181,7 @@ procedure TWebMockAssertionTests.Post_Always_ReturnsSelf;
 
 procedure TWebMockAssertionTests.Post_GivenMethodAndURI_SetsMatcherValues;
 var
-  LMethod, LURI: string;
+  LURI: string;
 begin
   LURI := '/resource';
 
@@ -201,7 +201,7 @@ procedure TWebMockAssertionTests.Put_Always_ReturnsSelf;
 
 procedure TWebMockAssertionTests.Put_GivenMethodAndURI_SetsMatcherValues;
 var
-  LMethod, LURI: string;
+  LURI: string;
 begin
   LURI := '/resource';
 
@@ -328,8 +328,6 @@ procedure TWebMockAssertionTests.WithBody_GivenString_SetsMatcherValue;
 procedure TWebMockAssertionTests.WithHeaders_Always_ReturnsSelf;
 var
   LHeaders: TStringList;
-  LHeaderName, LHeaderValue: string;
-  I: Integer;
 begin
   LHeaders := TStringList.Create;
 

diff --git a/Tests/Delphi.WebMock.RequestStub.Tests.pas b/Tests/Delphi.WebMock.RequestStub.Tests.pas
@@ -179,8 +179,6 @@ procedure TWebMockRequestStubTests.WithBody_GivenString_SetsValueForContent;
 procedure TWebMockRequestStubTests.WithHeaders_Always_ReturnsSelf;
 var
   LHeaders: TStringList;
-  LHeaderName, LHeaderValue: string;
-  I: Integer;
 begin
   LHeaders := TStringList.Create;
 

diff --git a/Tests/Delphi.WebMock.ResponseContentString.Tests.pas b/Tests/Delphi.WebMock.ResponseContentString.Tests.pas
@@ -76,7 +76,6 @@ procedure TWebMockResponseContentStringTests.TearDown;
 procedure TWebMockResponseContentStringTests.ContentStream_Always_ReturnsAStringStreamContainingString;
 var
   LExpected: string;
-  LStream: TStream;
 begin
   LExpected := 'A String Value';
   WebMockResponseContentString := TWebMockResponseContentString.Create(LExpected);

diff --git a/Tests/Features/Delphi.WebMock.Assertions.Tests.pas b/Tests/Features/Delphi.WebMock.Assertions.Tests.pas
@@ -321,7 +321,6 @@ procedure TWebMockAssertionsTests.WasRequestedWithBodyString_NotMatchingRequestB
 procedure TWebMockAssertionsTests.WasRequestedWithHeaderRegEx_MatchingRequest_Passes;
 var
   LHeaderName: string;
-  LPattern: TRegEx;
 begin
   LHeaderName := 'Header-1';
   WebClient.Get(
@@ -347,7 +346,6 @@ procedure TWebMockAssertionsTests.WasRequestedWithHeaderRegEx_MatchingRequest_Pa
 procedure TWebMockAssertionsTests.WasRequestedWithHeaderRegEx_NotMatchingRequest_Fails;
 var
   LHeaderName: string;
-  LPattern: TRegEx;
 begin
   LHeaderName := 'Header-1';
   WebClient.Get(

diff --git a/Tests/Features/Delphi.WebMock.ResponsesWithBody.Tests.pas b/Tests/Features/Delphi.WebMock.ResponsesWithBody.Tests.pas
@@ -117,7 +117,6 @@ procedure TWebMockResponsesWithBodyTests.Response_WhenWithBodyIsAString_ReturnsS
 var
   LExpectedContent: string;
   LResponse: IHTTPResponse;
-  LHeader: string;
   LContentText: string;
 begin
   LExpectedContent := 'Body Text';
@@ -132,7 +131,6 @@ procedure TWebMockResponsesWithBodyTests.Response_WhenWithBodyIsAString_ReturnsS
 procedure TWebMockResponsesWithBodyTests.Response_WhenWithBodyIsString_ReturnsUTF8CharSet;
 var
   LResponse: IHTTPResponse;
-  LHeader: string;
 begin
   WebMock.StubRequest('GET', '/text').ToRespond.WithBody('UTF-8 Text');
   LResponse := WebClient.Get(WebMock.URLFor('text'));
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,6 +25,8 @@ @@
     unit Delphi.WebMock.ResponseStatus;
+    {$WARN DUPLICATE_CTOR_DTOR OFF}
     interface
     type
@@ Expand Down @@