You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by jf...@apache.org on 2012/10/05 02:41:59 UTC

svn commit: r1394339 - in /thrift/trunk/lib/delphi/test/skip: idl/skiptest_version_1.thrift idl/skiptest_version_2.thrift skiptest_version1.dpr skiptest_version1.dproj skiptest_version2.dpr skiptest_version2.dproj

Author: jfarrell
Date: Fri Oct  5 00:41:59 2012
New Revision: 1394339

URL: http://svn.apache.org/viewvc?rev=1394339&view=rev
Log:
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


Removed:
    thrift/trunk/lib/delphi/test/skip/skiptest_version1.dproj
    thrift/trunk/lib/delphi/test/skip/skiptest_version2.dproj
Modified:
    thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_1.thrift
    thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_2.thrift
    thrift/trunk/lib/delphi/test/skip/skiptest_version1.dpr
    thrift/trunk/lib/delphi/test/skip/skiptest_version2.dpr

Modified: thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_1.thrift
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_1.thrift?rev=1394339&r1=1394338&r2=1394339&view=diff
==============================================================================
--- thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_1.thrift (original)
+++ thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_1.thrift Fri Oct  5 00:41:59 2012
@@ -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
 

Modified: thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_2.thrift
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_2.thrift?rev=1394339&r1=1394338&r2=1394339&view=diff
==============================================================================
--- thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_2.thrift (original)
+++ thrift/trunk/lib/delphi/test/skip/idl/skiptest_version_2.thrift Fri Oct  5 00:41:59 2012
@@ -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
 

Modified: thrift/trunk/lib/delphi/test/skip/skiptest_version1.dpr
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/delphi/test/skip/skiptest_version1.dpr?rev=1394339&r1=1394338&r2=1394339&view=diff
==============================================================================
--- thrift/trunk/lib/delphi/test/skip/skiptest_version1.dpr (original)
+++ thrift/trunk/lib/delphi/test/skip/skiptest_version1.dpr Fri Oct  5 00:41:59 2012
@@ -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

Modified: thrift/trunk/lib/delphi/test/skip/skiptest_version2.dpr
URL: http://svn.apache.org/viewvc/thrift/trunk/lib/delphi/test/skip/skiptest_version2.dpr?rev=1394339&r1=1394338&r2=1394339&view=diff
==============================================================================
--- thrift/trunk/lib/delphi/test/skip/skiptest_version2.dpr (original)
+++ thrift/trunk/lib/delphi/test/skip/skiptest_version2.dpr Fri Oct  5 00:41:59 2012
@@ -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';