update backend tests for 1.0 release

diagrams · Jan 17, 2014 · de312c3 · de312c3
1 parent bc5465b
commit de312c3
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 20 deletions.
diff --git a/diagrams-backend-tests.cabal b/diagrams-backend-tests.cabal
@@ -30,11 +30,11 @@ Executable all-test
                        directory,
                        filepath,
                        process,
-                       diagrams-core >= 0.6 && < 0.8,
-                       diagrams-lib >= 0.6 && < 0.8,
-                       diagrams-cairo >= 0.6 && < 0.8,
-                       diagrams-svg >= 0.6 && < 0.9,
-                       diagrams-postscript >= 0.6 && < 0.8,
+                       diagrams-core >= 1.0 && < 1.1,
+                       diagrams-lib >= 1.0 && < 1.1,
+                       diagrams-cairo >= 1.0 && < 1.1,
+                       diagrams-svg >= 1.0 && < 1.1,
+                       diagrams-postscript >= 1.0 && < 1.1,
                        blaze-svg >= 0.3.3 && < 0.4,
                        bytestring >= 0.9  && < 0.11
      buildable: True
@@ -57,9 +57,9 @@ Executable cairo-test
                        html >= 1.0.1.2 && < 2.0,
                        directory,
                        filepath,
-                       diagrams-core >= 0.6 && < 0.8,
-                       diagrams-lib >= 0.6 && < 0.8,
-                       diagrams-cairo >= 0.6 && < 0.8
+                       diagrams-core >= 1.0 && < 1.1,
+                       diagrams-lib >= 1.0 && < 1.1,
+                       diagrams-cairo >= 1.0 && < 1.1
      buildable: True
    else
      Build-depends:    base
@@ -80,9 +80,9 @@ Executable svg-test
                        html >= 1.0.1.2 && < 2.0,
                        directory,
                        filepath,
-                       diagrams-core >= 0.6 && < 0.8,
-                       diagrams-lib >= 0.6 && < 0.8,
-                       diagrams-svg >= 0.6 && < 0.9,
+                       diagrams-core >= 1.0 && < 1.1,
+                       diagrams-lib >= 1.0 && < 1.1,
+                       diagrams-svg >= 1.0 && < 1.1,
                        blaze-svg >= 0.3.3 && < 0.4,
                        bytestring >= 0.9 && < 0.11
      buildable: True
@@ -107,8 +107,8 @@ Executable pdf-test
                        semigroups >= 0.9.2 && < 0.12,
                        HPDF >= 1.4.5 && < 1.5,
                        vector-space >= 0.8.6 && < 0.9,
-                       diagrams-lib >= 0.7 && < 0.8,
-                       diagrams-core >= 0.7 && < 0.8,
+                       diagrams-lib >= 0.7 && < 1.1,
+                       diagrams-core >= 0.7 && < 1.1,
                        filepath >= 1.3 && < 1.4,
                        split >= 0.2.2 && < 0.3,
                        cmdargs >= 0.10 && < 0.11,
@@ -138,8 +138,8 @@ Executable canvas-test
      Build-depends:    base >= 4.2 && < 4.8,
                        html >= 1.0.1.2 && < 2.0,
                        directory >= 1.0.0.0 && < 1.3,
-                       diagrams-lib >= 0.6 && < 0.8,
-                       diagrams-core >= 0.6 && < 0.8,
+                       diagrams-lib >= 1.0 && < 1.1,
+                       diagrams-core >= 1.0 && < 1.1,
                        diagrams-canvas >= 0.2 && < 0.3
      buildable: True
    else
@@ -162,9 +162,9 @@ Executable postscript-test
                        directory,
                        filepath,
                        process,
-                       diagrams-lib >= 0.6 && < 0.8,
-                       diagrams-core >= 0.6 && < 0.8,
-                       diagrams-postscript >= 0.6 && < 0.8
+                       diagrams-lib >= 1.0 && < 1.1,
+                       diagrams-core >= 1.0 && < 1.1,
+                       diagrams-postscript >= 1.0 && < 1.1
      buildable: True
    else
      Build-depends:    base

diff --git a/src/Diagrams/Tests.hs b/src/Diagrams/Tests.hs
@@ -76,7 +76,7 @@ examples =
         , Test "ellipse" $
                 unitCircle # scaleX 0.5 # rotateBy (1/6)
         , Test "arc" $
-                arc (tau/4 :: Rad) (4 * tau / 7 :: Rad)
+                arc (tau/4 @@ rad) (4 * tau / 7 @@ rad)
         , Test "Pre-defined-shapes" $
                 square 1 ||| rect 0.3 0.5 ||| eqTriangle 1 ||| roundedRect 0.7 0.4 0.1
         , Test "circle-hrule-circle" $
@@ -228,7 +228,7 @@ poly_example = (poly1 ||| strutX 1 ||| poly2) # lw 0.05
                                 & polyOrient .~ OrientV
                           )
           poly2 = polygon (with & polyType   .~ PolyPolar
-                                                  (repeat (1/40 :: Turn))
+                                                  (repeat (1/40 @@ turn))
                                                   (take 40 $ cycle [2,7,4,6])
                           )