From 45566243a30b403c2a117a8c3a93bfd643d9e4b3 Mon Sep 17 00:00:00 2001 From: Iustin Pop Date: Tue, 15 Jan 2013 17:24:43 +0100 Subject: [PATCH 1/1] Remove special-case of "0" in niceSort Since now niceSort is more consistently behaved, we don't have the special casing. This should have been removed in commit a7f0953a, but I didn't realise it. Signed-off-by: Iustin Pop Reviewed-by: Guido Trotter --- test/hs/Test/Ganeti/Utils.hs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/test/hs/Test/Ganeti/Utils.hs b/test/hs/Test/Ganeti/Utils.hs index 38370cb..2385e71 100644 --- a/test/hs/Test/Ganeti/Utils.hs +++ b/test/hs/Test/Ganeti/Utils.hs @@ -7,7 +7,7 @@ {- -Copyright (C) 2009, 2010, 2011, 2012 Google Inc. +Copyright (C) 2009, 2010, 2011, 2012, 2013 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 @@ -162,16 +162,13 @@ case_niceSort_static = do "cPRi0lM7HLnSuWA2G9", "KVQqLPDjcPjf8T3oyzjcOsfkb", "guKJkXnkULealVC8CyF1xefym", "pqF8dkU5B1cMnyZuREaSOADYx"] --- | Tests single-string behaviour of 'niceSort'. Last test is special --- in the sense that /0/ is before any other non-empty string (except --- itself, etc.). +-- | Tests single-string behaviour of 'niceSort'. prop_niceSort_single :: Property prop_niceSort_single = forAll genName $ \name -> conjoin [ printTestCase "single string" $ [name] ==? niceSort [name] , printTestCase "single plus empty" $ ["", name] ==? niceSort [name, ""] - , printTestCase "single plus 0-digit" $ ["0", name] ==? niceSort [name, "0"] ] -- | Tests some generic 'niceSort' properties. Note that the last test -- 1.7.10.4