3 files changed, 114 insertions, 1 deletions
diff --git a/test/INDEX b/test/INDEX
index d6a2cb4..68ee7cd 100644
--- a/test/INDEX
+++ b/test/INDEX
@@ -11,7 +11,7 @@ parse		Parsing (core syntax)			css
 css21		Parsing (CSS2.1 specifics)		css
 parse-auto	Automated parser tests (bytecode)	parse
 parse2-auto	Automated parser tests (om & invalid)	parse2
-select-auto	Automated selection engine tests	select
+#select-auto	Automated selection engine tests	select
 
 # Regression tests
 
diff --git a/test/data/parse2/INDEX b/test/data/parse2/INDEX
index dccd832..a90de89 100644
--- a/test/data/parse2/INDEX
+++ b/test/data/parse2/INDEX
@@ -10,3 +10,4 @@ illegal-values.dat		Illegal value tests
 malformed-declarations.dat	Malformed declaration tests
 unknown-properties.dat		Unknown property tests
 bgpos.dat			Illegal background-position values
+margin.dat			Margin shorthand tests
diff --git a/test/data/parse2/margin.dat b/test/data/parse2/margin.dat
new file mode 100644
index 0000000..e78ad4c
--- /dev/null
+++ b/test/data/parse2/margin.dat
@@ -0,0 +1,112 @@
+#data
+* { margin: auto; }
+#errors
+#expected
+| *
+|  margin-top: auto
+|  margin-right: auto
+|  margin-bottom: auto
+|  margin-left: auto
+#reset
+
+#data
+* { margin: auto auto; }
+#errors
+#expected
+| *
+|  margin-top: auto
+|  margin-right: auto
+|  margin-bottom: auto
+|  margin-left: auto
+#reset
+
+#data
+* { margin: auto auto 0; }
+#errors
+#expected
+| *
+|  margin-top: auto
+|  margin-right: auto
+|  margin-bottom: 0
+|  margin-left: auto
+#reset
+
+#data
+* { margin: auto auto 10px 0; }
+#errors
+#expected
+| *
+|  margin-top: 
+|  margin-right: 
+|  margin-bottom: 
+|  margin-left: 
+#reset
+
+
+#data
+* { margin: auto !important; }
+#errors
+#expected
+| *
+|  margin-top: auto !important
+|  margin-right: auto !important
+|  margin-bottom: auto !important
+|  margin-left: auto !important
+#reset
+
+#data
+* { margin: auto auto !important; }
+#errors
+#expected
+| *
+|  margin-top: auto !important
+|  margin-right: auto !important
+|  margin-bottom: auto !important
+|  margin-left: auto !important
+#reset
+
+#data
+* { margin: auto auto 0 !important; }
+#errors
+#expected
+| *
+|  margin-top: auto !important
+|  margin-right: auto !important
+|  margin-bottom: 0 !important
+|  margin-left: auto !important
+#reset
+
+#data
+* { margin: auto auto 10px 0 !important; }
+#errors
+#expected
+| *
+|  margin-top: auto !important
+|  margin-right: auto !important
+|  margin-bottom: 10px !important
+|  margin-left: 0 !important
+#reset
+
+
+#data
+* { margin: invalid; }
+#errors
+#expected
+| *
+#reset
+
+#data
+* { margin: ; }
+#errors
+#expected
+| *
+#reset
+
+#data
+* { margin:}
+#errors
+#expected
+| *
+#reset
+
+