colors: merge colors.constants and colors.hex.

[factor.git] / basis / colors / mix / mix-tests.factor

diff --git a/basis/colors/mix/mix-tests.factor b/basis/colors/mix/mix-tests.factor
index ccddab02dd2746d78b82999da95200d4db06d110..34e4702eec536ca6169995c22ec327bd27c13804 100644 (file)
--- a/basis/colors/mix/mix-tests.factor
+++ b/basis/colors/mix/mix-tests.factor
@@ -1,11 +1,29 @@
-USING: colors.constants colors.mix kernel tools.test ;
+USING: colors colors.mix kernel tools.test ;
 
-{ COLOR: blue } [ COLOR: blue COLOR: red 0.0 linear-gradient ] unit-test
-{ COLOR: red } [ COLOR: blue COLOR: red 1.0 linear-gradient ] unit-test
+{ t } [
+    COLOR: blue COLOR: red 0.0 linear-gradient
+    COLOR: blue color=
+] unit-test
 
-{ COLOR: blue } [ { COLOR: blue COLOR: red COLOR: green } 0.0 sample-linear-gradient ] unit-test
-{ COLOR: red } [ { COLOR: blue COLOR: red COLOR: green } 0.5 sample-linear-gradient ] unit-test
-{ COLOR: green } [ { COLOR: blue COLOR: red COLOR: green } 1.0 sample-linear-gradient ] unit-test
+{ t } [
+    COLOR: blue COLOR: red 1.0 linear-gradient
+    COLOR: red color=
+] unit-test
+
+{ t } [
+    { COLOR: blue COLOR: red COLOR: green } 0.0 sample-linear-gradient
+    COLOR: blue color=
+] unit-test
+
+{ t } [
+    { COLOR: blue COLOR: red COLOR: green } 0.5 sample-linear-gradient
+    COLOR: red color=
+] unit-test
+
+{ t } [
+    { COLOR: blue COLOR: red COLOR: green } 1.0 sample-linear-gradient
+    COLOR: green color=
+] unit-test
 
 { t } [
     { COLOR: blue COLOR: red } 0.5 sample-linear-gradient