Move old shorthands test into margin test. Add a few general tests.

svn path=/trunk/libcss/; revision=8047

3 files changed, 84 insertions, 61 deletions

diff --git a/test/data/parse2/margin.dat b/test/data/parse2/margin.dat
index f4b3754..287eb62 100644
--- a/test/data/parse2/margin.dat
+++ b/test/data/parse2/margin.dat
@@ -1,4 +1,66 @@
 #data
+* { margin: 0 0 0 0; }
+#errors
+#expected
+| *
+|  margin-top: 0px
+|  margin-right: 0px
+|  margin-bottom: 0px
+|  margin-left: 0px
+#reset
+
+#data
+* { margin: 2em; }
+#errors
+#expected
+| *
+|  margin-top: 2em
+|  margin-right: 2em
+|  margin-bottom: 2em
+|  margin-left: 2em
+#reset
+
+#data
+* { margin: 2em auto; }
+#errors
+#expected
+| *
+|  margin-top: 2em
+|  margin-right: auto
+|  margin-bottom: 2em
+|  margin-left: auto
+#reset
+
+#data
+* { margin: 10% 5px -4em -50%; }
+#errors
+#expected
+| *
+|  margin-top: 10%
+|  margin-right: 5px
+|  margin-bottom: -4em
+|  margin-left: -50%
+#reset
+
+#data
+* { margin: 10% 5px -4em; }
+#errors
+#expected
+| *
+|  margin-top: 10%
+|  margin-right: 5px
+|  margin-bottom: -4em
+|  margin-left: 5px
+#reset
+
+#data
+* { margin: 10% 5px "Hello!" -4em; }
+#errors
+#expected
+| *
+#reset
+
+#data
 * { margin: auto; }
 #errors
 #expected
diff --git a/test/data/parse2/shorthands.dat b/test/data/parse2/shorthands.dat
deleted file mode 100644
index 0705f13..0000000
--- a/test/data/parse2/shorthands.dat
+++ /dev/null
@@ -1,61 +0,0 @@
-#data
-* { margin: 0 0 0 0; }
-#errors
-#expected
-| *
-|  margin-top: 0
-|  margin-right: 0
-|  margin-bottom: 0
-|  margin-left: 0
-#reset
-
-#data
-* { margin: 2em; }
-#errors
-#expected
-| *
-|  margin-top: 2em
-|  margin-right: 2em
-|  margin-bottom: 2em
-|  margin-left: 2em
-#reset
-
-#data
-* { margin: 2em auto; }
-#errors
-#expected
-| *
-|  margin-top: 2em
-|  margin-right: auto
-|  margin-bottom: 2em
-|  margin-left: auto
-#reset
-
-#data
-* { margin: 10% 5px -4em -50%; }
-#errors
-#expected
-| *
-|  margin-top: 10%
-|  margin-right: 5px
-|  margin-bottom: -4em
-|  margin-left: -50%
-#reset
-
-#data
-* { margin: 10% 5px -4em; }
-#errors
-#expected
-| *
-|  margin-top: 10%
-|  margin-right: 5px
-|  margin-bottom: -4em
-|  margin-left: 5px
-#reset
-
-#data
-* { margin: 10% 5px "Hello!" -4em; }
-#errors
-#expected
-| *
-#reset
\ No newline at end of file
diff --git a/test/data/parse2/tests1.dat b/test/data/parse2/tests1.dat
index 9f96edd..c1bfe6e 100644
--- a/test/data/parse2/tests1.dat
+++ b/test/data/parse2/tests1.dat
@@ -22,6 +22,28 @@
 #reset
 
 #data
+* { cursor: inherit }
+#errors
+#expected
+| *
+|  cursor: inherit
+#reset
+
+#data
+* { cursor: text inherit }
+#errors
+#expected
+| *
+#reset
+
+#data
+* { cursor: inherit auto }
+#errors
+#expected
+| *
+#reset
+
+#data
 * { background-image: url("foo.png"); color: inherit }
 #errors
 #expected