You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@thrift.apache.org by ro...@apache.org on 2012/05/18 11:25:02 UTC
svn commit: r1340044 - in /thrift/trunk/test/hs: DebugProtoTest_Main.hs
ThriftTest_Main.hs run-test.sh
Author: roger
Date: Fri May 18 09:25:02 2012
New Revision: 1340044
URL: http://svn.apache.org/viewvc?rev=1340044&view=rev
Log:
THRIFT-1598 Update Haskell generated code to use Text, Hash{Map,Set}, Vector
fix test suite
Modified:
thrift/trunk/test/hs/DebugProtoTest_Main.hs (contents, props changed)
thrift/trunk/test/hs/ThriftTest_Main.hs (contents, props changed)
thrift/trunk/test/hs/run-test.sh
Modified: thrift/trunk/test/hs/DebugProtoTest_Main.hs
URL: http://svn.apache.org/viewvc/thrift/trunk/test/hs/DebugProtoTest_Main.hs?rev=1340044&r1=1340043&r2=1340044&view=diff
==============================================================================
--- thrift/trunk/test/hs/DebugProtoTest_Main.hs (original)
+++ thrift/trunk/test/hs/DebugProtoTest_Main.hs Fri May 18 09:25:02 2012
@@ -17,6 +17,8 @@
-- under the License.
--
+{-# LANGUAGE OverloadedStrings #-}
+
module Main where
@@ -78,7 +80,7 @@ instance SIface.Srv_Iface InheritedHandl
Types.f_CompactProtoTestStruct_string_list = Nothing,
Types.f_CompactProtoTestStruct_binary_list = Nothing,
Types.f_CompactProtoTestStruct_boolean_list = Nothing,
- Types.f_CompactProtoTestStruct_struct_list = Just [Types.Empty],
+ Types.f_CompactProtoTestStruct_struct_list = Nothing,
Types.f_CompactProtoTestStruct_byte_set = Nothing,
Types.f_CompactProtoTestStruct_i16_set = Nothing,
Propchange: thrift/trunk/test/hs/DebugProtoTest_Main.hs
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/test/hs/ThriftTest_Main.hs
URL: http://svn.apache.org/viewvc/thrift/trunk/test/hs/ThriftTest_Main.hs?rev=1340044&r1=1340043&r2=1340044&view=diff
==============================================================================
--- thrift/trunk/test/hs/ThriftTest_Main.hs (original)
+++ thrift/trunk/test/hs/ThriftTest_Main.hs Fri May 18 09:25:02 2012
@@ -18,12 +18,16 @@
-- under the License.
--
+{-# LANGUAGE OverloadedStrings #-}
+
module Main where
import qualified Control.Exception
-import qualified Data.Map as Map
-import qualified Data.Set as Set
+import qualified Data.HashMap.Strict as Map
+import qualified Data.HashSet as Set
+import qualified Data.Vector as Vector
+
import qualified Network
import Thrift
@@ -44,7 +48,7 @@ instance Iface.ThriftTest_Iface TestHand
testVoid _ = return ()
testString _ (Just s) = do
- ThriftTestUtils.serverLog s
+ ThriftTestUtils.serverLog $ show s
return s
testString _ Nothing = do
@@ -168,7 +172,7 @@ client addr = do
let ps = (BinaryProtocol to, BinaryProtocol to)
v1 <- Client.testString ps "bya"
- ThriftTestUtils.clientLog v1
+ ThriftTestUtils.clientLog $ show v1
v2 <- Client.testByte ps 8
ThriftTestUtils.clientLog $ show v2
@@ -200,7 +204,7 @@ client addr = do
v11 <- Client.testStringMap ps (Map.fromList [("a","123"),("a b","with spaces "),("same","same"),("0","numeric key")])
ThriftTestUtils.clientLog $ show v11
- v12 <- Client.testList ps [1,2,3,4,5]
+ v12 <- Client.testList ps (Vector.fromList [1,2,3,4,5])
ThriftTestUtils.clientLog $ show v12
v13 <- Client.testSet ps (Set.fromList [1,2,3,4,5])
Propchange: thrift/trunk/test/hs/ThriftTest_Main.hs
------------------------------------------------------------------------------
svn:executable = *
Modified: thrift/trunk/test/hs/run-test.sh
URL: http://svn.apache.org/viewvc/thrift/trunk/test/hs/run-test.sh?rev=1340044&r1=1340043&r2=1340044&view=diff
==============================================================================
--- thrift/trunk/test/hs/run-test.sh (original)
+++ thrift/trunk/test/hs/run-test.sh Fri May 18 09:25:02 2012
@@ -68,4 +68,4 @@ printf "Generating bindings... \n"
$THRIFT_BIN --gen hs $THRIFT_FILE
printf "Running test... \n"
-runhaskell -Wall -Werror -i$BASE/lib/hs/src -igen-hs $TEST_SOURCE_FILE
+runhaskell -Wall -i$BASE/lib/hs/src -igen-hs $TEST_SOURCE_FILE