From 183633a379cb8f058f7b398d90ff39d4fa154c01 Mon Sep 17 00:00:00 2001 From: rbasso Date: Sun, 12 Mar 2017 15:08:33 +0900 Subject: [PATCH 1/3] two-bucket: Add descriptions to the tests These are not the most creative descriptions, but they are needed for compliant with the new JSON schema. --- exercises/two-bucket/canonical-data.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/exercises/two-bucket/canonical-data.json b/exercises/two-bucket/canonical-data.json index e43718604e..003df977a0 100644 --- a/exercises/two-bucket/canonical-data.json +++ b/exercises/two-bucket/canonical-data.json @@ -2,6 +2,7 @@ "two_bucket": { "cases": [ { + "description": "(3, 5) -> 1, starting with the first bucket", "bucket_one": 3, "bucket_two": 5, "goal": 1, @@ -13,6 +14,7 @@ } }, { + "description": "(3, 5) -> 1, starting with the second bucket", "bucket_one": 3, "bucket_two": 5, "goal": 1, @@ -24,6 +26,7 @@ } }, { + "description": "(7, 11) -> 2, starting with the first bucket", "bucket_one": 7, "bucket_two": 11, "goal": 2, @@ -35,6 +38,7 @@ } }, { + "description": "(7, 11) -> 2, starting with the second bucket", "bucket_one": 7, "bucket_two": 11, "goal": 2, From f7d83c67a6d2b7242facca88d3c8ad8d201748a8 Mon Sep 17 00:00:00 2001 From: rbasso Date: Sun, 12 Mar 2017 15:18:20 +0900 Subject: [PATCH 2/3] two-bucket: Make canonical-data.json compliant --- exercises/two-bucket/canonical-data.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/exercises/two-bucket/canonical-data.json b/exercises/two-bucket/canonical-data.json index 003df977a0..1f7ffcfa50 100644 --- a/exercises/two-bucket/canonical-data.json +++ b/exercises/two-bucket/canonical-data.json @@ -1,8 +1,10 @@ { - "two_bucket": { + "exercise": "two-buckets", + "version": "1.0.0", "cases": [ { "description": "(3, 5) -> 1, starting with the first bucket", + "property": "measure", "bucket_one": 3, "bucket_two": 5, "goal": 1, @@ -15,6 +17,7 @@ }, { "description": "(3, 5) -> 1, starting with the second bucket", + "property": "measure", "bucket_one": 3, "bucket_two": 5, "goal": 1, @@ -27,6 +30,7 @@ }, { "description": "(7, 11) -> 2, starting with the first bucket", + "property": "measure", "bucket_one": 7, "bucket_two": 11, "goal": 2, @@ -39,6 +43,7 @@ }, { "description": "(7, 11) -> 2, starting with the second bucket", + "property": "measure", "bucket_one": 7, "bucket_two": 11, "goal": 2, @@ -50,5 +55,4 @@ } } ] - } } From 525bddd7bd329e209952b29391c469b090f69214 Mon Sep 17 00:00:00 2001 From: rbasso Date: Sun, 12 Mar 2017 15:19:11 +0900 Subject: [PATCH 3/3] two-bucket: Fix canonical-data.json formatting --- exercises/two-bucket/canonical-data.json | 108 +++++++++++------------ 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/exercises/two-bucket/canonical-data.json b/exercises/two-bucket/canonical-data.json index 1f7ffcfa50..66d435de9a 100644 --- a/exercises/two-bucket/canonical-data.json +++ b/exercises/two-bucket/canonical-data.json @@ -1,58 +1,58 @@ { "exercise": "two-buckets", "version": "1.0.0", - "cases": [ - { - "description": "(3, 5) -> 1, starting with the first bucket", - "property": "measure", - "bucket_one": 3, - "bucket_two": 5, - "goal": 1, - "start_bucket": "one", - "expected": { - "moves": 4, - "goal_bucket": "one", - "other_bucket": 5 - } - }, - { - "description": "(3, 5) -> 1, starting with the second bucket", - "property": "measure", - "bucket_one": 3, - "bucket_two": 5, - "goal": 1, - "start_bucket": "two", - "expected": { - "moves": 8, - "goal_bucket": "two", - "other_bucket": 3 - } - }, - { - "description": "(7, 11) -> 2, starting with the first bucket", - "property": "measure", - "bucket_one": 7, - "bucket_two": 11, - "goal": 2, - "start_bucket": "one", - "expected": { - "moves": 14, - "goal_bucket": "one", - "other_bucket": 11 - } - }, - { - "description": "(7, 11) -> 2, starting with the second bucket", - "property": "measure", - "bucket_one": 7, - "bucket_two": 11, - "goal": 2, - "start_bucket": "two", - "expected": { - "moves": 18, - "goal_bucket": "two", - "other_bucket": 7 - } - } - ] + "cases": [ + { + "description": "(3, 5) -> 1, starting with the first bucket", + "property": "measure", + "bucket_one": 3, + "bucket_two": 5, + "goal": 1, + "start_bucket": "one", + "expected": { + "moves": 4, + "goal_bucket": "one", + "other_bucket": 5 + } + }, + { + "description": "(3, 5) -> 1, starting with the second bucket", + "property": "measure", + "bucket_one": 3, + "bucket_two": 5, + "goal": 1, + "start_bucket": "two", + "expected": { + "moves": 8, + "goal_bucket": "two", + "other_bucket": 3 + } + }, + { + "description": "(7, 11) -> 2, starting with the first bucket", + "property": "measure", + "bucket_one": 7, + "bucket_two": 11, + "goal": 2, + "start_bucket": "one", + "expected": { + "moves": 14, + "goal_bucket": "one", + "other_bucket": 11 + } + }, + { + "description": "(7, 11) -> 2, starting with the second bucket", + "property": "measure", + "bucket_one": 7, + "bucket_two": 11, + "goal": 2, + "start_bucket": "two", + "expected": { + "moves": 18, + "goal_bucket": "two", + "other_bucket": 7 + } + } + ] }