From f6e8b0d3fffc5ce31c228012a01ca6a1a10bff7c Mon Sep 17 00:00:00 2001 From: Jake Farrell Date: Fri, 5 Oct 2012 00:41:59 +0000 Subject: [PATCH] Thrift-1710: Minor issues in test cases code Client: delphi Patch: Jens Geyer The patch for THRIFT-1670 left some minor issues open. These are hereby fixed. - incorrect search paths in uses clause - unused variable in ReadResponse() - incorrectly formatted comment in IDL git-svn-id: https://svn.apache.org/repos/asf/thrift/trunk@1394339 13f79535-47bb-0310-9956-ffa450edef68 --- .../test/skip/idl/skiptest_version_1.thrift | 6 +- .../test/skip/idl/skiptest_version_2.thrift | 6 +- lib/delphi/test/skip/skiptest_version1.dpr | 19 ++- lib/delphi/test/skip/skiptest_version1.dproj | 116 ------------------ lib/delphi/test/skip/skiptest_version2.dpr | 18 +-- lib/delphi/test/skip/skiptest_version2.dproj | 116 ------------------ 6 files changed, 24 insertions(+), 257 deletions(-) delete mode 100644 lib/delphi/test/skip/skiptest_version1.dproj delete mode 100644 lib/delphi/test/skip/skiptest_version2.dproj diff --git a/lib/delphi/test/skip/idl/skiptest_version_1.thrift b/lib/delphi/test/skip/idl/skiptest_version_1.thrift index 20b91b82..8353c5e1 100644 --- a/lib/delphi/test/skip/idl/skiptest_version_1.thrift +++ b/lib/delphi/test/skip/idl/skiptest_version_1.thrift @@ -1,4 +1,4 @@ -(* +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -15,10 +15,10 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - *) + */ - // version 1 of the interface +// version 1 of the interface namespace * Skiptest.One diff --git a/lib/delphi/test/skip/idl/skiptest_version_2.thrift b/lib/delphi/test/skip/idl/skiptest_version_2.thrift index df55aff3..f3352d32 100644 --- a/lib/delphi/test/skip/idl/skiptest_version_2.thrift +++ b/lib/delphi/test/skip/idl/skiptest_version_2.thrift @@ -1,4 +1,4 @@ -(* +/* * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -15,10 +15,10 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - *) + */ - // version 2 of the interface +// version 2 of the interface namespace * Skiptest.Two diff --git a/lib/delphi/test/skip/skiptest_version1.dpr b/lib/delphi/test/skip/skiptest_version1.dpr index 367b5e77..e873f29c 100644 --- a/lib/delphi/test/skip/skiptest_version1.dpr +++ b/lib/delphi/test/skip/skiptest_version1.dpr @@ -24,15 +24,15 @@ program skiptest_version1; uses Classes, Windows, SysUtils, Skiptest.One, - Thrift in '..\..\..\lib\delphi\src\Thrift.pas', - Thrift.Transport in '..\..\..\lib\delphi\src\Thrift.Transport.pas', - Thrift.Protocol in '..\..\..\lib\delphi\src\Thrift.Protocol.pas', - Thrift.Protocol.JSON in '..\..\..\lib\delphi\src\Thrift.Protocol.JSON.pas', - Thrift.Collections in '..\..\..\lib\delphi\src\Thrift.Collections.pas', - Thrift.Server in '..\..\..\lib\delphi\src\Thrift.Server.pas', - Thrift.Console in '..\..\..\lib\delphi\src\Thrift.Console.pas', - Thrift.Utils in '..\..\..\lib\delphi\src\Thrift.Utils.pas', - Thrift.Stream in '..\..\..\lib\delphi\src\Thrift.Stream.pas'; + Thrift in '..\..\src\Thrift.pas', + Thrift.Transport in '..\..\src\Thrift.Transport.pas', + Thrift.Protocol in '..\..\src\Thrift.Protocol.pas', + Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas', + Thrift.Collections in '..\..\src\Thrift.Collections.pas', + Thrift.Server in '..\..\src\Thrift.Server.pas', + Thrift.Console in '..\..\src\Thrift.Console.pas', + Thrift.Utils in '..\..\src\Thrift.Utils.pas', + Thrift.Stream in '..\..\src\Thrift.Stream.pas'; const REQUEST_EXT = '.request'; @@ -105,7 +105,6 @@ end; procedure ReadResponse( protfact : IProtocolFactory; fname : string); var stm : TFileStream; - ping : IPing; proto : IProtocol; client : TSkipTestService.TClient; // we need access to send/recv_pingpong() cliRef : IUnknown; // holds the refcount diff --git a/lib/delphi/test/skip/skiptest_version1.dproj b/lib/delphi/test/skip/skiptest_version1.dproj deleted file mode 100644 index 1c55463c..00000000 --- a/lib/delphi/test/skip/skiptest_version1.dproj +++ /dev/null @@ -1,116 +0,0 @@ - - - {EEF476C6-43AE-4CC3-AE51-10C5B35071F1} - skiptest_version1.dpr - True - Debug - Win32 - Console - None - DCC32 - 12.3 - - - true - - - true - Base - true - - - true - Base - true - - - C:\D\TPCPP\X_ThirdParty\Thrift\wc-XE-all\thrift-testing\gen-delphi;C:\D\TPCPP\X_ThirdParty\Thrift\wc-XE-all\trunk\lib\delphi\src;$(DCC_UnitSearchPath) - false - 00400000 - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias) - false - false - false - false - - - false - RELEASE;$(DCC_Define) - 0 - false - - - DEBUG;$(DCC_Define) - false - true - - - - MainSource - - - - - - - - - - - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - - - Delphi.Personality.12 - VCLApplication - - - - skiptest_version1.dpr - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1031 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - True - - - 12 - - diff --git a/lib/delphi/test/skip/skiptest_version2.dpr b/lib/delphi/test/skip/skiptest_version2.dpr index 797b35ad..76152514 100644 --- a/lib/delphi/test/skip/skiptest_version2.dpr +++ b/lib/delphi/test/skip/skiptest_version2.dpr @@ -24,15 +24,15 @@ program skiptest_version2; uses Classes, Windows, SysUtils, Skiptest.Two, - Thrift in '..\..\..\lib\delphi\src\Thrift.pas', - Thrift.Transport in '..\..\..\lib\delphi\src\Thrift.Transport.pas', - Thrift.Protocol in '..\..\..\lib\delphi\src\Thrift.Protocol.pas', - Thrift.Protocol.JSON in '..\..\..\lib\delphi\src\Thrift.Protocol.JSON.pas', - Thrift.Collections in '..\..\..\lib\delphi\src\Thrift.Collections.pas', - Thrift.Server in '..\..\..\lib\delphi\src\Thrift.Server.pas', - Thrift.Console in '..\..\..\lib\delphi\src\Thrift.Console.pas', - Thrift.Utils in '..\..\..\lib\delphi\src\Thrift.Utils.pas', - Thrift.Stream in '..\..\..\lib\delphi\src\Thrift.Stream.pas'; + Thrift in '..\..\src\Thrift.pas', + Thrift.Transport in '..\..\src\Thrift.Transport.pas', + Thrift.Protocol in '..\..\src\Thrift.Protocol.pas', + Thrift.Protocol.JSON in '..\..\src\Thrift.Protocol.JSON.pas', + Thrift.Collections in '..\..\src\Thrift.Collections.pas', + Thrift.Server in '..\..\src\Thrift.Server.pas', + Thrift.Console in '..\..\src\Thrift.Console.pas', + Thrift.Utils in '..\..\src\Thrift.Utils.pas', + Thrift.Stream in '..\..\src\Thrift.Stream.pas'; const REQUEST_EXT = '.request'; diff --git a/lib/delphi/test/skip/skiptest_version2.dproj b/lib/delphi/test/skip/skiptest_version2.dproj deleted file mode 100644 index faee7f4a..00000000 --- a/lib/delphi/test/skip/skiptest_version2.dproj +++ /dev/null @@ -1,116 +0,0 @@ - - - {EEF476C6-43AE-4CC3-AE51-10C5B35071F1} - skiptest_version2.dpr - True - Debug - Win32 - Console - None - DCC32 - 12.3 - - - true - - - true - Base - true - - - true - Base - true - - - C:\D\TPCPP\X_ThirdParty\Thrift\wc-XE-all\thrift-testing\gen-delphi;C:\D\TPCPP\X_ThirdParty\Thrift\wc-XE-all\trunk\lib\delphi\src;$(DCC_UnitSearchPath) - false - 00400000 - WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias) - false - false - false - false - - - false - RELEASE;$(DCC_Define) - 0 - false - - - DEBUG;$(DCC_Define) - false - true - - - - MainSource - - - - - - - - - - - - Cfg_2 - Base - - - Base - - - Cfg_1 - Base - - - - - - Delphi.Personality.12 - VCLApplication - - - - skiptest_version2.dpr - - - False - False - 1 - 0 - 0 - 0 - False - False - False - False - False - 1031 - 1252 - - - - - 1.0.0.0 - - - - - - 1.0.0.0 - - - - - True - - - 12 - - -- 2.17.1