diff --git a/benchmarks/DBusBenchmarks.hs b/benchmarks/DBusBenchmarks.hs --- a/benchmarks/DBusBenchmarks.hs +++ b/benchmarks/DBusBenchmarks.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2010-2011 John Millikin +-- Copyright (C) 2010-2011 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/dbus.cabal b/dbus.cabal --- a/dbus.cabal +++ b/dbus.cabal @@ -1,9 +1,9 @@ name: dbus -version: 0.10.7 +version: 0.10.8 license: GPL-3 license-file: license.txt -author: John Millikin -maintainer: John Millikin +author: John Millikin +maintainer: John Millikin build-type: Simple cabal-version: >= 1.8 category: Network, Desktop @@ -83,7 +83,7 @@ source-repository this type: git location: https://john-millikin.com/code/haskell-dbus/ - tag: haskell-dbus_0.10.7 + tag: haskell-dbus_0.10.8 library ghc-options: -Wall -O2 @@ -100,7 +100,7 @@ , parsec >= 2.0 && < 3.2 , random >= 1.0 && < 1.1 , text >= 0.11.1.5 - , transformers >= 0.2 && < 0.4 + , transformers >= 0.2 , unix >= 2.2 , vector >= 0.7 && < 0.11 , xml-types >= 0.3 && < 0.4 @@ -127,7 +127,7 @@ base >= 4.0 && < 5.0 , bytestring >= 0.9 , cereal >= 0.3.4 && < 0.5 - , chell >= 0.3 && < 0.4 + , chell >= 0.4 && < 0.5 , chell-quickcheck >= 0.2 && < 0.3 , containers >= 0.1 && < 0.6 , directory @@ -135,11 +135,11 @@ , libxml-sax >= 0.7 && < 0.8 , network >= 2.2.3 , parsec >= 2.0 && < 3.2 - , process >= 1.0 && < 1.2 - , QuickCheck == 2.4.* + , process >= 1.0 && < 2.0 + , QuickCheck >= 2.4 , random >= 1.0 && < 1.1 , text >= 0.11.1.5 - , transformers >= 0.2 && < 0.4 + , transformers >= 0.2 , unix >= 2.2 , vector >= 0.7 && < 0.11 , xml-types >= 0.3 && < 0.4 diff --git a/examples/dbus-monitor.hs b/examples/dbus-monitor.hs --- a/examples/dbus-monitor.hs +++ b/examples/dbus-monitor.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2009-2011 John Millikin +-- Copyright (C) 2009-2011 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -17,14 +17,10 @@ module Main (main) where -import Control.Concurrent (threadDelay) import Control.Monad import Data.List (intercalate) -import Data.Maybe import Data.Int import Data.Word -import Data.Text (Text) -import qualified Data.Text import System.Environment import System.Exit import System.IO diff --git a/examples/export.hs b/examples/export.hs --- a/examples/export.hs +++ b/examples/export.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2009-2011 John Millikin +-- Copyright (C) 2009-2011 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -21,7 +21,6 @@ import Control.Monad import System.Exit -import DBus import DBus.Client onFoo :: String -> String -> IO (String, String) diff --git a/examples/introspect.hs b/examples/introspect.hs --- a/examples/introspect.hs +++ b/examples/introspect.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2009-2011 John Millikin +-- Copyright (C) 2009-2011 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -19,7 +19,6 @@ import Control.Monad (when) import Data.String (fromString) -import qualified Data.Text import System.Environment (getArgs, getProgName) import System.Exit (exitFailure) import System.IO (hPutStrLn, stderr) diff --git a/examples/list-names.hs b/examples/list-names.hs --- a/examples/list-names.hs +++ b/examples/list-names.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2009-2011 John Millikin +-- Copyright (C) 2009-2011 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus.hs b/lib/DBus.hs --- a/lib/DBus.hs +++ b/lib/DBus.hs @@ -1,4 +1,4 @@ --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Address.hs b/lib/DBus/Address.hs --- a/lib/DBus/Address.hs +++ b/lib/DBus/Address.hs @@ -1,4 +1,4 @@ --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Client.hs b/lib/DBus/Client.hs --- a/lib/DBus/Client.hs +++ b/lib/DBus/Client.hs @@ -4,7 +4,7 @@ {-# LANGUAGE OverlappingInstances #-} {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Introspection.hs b/lib/DBus/Introspection.hs --- a/lib/DBus/Introspection.hs +++ b/lib/DBus/Introspection.hs @@ -1,6 +1,6 @@ {-# LANGUAGE OverloadedStrings #-} --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Message.hs b/lib/DBus/Message.hs --- a/lib/DBus/Message.hs +++ b/lib/DBus/Message.hs @@ -1,4 +1,4 @@ --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Socket.hs b/lib/DBus/Socket.hs --- a/lib/DBus/Socket.hs +++ b/lib/DBus/Socket.hs @@ -2,7 +2,7 @@ {-# LANGUAGE ExistentialQuantification #-} {-# LANGUAGE TypeFamilies #-} --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Transport.hs b/lib/DBus/Transport.hs --- a/lib/DBus/Transport.hs +++ b/lib/DBus/Transport.hs @@ -1,7 +1,7 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE TypeFamilies #-} --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Types.hs b/lib/DBus/Types.hs --- a/lib/DBus/Types.hs +++ b/lib/DBus/Types.hs @@ -4,7 +4,7 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE IncoherentInstances #-} --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/lib/DBus/Wire.hs b/lib/DBus/Wire.hs --- a/lib/DBus/Wire.hs +++ b/lib/DBus/Wire.hs @@ -1,4 +1,4 @@ --- Copyright (C) 2009-2012 John Millikin +-- Copyright (C) 2009-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/tests/DBusTests.hs b/tests/DBusTests.hs --- a/tests/DBusTests.hs +++ b/tests/DBusTests.hs @@ -1,4 +1,4 @@ --- Copyright (C) 2012 John Millikin +-- Copyright (C) 2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/tests/DBusTests/Address.hs b/tests/DBusTests/Address.hs --- a/tests/DBusTests/Address.hs +++ b/tests/DBusTests/Address.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -33,15 +33,16 @@ test_Address :: Suite test_Address = suite "Address" - test_BuildAddress - test_ParseAddress - test_ParseAddresses - test_ParseInvalid - test_FormatAddress - test_FormatAddresses - test_GetSystemAddress - test_GetSessionAddress - test_GetStarterAddress + [ test_BuildAddress + , test_ParseAddress + , test_ParseAddresses + , test_ParseInvalid + , test_FormatAddress + , test_FormatAddresses + , test_GetSystemAddress + , test_GetSessionAddress + , test_GetStarterAddress + ] test_BuildAddress :: Test test_BuildAddress = property "address" prop where diff --git a/tests/DBusTests/BusName.hs b/tests/DBusTests/BusName.hs --- a/tests/DBusTests/BusName.hs +++ b/tests/DBusTests/BusName.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -29,9 +29,10 @@ test_BusName :: Suite test_BusName = suite "BusName" - test_Parse - test_ParseInvalid - test_IsVariant + [ test_Parse + , test_ParseInvalid + , test_IsVariant + ] test_Parse :: Test test_Parse = property "parse" prop where diff --git a/tests/DBusTests/Client.hs b/tests/DBusTests/Client.hs --- a/tests/DBusTests/Client.hs +++ b/tests/DBusTests/Client.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -32,15 +32,15 @@ import DBusTests.Util (forkVar, withEnv) test_Client :: Suite -test_Client = suite "Client" - suite_Connect - test_RequestName - test_ReleaseName - test_Call - test_CallNoReply - test_AddMatch - test_AutoMethod - test_ExportIntrospection +test_Client = suite "Client" $ + [ test_RequestName + , test_ReleaseName + , test_Call + , test_CallNoReply + , test_AddMatch + , test_AutoMethod + , test_ExportIntrospection + ] ++ suiteTests suite_Connect test_Connect :: String -> (Address -> IO DBus.Client.Client) -> Test test_Connect name connect = assertions name $ do @@ -60,12 +60,13 @@ suite_Connect :: Suite suite_Connect = suite "connect" - test_ConnectSystem - test_ConnectSystem_NoAddress - test_ConnectSession - test_ConnectSession_NoAddress - test_ConnectStarter - test_ConnectStarter_NoAddress + [ test_ConnectSystem + , test_ConnectSystem_NoAddress + , test_ConnectSession + , test_ConnectSession_NoAddress + , test_ConnectStarter + , test_ConnectStarter_NoAddress + ] test_ConnectSystem :: Test test_ConnectSystem = test_Connect "connectSystem" $ \addr -> do diff --git a/tests/DBusTests/ErrorName.hs b/tests/DBusTests/ErrorName.hs --- a/tests/DBusTests/ErrorName.hs +++ b/tests/DBusTests/ErrorName.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -29,9 +29,10 @@ test_ErrorName :: Suite test_ErrorName = suite "ErrorName" - test_Parse - test_ParseInvalid - test_IsVariant + [ test_Parse + , test_ParseInvalid + , test_IsVariant + ] test_Parse :: Test test_Parse = property "parse" prop where diff --git a/tests/DBusTests/Integration.hs b/tests/DBusTests/Integration.hs --- a/tests/DBusTests/Integration.hs +++ b/tests/DBusTests/Integration.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2012 John Millikin +-- Copyright (C) 2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -34,8 +34,9 @@ test_Integration :: Suite test_Integration = suite "integration" - test_Socket - test_Client + [ test_Socket + , test_Client + ] test_Socket :: Test test_Socket = withDaemon "socket" $ \addr -> do diff --git a/tests/DBusTests/InterfaceName.hs b/tests/DBusTests/InterfaceName.hs --- a/tests/DBusTests/InterfaceName.hs +++ b/tests/DBusTests/InterfaceName.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -29,9 +29,10 @@ test_InterfaceName :: Suite test_InterfaceName = suite "InterfaceName" - test_Parse - test_ParseInvalid - test_IsVariant + [ test_Parse + , test_ParseInvalid + , test_IsVariant + ] test_Parse :: Test test_Parse = property "parse" prop where diff --git a/tests/DBusTests/Introspection.hs b/tests/DBusTests/Introspection.hs --- a/tests/DBusTests/Introspection.hs +++ b/tests/DBusTests/Introspection.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -35,10 +35,11 @@ test_Introspection :: Suite test_Introspection = suite "Introspection" - test_XmlPassthrough - test_XmlParse - test_XmlParseFailed - test_XmlWriteFailed + [ test_XmlPassthrough + , test_XmlParse + , test_XmlParseFailed + , test_XmlWriteFailed + ] test_XmlPassthrough :: Test test_XmlPassthrough = property "xml-passthrough" $ \obj -> let diff --git a/tests/DBusTests/MemberName.hs b/tests/DBusTests/MemberName.hs --- a/tests/DBusTests/MemberName.hs +++ b/tests/DBusTests/MemberName.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -27,9 +27,10 @@ test_MemberName :: Suite test_MemberName = suite "MemberName" - test_Parse - test_ParseInvalid - test_IsVariant + [ test_Parse + , test_ParseInvalid + , test_IsVariant + ] test_Parse :: Test test_Parse = property "parse" prop where diff --git a/tests/DBusTests/Message.hs b/tests/DBusTests/Message.hs --- a/tests/DBusTests/Message.hs +++ b/tests/DBusTests/Message.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2012 John Millikin +-- Copyright (C) 2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -23,7 +23,8 @@ test_Message :: Suite test_Message = suite "Message" - test_MethodErrorMessage + [ test_MethodErrorMessage + ] test_MethodErrorMessage :: Test test_MethodErrorMessage = assertions "methodErrorMessage" $ do diff --git a/tests/DBusTests/ObjectPath.hs b/tests/DBusTests/ObjectPath.hs --- a/tests/DBusTests/ObjectPath.hs +++ b/tests/DBusTests/ObjectPath.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -27,8 +27,9 @@ test_ObjectPath :: Suite test_ObjectPath = suite "ObjectPath" - test_Parse - test_ParseInvalid + [ test_Parse + , test_ParseInvalid + ] test_Parse :: Test test_Parse = property "parse" prop where diff --git a/tests/DBusTests/Serialization.hs b/tests/DBusTests/Serialization.hs --- a/tests/DBusTests/Serialization.hs +++ b/tests/DBusTests/Serialization.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -43,10 +43,11 @@ test_Serialization :: Suite test_Serialization = suite "Serialization" - test_MethodCall - test_MethodReturn - test_MethodError - test_Signal + [ test_MethodCall + , test_MethodReturn + , test_MethodError + , test_Signal + ] test_MethodCall :: Test test_MethodCall = property "MethodCall" prop where diff --git a/tests/DBusTests/Signature.hs b/tests/DBusTests/Signature.hs --- a/tests/DBusTests/Signature.hs +++ b/tests/DBusTests/Signature.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -27,12 +27,13 @@ test_Signature :: Suite test_Signature = suite "Signature" - test_BuildSignature - test_ParseSignature - test_ParseInvalid - test_FormatSignature - test_IsAtom - test_ShowType + [ test_BuildSignature + , test_ParseSignature + , test_ParseInvalid + , test_FormatSignature + , test_IsAtom + , test_ShowType + ] test_BuildSignature :: Test test_BuildSignature = property "signature" prop where diff --git a/tests/DBusTests/Socket.hs b/tests/DBusTests/Socket.hs --- a/tests/DBusTests/Socket.hs +++ b/tests/DBusTests/Socket.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2012 John Millikin +-- Copyright (C) 2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -32,9 +32,10 @@ test_Socket :: Suite test_Socket = suite "Socket" - test_Listen - test_ListenWith_CustomAuth - test_SendReceive + [ test_Listen + , test_ListenWith_CustomAuth + , test_SendReceive + ] test_Listen :: Test test_Listen = assertions "listen" $ do diff --git a/tests/DBusTests/Transport.hs b/tests/DBusTests/Transport.hs --- a/tests/DBusTests/Transport.hs +++ b/tests/DBusTests/Transport.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2012 John Millikin +-- Copyright (C) 2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -37,29 +37,31 @@ import DBusTests.Util test_Transport :: Suite -test_Transport = suite "Transport" - test_TransportOpen - test_TransportListen - test_TransportAccept - test_TransportSendReceive - test_HandleLostConnection +test_Transport = suite "Transport" $ + suiteTests suite_TransportOpen ++ + suiteTests suite_TransportListen ++ + suiteTests suite_TransportAccept ++ + [ test_TransportSendReceive + , test_HandleLostConnection + ] -test_TransportOpen :: Suite -test_TransportOpen = suite "transportOpen" - test_OpenUnknown - test_OpenUnix - test_OpenTcp +suite_TransportOpen :: Suite +suite_TransportOpen = suite "transportOpen" $ + [ test_OpenUnknown + ] ++ suiteTests suite_OpenUnix + ++ suiteTests suite_OpenTcp -test_TransportListen :: Suite -test_TransportListen = suite "transportListen" - test_ListenUnknown - test_ListenUnix - test_ListenTcp +suite_TransportListen :: Suite +suite_TransportListen = suite "transportListen" $ + [ test_ListenUnknown + ] ++ suiteTests suite_ListenUnix + ++ suiteTests suite_ListenTcp -test_TransportAccept :: Suite -test_TransportAccept = suite "transportAccept" - test_AcceptSocket - test_AcceptSocketClosed +suite_TransportAccept :: Suite +suite_TransportAccept = suite "transportAccept" + [ test_AcceptSocket + , test_AcceptSocketClosed + ] test_OpenUnknown :: Test test_OpenUnknown = assertions "unknown" $ do @@ -70,13 +72,14 @@ }) (transportOpen socketTransportOptions addr) -test_OpenUnix :: Suite -test_OpenUnix = suite "unix" - test_OpenUnix_Path - test_OpenUnix_Abstract - test_OpenUnix_TooFew - test_OpenUnix_TooMany - test_OpenUnix_NotListening +suite_OpenUnix :: Suite +suite_OpenUnix = suite "unix" + [ test_OpenUnix_Path + , test_OpenUnix_Abstract + , test_OpenUnix_TooFew + , test_OpenUnix_TooMany + , test_OpenUnix_NotListening + ] test_OpenUnix_Path :: Test test_OpenUnix_Path = assertions "path" $ do @@ -150,15 +153,16 @@ fdcountAfter <- countFileDescriptors $assert (equal fdcountBefore fdcountAfter) -test_OpenTcp :: Suite -test_OpenTcp = suite "tcp" - test_OpenTcp_IPv4 - (skipWhen noIPv6 test_OpenTcp_IPv6) - test_OpenTcp_Unknown - test_OpenTcp_NoPort - test_OpenTcp_InvalidPort - test_OpenTcp_NoUsableAddresses - test_OpenTcp_NotListening +suite_OpenTcp :: Suite +suite_OpenTcp = suite "tcp" + [ test_OpenTcp_IPv4 + , skipWhen noIPv6 test_OpenTcp_IPv6 + , test_OpenTcp_Unknown + , test_OpenTcp_NoPort + , test_OpenTcp_InvalidPort + , test_OpenTcp_NoUsableAddresses + , test_OpenTcp_NotListening + ] test_OpenTcp_IPv4 :: Test test_OpenTcp_IPv4 = assertions "ipv4" $ do @@ -331,14 +335,15 @@ }) (transportListen socketTransportOptions addr) -test_ListenUnix :: Suite -test_ListenUnix = suite "unix" - test_ListenUnix_Path - test_ListenUnix_Abstract - test_ListenUnix_Tmpdir - test_ListenUnix_TooFew - test_ListenUnix_TooMany - test_ListenUnix_InvalidBind +suite_ListenUnix :: Suite +suite_ListenUnix = suite "unix" + [ test_ListenUnix_Path + , test_ListenUnix_Abstract + , test_ListenUnix_Tmpdir + , test_ListenUnix_TooFew + , test_ListenUnix_TooMany + , test_ListenUnix_InvalidBind + ] test_ListenUnix_Path :: Test test_ListenUnix_Path = assertions "path" $ do @@ -419,13 +424,14 @@ fdcountAfter <- countFileDescriptors $assert (equal fdcountBefore fdcountAfter) -test_ListenTcp :: Suite -test_ListenTcp = suite "tcp" - test_ListenTcp_IPv4 - (skipWhen noIPv6 test_ListenTcp_IPv6) - test_ListenTcp_Unknown - test_ListenTcp_InvalidPort - test_ListenTcp_InvalidBind +suite_ListenTcp :: Suite +suite_ListenTcp = suite "tcp" + [ test_ListenTcp_IPv4 + , skipWhen noIPv6 test_ListenTcp_IPv6 + , test_ListenTcp_Unknown + , test_ListenTcp_InvalidPort + , test_ListenTcp_InvalidBind + ] test_ListenTcp_IPv4 :: Test test_ListenTcp_IPv4 = assertions "ipv4" $ do diff --git a/tests/DBusTests/Util.hs b/tests/DBusTests/Util.hs --- a/tests/DBusTests/Util.hs +++ b/tests/DBusTests/Util.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by diff --git a/tests/DBusTests/Variant.hs b/tests/DBusTests/Variant.hs --- a/tests/DBusTests/Variant.hs +++ b/tests/DBusTests/Variant.hs @@ -1,6 +1,6 @@ {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2010-2012 John Millikin +-- Copyright (C) 2010-2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -38,10 +38,11 @@ test_Variant :: Suite test_Variant = suite "Variant" - test_IsAtom - test_IsValue - test_Show - test_ByteStorage + [ test_IsAtom + , test_IsValue + , test_Show + , test_ByteStorage + ] test_IsAtom :: Test test_IsAtom = assertions "IsAtom" $ do diff --git a/tests/DBusTests/Wire.hs b/tests/DBusTests/Wire.hs --- a/tests/DBusTests/Wire.hs +++ b/tests/DBusTests/Wire.hs @@ -1,7 +1,7 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE TemplateHaskell #-} --- Copyright (C) 2012 John Millikin +-- Copyright (C) 2012 John Millikin -- -- This program is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by @@ -25,12 +25,13 @@ import DBus test_Wire :: Suite -test_Wire = suite "Wire" - test_Unmarshal +test_Wire = suite "Wire" $ + suiteTests test_Unmarshal test_Unmarshal :: Suite test_Unmarshal = suite "unmarshal" - test_UnmarshalUnexpectedEof + [ test_UnmarshalUnexpectedEof + ] test_UnmarshalUnexpectedEof :: Test test_UnmarshalUnexpectedEof = assertions "unexpected-eof" $ do