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

diff --git a/lib/delphi/test/skip/idl/skiptest_version_1.thrift b/lib/delphi/test/skip/idl/skiptest_version_1.thrift
index 20b91b8..8353c5e 100644 (file)
--- 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 df55aff..f3352d3 100644 (file)
--- 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 367b5e7..e873f29 100644 (file)
--- 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 (file)
index 1c55463..0000000
--- a/lib/delphi/test/skip/skiptest_version1.dproj
+++ /dev/null
@@ -1,116 +0,0 @@
-\feff    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-               <PropertyGroup>
-                       <ProjectGuid>{EEF476C6-43AE-4CC3-AE51-10C5B35071F1}</ProjectGuid>
-                       <MainSource>skiptest_version1.dpr</MainSource>
-                       <Basis>True</Basis>
-                       <Config Condition="'$(Config)'==''">Debug</Config>
-                       <Platform>Win32</Platform>
-                       <AppType>Console</AppType>
-                       <FrameworkType>None</FrameworkType>
-                       <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-                       <ProjectVersion>12.3</ProjectVersion>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-                       <Base>true</Base>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
-                       <Cfg_1>true</Cfg_1>
-                       <CfgParent>Base</CfgParent>
-                       <Base>true</Base>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
-                       <Cfg_2>true</Cfg_2>
-                       <CfgParent>Base</CfgParent>
-                       <Base>true</Base>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Base)'!=''">
-                       <DCC_UnitSearchPath>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)</DCC_UnitSearchPath>
-                       <DCC_E>false</DCC_E>
-                       <DCC_ImageBase>00400000</DCC_ImageBase>
-                       <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
-                       <DCC_F>false</DCC_F>
-                       <DCC_S>false</DCC_S>
-                       <DCC_N>false</DCC_N>
-                       <DCC_K>false</DCC_K>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Cfg_1)'!=''">
-                       <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-                       <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-                       <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-                       <DCC_DebugInformation>false</DCC_DebugInformation>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Cfg_2)'!=''">
-                       <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-                       <DCC_Optimize>false</DCC_Optimize>
-                       <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-               </PropertyGroup>
-               <ItemGroup>
-                       <DelphiCompile Include="skiptest_version1.dpr">
-                               <MainSource>MainSource</MainSource>
-                       </DelphiCompile>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.JSON.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Console.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
-                       <BuildConfiguration Include="Debug">
-                               <Key>Cfg_2</Key>
-                               <CfgParent>Base</CfgParent>
-                       </BuildConfiguration>
-                       <BuildConfiguration Include="Basis">
-                               <Key>Base</Key>
-                       </BuildConfiguration>
-                       <BuildConfiguration Include="Release">
-                               <Key>Cfg_1</Key>
-                               <CfgParent>Base</CfgParent>
-                       </BuildConfiguration>
-               </ItemGroup>
-               <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-               <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-               <ProjectExtensions>
-                       <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-                       <Borland.ProjectType>VCLApplication</Borland.ProjectType>
-                       <BorlandProject>
-                               <Delphi.Personality>
-                                       <Source>
-                                               <Source Name="MainSource">skiptest_version1.dpr</Source>
-                                       </Source>
-                                       <VersionInfo>
-                                               <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
-                                               <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                                               <VersionInfo Name="MajorVer">1</VersionInfo>
-                                               <VersionInfo Name="MinorVer">0</VersionInfo>
-                                               <VersionInfo Name="Release">0</VersionInfo>
-                                               <VersionInfo Name="Build">0</VersionInfo>
-                                               <VersionInfo Name="Debug">False</VersionInfo>
-                                               <VersionInfo Name="PreRelease">False</VersionInfo>
-                                               <VersionInfo Name="Special">False</VersionInfo>
-                                               <VersionInfo Name="Private">False</VersionInfo>
-                                               <VersionInfo Name="DLL">False</VersionInfo>
-                                               <VersionInfo Name="Locale">1031</VersionInfo>
-                                               <VersionInfo Name="CodePage">1252</VersionInfo>
-                                       </VersionInfo>
-                                       <VersionInfoKeys>
-                                               <VersionInfoKeys Name="CompanyName"/>
-                                               <VersionInfoKeys Name="FileDescription"/>
-                                               <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                                               <VersionInfoKeys Name="InternalName"/>
-                                               <VersionInfoKeys Name="LegalCopyright"/>
-                                               <VersionInfoKeys Name="LegalTrademarks"/>
-                                               <VersionInfoKeys Name="OriginalFilename"/>
-                                               <VersionInfoKeys Name="ProductName"/>
-                                               <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                                               <VersionInfoKeys Name="Comments"/>
-                                       </VersionInfoKeys>
-                               </Delphi.Personality>
-                               <Platforms>
-                                       <Platform value="Win32">True</Platform>
-                               </Platforms>
-                       </BorlandProject>
-                       <ProjectFileVersion>12</ProjectFileVersion>
-               </ProjectExtensions>
-       </Project>

diff --git a/lib/delphi/test/skip/skiptest_version2.dpr b/lib/delphi/test/skip/skiptest_version2.dpr
index 797b35a..7615251 100644 (file)
--- 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 (file)
index faee7f4..0000000
--- a/lib/delphi/test/skip/skiptest_version2.dproj
+++ /dev/null
@@ -1,116 +0,0 @@
-\feff    <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-               <PropertyGroup>
-                       <ProjectGuid>{EEF476C6-43AE-4CC3-AE51-10C5B35071F1}</ProjectGuid>
-                       <MainSource>skiptest_version2.dpr</MainSource>
-                       <Basis>True</Basis>
-                       <Config Condition="'$(Config)'==''">Debug</Config>
-                       <Platform>Win32</Platform>
-                       <AppType>Console</AppType>
-                       <FrameworkType>None</FrameworkType>
-                       <DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
-                       <ProjectVersion>12.3</ProjectVersion>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Config)'=='Basis' or '$(Base)'!=''">
-                       <Base>true</Base>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Config)'=='Release' or '$(Cfg_1)'!=''">
-                       <Cfg_1>true</Cfg_1>
-                       <CfgParent>Base</CfgParent>
-                       <Base>true</Base>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Config)'=='Debug' or '$(Cfg_2)'!=''">
-                       <Cfg_2>true</Cfg_2>
-                       <CfgParent>Base</CfgParent>
-                       <Base>true</Base>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Base)'!=''">
-                       <DCC_UnitSearchPath>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)</DCC_UnitSearchPath>
-                       <DCC_E>false</DCC_E>
-                       <DCC_ImageBase>00400000</DCC_ImageBase>
-                       <DCC_UnitAlias>WinTypes=Windows;WinProcs=Windows;DbiTypes=BDE;DbiProcs=BDE;DbiErrs=BDE;WinTypes=Windows;WinProcs=Windows;$(DCC_UnitAlias)</DCC_UnitAlias>
-                       <DCC_F>false</DCC_F>
-                       <DCC_S>false</DCC_S>
-                       <DCC_N>false</DCC_N>
-                       <DCC_K>false</DCC_K>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Cfg_1)'!=''">
-                       <DCC_LocalDebugSymbols>false</DCC_LocalDebugSymbols>
-                       <DCC_Define>RELEASE;$(DCC_Define)</DCC_Define>
-                       <DCC_SymbolReferenceInfo>0</DCC_SymbolReferenceInfo>
-                       <DCC_DebugInformation>false</DCC_DebugInformation>
-               </PropertyGroup>
-               <PropertyGroup Condition="'$(Cfg_2)'!=''">
-                       <DCC_Define>DEBUG;$(DCC_Define)</DCC_Define>
-                       <DCC_Optimize>false</DCC_Optimize>
-                       <DCC_GenerateStackFrames>true</DCC_GenerateStackFrames>
-               </PropertyGroup>
-               <ItemGroup>
-                       <DelphiCompile Include="skiptest_version2.dpr">
-                               <MainSource>MainSource</MainSource>
-                       </DelphiCompile>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Transport.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Protocol.JSON.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Collections.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Server.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Console.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Utils.pas"/>
-                       <DCCReference Include="..\..\..\lib\delphi\src\Thrift.Stream.pas"/>
-                       <BuildConfiguration Include="Debug">
-                               <Key>Cfg_2</Key>
-                               <CfgParent>Base</CfgParent>
-                       </BuildConfiguration>
-                       <BuildConfiguration Include="Basis">
-                               <Key>Base</Key>
-                       </BuildConfiguration>
-                       <BuildConfiguration Include="Release">
-                               <Key>Cfg_1</Key>
-                               <CfgParent>Base</CfgParent>
-                       </BuildConfiguration>
-               </ItemGroup>
-               <Import Condition="Exists('$(BDS)\Bin\CodeGear.Delphi.Targets')" Project="$(BDS)\Bin\CodeGear.Delphi.Targets"/>
-               <Import Condition="Exists('$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj')" Project="$(APPDATA)\Embarcadero\$(BDSAPPDATABASEDIR)\$(PRODUCTVERSION)\UserTools.proj"/>
-               <ProjectExtensions>
-                       <Borland.Personality>Delphi.Personality.12</Borland.Personality>
-                       <Borland.ProjectType>VCLApplication</Borland.ProjectType>
-                       <BorlandProject>
-                               <Delphi.Personality>
-                                       <Source>
-                                               <Source Name="MainSource">skiptest_version2.dpr</Source>
-                                       </Source>
-                                       <VersionInfo>
-                                               <VersionInfo Name="IncludeVerInfo">False</VersionInfo>
-                                               <VersionInfo Name="AutoIncBuild">False</VersionInfo>
-                                               <VersionInfo Name="MajorVer">1</VersionInfo>
-                                               <VersionInfo Name="MinorVer">0</VersionInfo>
-                                               <VersionInfo Name="Release">0</VersionInfo>
-                                               <VersionInfo Name="Build">0</VersionInfo>
-                                               <VersionInfo Name="Debug">False</VersionInfo>
-                                               <VersionInfo Name="PreRelease">False</VersionInfo>
-                                               <VersionInfo Name="Special">False</VersionInfo>
-                                               <VersionInfo Name="Private">False</VersionInfo>
-                                               <VersionInfo Name="DLL">False</VersionInfo>
-                                               <VersionInfo Name="Locale">1031</VersionInfo>
-                                               <VersionInfo Name="CodePage">1252</VersionInfo>
-                                       </VersionInfo>
-                                       <VersionInfoKeys>
-                                               <VersionInfoKeys Name="CompanyName"/>
-                                               <VersionInfoKeys Name="FileDescription"/>
-                                               <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
-                                               <VersionInfoKeys Name="InternalName"/>
-                                               <VersionInfoKeys Name="LegalCopyright"/>
-                                               <VersionInfoKeys Name="LegalTrademarks"/>
-                                               <VersionInfoKeys Name="OriginalFilename"/>
-                                               <VersionInfoKeys Name="ProductName"/>
-                                               <VersionInfoKeys Name="ProductVersion">1.0.0.0</VersionInfoKeys>
-                                               <VersionInfoKeys Name="Comments"/>
-                                       </VersionInfoKeys>
-                               </Delphi.Personality>
-                               <Platforms>
-                                       <Platform value="Win32">True</Platform>
-                               </Platforms>
-                       </BorlandProject>
-                       <ProjectFileVersion>12</ProjectFileVersion>
-               </ProjectExtensions>
-       </Project>