> Oh, no, as you can see from the patch itself, CPP is not used anymore.
> Should I send a fixed patch with the modified comment, or can you fix it
> while pushing it?
> Thanks,
> Michele
> On Tue, Nov 13, 2012 at 10:43 AM, Iustin Pop <ius...@google.com> wrote:
>> On Fri, Nov 09, 2012 at 04:48:21PM +0100, Michele Tartara wrote:
>> > Attoparsec is known to have had issues with parsing non-ASCII strings.
>> > This test makes sure that parsing of Unicode characters works fine.
>> > Also, added language extension CPP to test.hs, to allow it to load
>> > the attoparsec tests only if the attoparsec library is actually
>> > installed.
On Tue, Nov 13, 2012 at 10:52:55AM +0100, Iustin Pop wrote:
> On Tue, Nov 13, 2012 at 10:46:35AM +0100, Michele Tartara wrote:
> > List added back
> > On Tue, Nov 13, 2012 at 10:46 AM, Michele Tartara <mtart...@google.com>wrote:
> > > Oh, no, as you can see from the patch itself, CPP is not used anymore.
> > > Should I send a fixed patch with the modified comment, or can you fix it
> > > while pushing it?
> I'll fix while pushing. Just asking for confirmation :)
> LGTM & thanks,
Actually I was too careless, there are a few code style issues, and one
actual code bug in your test code.
Style issues:
- trailing whitespace; please configure your editor appropriately
- missing docstrings; we do want docstrings even on constants (e.g.
"Unicode test string, first part.", "Unicode test string, second
part.")
And to the code bug: never, ever "let (Right foo) = …". This will lead
to a runtime error, which is a big no-no. You should always deconstruct
via case:
case A.parseOnly simpleParser … of
Right y -> …
Left msg -> failTest $ "Failed to parse: " ++ msg
As a side-comment, defining a separate type (SplitString) just for one
use seems over doing it. I personally would just return a tuple (String,
String) from simpleParser…
On Tue, Nov 13, 2012 at 11:00 AM, Iustin Pop <ius...@google.com> wrote:
> On Tue, Nov 13, 2012 at 10:52:55AM +0100, Iustin Pop wrote:
> > On Tue, Nov 13, 2012 at 10:46:35AM +0100, Michele Tartara wrote:
> > > List added back
> > > On Tue, Nov 13, 2012 at 10:46 AM, Michele Tartara <mtart...@google.com
> >wrote:
> > > > Oh, no, as you can see from the patch itself, CPP is not used
> anymore.
> > > > Should I send a fixed patch with the modified comment, or can you
> fix it
> > > > while pushing it?
> > I'll fix while pushing. Just asking for confirmation :)
> > LGTM & thanks,
> Actually I was too careless, there are a few code style issues, and one
> actual code bug in your test code.
> Style issues:
> - trailing whitespace; please configure your editor appropriately
> - missing docstrings; we do want docstrings even on constants (e.g.
> "Unicode test string, first part.", "Unicode test string, second
> part.")
> And to the code bug: never, ever "let (Right foo) = …". This will lead
> to a runtime error, which is a big no-no. You should always deconstruct
> via case:
> case A.parseOnly simpleParser … of
> Right y -> …
> Left msg -> failTest $ "Failed to parse: " ++ msg
> As a side-comment, defining a separate type (SplitString) just for one
> use seems over doing it. I personally would just return a tuple (String,
> String) from simpleParser…
On Tue, Nov 13, 2012 at 11:00:55AM +0100, Iustin Pop wrote:
> On Tue, Nov 13, 2012 at 10:52:55AM +0100, Iustin Pop wrote:
> > On Tue, Nov 13, 2012 at 10:46:35AM +0100, Michele Tartara wrote:
> > > List added back
> > > On Tue, Nov 13, 2012 at 10:46 AM, Michele Tartara <mtart...@google.com>wrote:
> > > > Oh, no, as you can see from the patch itself, CPP is not used anymore.
> > > > Should I send a fixed patch with the modified comment, or can you fix it
> > > > while pushing it?
> > I'll fix while pushing. Just asking for confirmation :)
> > LGTM & thanks,
> Actually I was too careless, there are a few code style issues, and one
> actual code bug in your test code.
> Style issues:
> - trailing whitespace; please configure your editor appropriately
> - missing docstrings; we do want docstrings even on constants (e.g.
> "Unicode test string, first part.", "Unicode test string, second
> part.")
> And to the code bug: never, ever "let (Right foo) = …". This will lead
> to a runtime error, which is a big no-no. You should always deconstruct
> via case:
> case A.parseOnly simpleParser … of
> Right y -> …
> Left msg -> failTest $ "Failed to parse: " ++ msg
FYI, this would be detected and enforced by the compiler, but we're
still supporting ghc 6.12, whereas this flag appeared only in 7.2. Me
wants newer compilers!!
Hmmm, I wonder if I can't change the build system to detect this and
enable this (not-automatically enable-able via -Wall) flag…
HS_TEST_SRCS = \
+ htest/Test/Ganeti/Attoparsec.hs \
htest/Test/Ganeti/BasicTypes.hs \
htest/Test/Ganeti/Common.hs \
htest/Test/Ganeti/Confd/Utils.hs \
diff --git a/htest/Test/Ganeti/Attoparsec.hs b/htest/Test/Ganeti/Attoparsec.hs
new file mode 100644
index 0000000..14ddd9c
--- /dev/null
+++ b/htest/Test/Ganeti/Attoparsec.hs
@@ -0,0 +1,69 @@
+{-# LANGUAGE TemplateHaskell #-}
+
+{-| Unittests for Attoparsec support for unicode -}
+
+{-
+
+Copyright (C) 2009, 2010, 2011, 2012 Google Inc.
+
+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
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
+
+-}
+
+module Test.Ganeti.Attoparsec (testAttoparsec) where
+
+
+import Test.QuickCheck
+
+import Test.Ganeti.TestHelper
+import Test.Ganeti.TestCommon
+
+import qualified Data.Attoparsec.Text as A
+import Data.Attoparsec.Text (Parser)
+import Data.Text (pack, unpack)
+
+
+{-| Unicode test string, first part -}
+part1 :: String
+part1 = "äßĉ"
+
+{-| Unicode test string, second part -}
+part2 :: String
+part2 = "ščق"
+
+
+{-| Simple parser able to split a string in two parts, name and value,
+ separated by a '=' sign -}
+simpleParser :: Parser (String, String)
+simpleParser = do
+ n <- A.takeTill (\c -> A.isHorizontalSpace c || c == '=')
+ A.skipWhile A.isHorizontalSpace
+ _ <- A.char '='
+ A.skipWhile A.isHorizontalSpace
+ v <- A.takeTill A.isEndOfLine
+ return (unpack n, unpack v)
+
+
+-- | Tests whether a Unicode string is still Unicode after being parsed
+prop_parserSupportsUnicode :: Property
+prop_parserSupportsUnicode = case A.parseOnly simpleParser text of
+ Right (name, value) -> (name ==? part1) .&&. (value ==? part2)
+ Left msg -> failTest $ "Failed to parse: " ++ msg
+ where text = Data.Text.pack $ part1 ++ " = \t" ++ part2
+
+testSuite "Attoparsec"
+ [ 'prop_parserSupportsUnicode
+ ]
diff --git a/htest/test.hs b/htest/test.hs
index 5180878..b41fb99 100644
--- a/htest/test.hs
+++ b/htest/test.hs
@@ -30,6 +30,7 @@ import Test.Framework
import System.Environment (getArgs)
On Tue, Nov 13, 2012 at 12:31:13PM +0100, Michele Tartara wrote:
> Attoparsec is known to have had issues with parsing non-ASCII strings.
> This test makes sure that parsing of Unicode characters works fine.
LGTM, thanks. I'll push with just some trivial docstring/style changes.
On Tue, Nov 13, 2012 at 12:39 PM, Iustin Pop <ius...@google.com> wrote:
> On Tue, Nov 13, 2012 at 12:31:13PM +0100, Michele Tartara wrote:
> > Attoparsec is known to have had issues with parsing non-ASCII strings.
> > This test makes sure that parsing of Unicode characters works fine.
> LGTM, thanks. I'll push with just some trivial docstring/style changes.