summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDon Stewart <dons@galois.com>2008-03-22 00:40:15 +0100
committerDon Stewart <dons@galois.com>2008-03-22 00:40:15 +0100
commitf08988053ef6bbc8cc14290cac54c33e05197c2f (patch)
treecbab5f70c9d127623fcf087ee8e312eecb210834
parentdb6fce0a3d733402fab4f1fe6f5bf4ed40c6c082 (diff)
downloadmetatile-f08988053ef6bbc8cc14290cac54c33e05197c2f.tar
metatile-f08988053ef6bbc8cc14290cac54c33e05197c2f.zip
reenable quickcheck properties for layouts (no overlap, fullscreen)
darcs-hash:20080321234015-cba2c-56ead600613e43978a996f82991d6e5a6f4ca962
-rw-r--r--XMonad/Layout.hs11
-rw-r--r--tests/Properties.hs8
2 files changed, 11 insertions, 8 deletions
diff --git a/XMonad/Layout.hs b/XMonad/Layout.hs
index a7f9acb..7aca43a 100644
--- a/XMonad/Layout.hs
+++ b/XMonad/Layout.hs
@@ -15,9 +15,14 @@
--
-----------------------------------------------------------------------------
-module XMonad.Layout (ChangeLayout(..), Choose, (|||), Resize(..), IncMasterN(..),
- Full(..), Tall(..), Mirror(..), mirrorRect, splitVertically,
- splitHorizontally, splitHorizontallyBy, splitVerticallyBy) where
+module XMonad.Layout (
+ ChangeLayout(..), Choose, (|||), Resize(..), IncMasterN(..),
+ Full(..), Tall(..), Mirror(..), mirrorRect, splitVertically,
+ splitHorizontally, splitHorizontallyBy, splitVerticallyBy,
+
+ tile
+
+ ) where
import XMonad.Core
diff --git a/tests/Properties.hs b/tests/Properties.hs
index 6135792..49b09fe 100644
--- a/tests/Properties.hs
+++ b/tests/Properties.hs
@@ -2,6 +2,7 @@
module Properties where
import XMonad.StackSet hiding (filter)
+import XMonad.Layout
import qualified XMonad.StackSet as S (filter)
import Debug.Trace
@@ -656,8 +657,8 @@ prop_mapLayoutInverse (x::T) = x == mapLayout pred (mapLayout succ x)
-- some properties for layouts:
-- 1 window should always be tiled fullscreen
-{-
prop_tile_fullscreen rect = tile pct rect 1 1 == [rect]
+ where pct = 1/2
-- multiple windows
prop_tile_non_overlap rect windows nmaster = noOverlaps (tile pct rect nmaster windows)
@@ -679,8 +680,6 @@ noOverlaps xs = and [ verts a `notOverlap` verts b
= (top1 < bottom2 || top2 < bottom1)
|| (right1 < left2 || right2 < left1)
--}
-
------------------------------------------------------------------------
main :: IO ()
@@ -808,10 +807,9 @@ main = do
-- renaming
-{-
,("tile 1 window fullsize", mytest prop_tile_fullscreen)
,("tiles never overlap", mytest prop_tile_non_overlap)
--}
+
]