From aaa47eef1af516f96cdffc0aa23b63e06367c6fd Mon Sep 17 00:00:00 2001 From: rbasso Date: Tue, 7 Mar 2017 20:47:30 +0900 Subject: [PATCH 1/3] sum-of-multiples: Add descriptions to tests The new JSON Schema for 'canonical-data.json' files demands that all tests have descriptions, so that users can know where they failed. These descriptions may not be the best possible, as they only explain what are the tests - and not why they are there - but they are needed for compliance. --- exercises/sum-of-multiples/canonical-data.json | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/exercises/sum-of-multiples/canonical-data.json b/exercises/sum-of-multiples/canonical-data.json index 48f37c0c8c..de5dd14fb6 100644 --- a/exercises/sum-of-multiples/canonical-data.json +++ b/exercises/sum-of-multiples/canonical-data.json @@ -1,61 +1,73 @@ { "cases": [ { + "description": "multiples of 3 or 5 up to 1", "factors": [3, 5], "limit": 1, "expected": 0 }, { + "description": "multiples of 3 or 5 up to 4", "factors": [3, 5], "limit": 4, "expected": 3 }, { + "description": "multiples of 3 or 5 up to 10", "factors": [3, 5], "limit": 10, "expected": 23 }, { + "description": "multiples of 3 or 5 up to 100", "factors": [3, 5], "limit": 100, "expected": 2318 }, { + "description": "multiples of 3 or 5 up to 1000", "factors": [3, 5], "limit": 1000, "expected": 233168 }, { + "description": "multiples of 7, 13 or 17 up to 20", "factors": [7, 13, 17], "limit": 20, "expected": 51 }, { + "description": "multiples of 4 or 6 up to 15", "factors": [4, 6], "limit": 15, "expected": 30 }, { + "description": "multiples of 5, 6 or 8 up to 150", "factors": [5, 6, 8], "limit": 150, "expected": 4419 }, { + "description": "multiples of 5 or 25 up to 51", "factors": [5, 25], "limit": 51, "expected": 275 }, { + "description": "multiples of 43 or 47 up to 10000", "factors": [43, 47], "limit": 10000, "expected": 2203160 }, { + "description": "multiples of 1 up to 100", "factors": [1], "limit": 100, "expected": 4950 }, { + "description": "multiples of an empty list up to 10000", "factors": [], "limit": 10000, "expected": 0 From 9634d10209154f42f1deda51360ef8e1a3abb7e4 Mon Sep 17 00:00:00 2001 From: rbasso Date: Tue, 7 Mar 2017 21:35:16 +0900 Subject: [PATCH 2/3] sum-of-multiples: Make canonical-data.json compliant --- exercises/sum-of-multiples/canonical-data.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/exercises/sum-of-multiples/canonical-data.json b/exercises/sum-of-multiples/canonical-data.json index de5dd14fb6..fce8ee0d62 100644 --- a/exercises/sum-of-multiples/canonical-data.json +++ b/exercises/sum-of-multiples/canonical-data.json @@ -1,73 +1,87 @@ { + "exercise": "sum-of-multiples", + "version": "1.0.0", "cases": [ { "description": "multiples of 3 or 5 up to 1", + "property": "sum", "factors": [3, 5], "limit": 1, "expected": 0 }, { "description": "multiples of 3 or 5 up to 4", + "property": "sum", "factors": [3, 5], "limit": 4, "expected": 3 }, { "description": "multiples of 3 or 5 up to 10", + "property": "sum", "factors": [3, 5], "limit": 10, "expected": 23 }, { "description": "multiples of 3 or 5 up to 100", + "property": "sum", "factors": [3, 5], "limit": 100, "expected": 2318 }, { "description": "multiples of 3 or 5 up to 1000", + "property": "sum", "factors": [3, 5], "limit": 1000, "expected": 233168 }, { "description": "multiples of 7, 13 or 17 up to 20", + "property": "sum", "factors": [7, 13, 17], "limit": 20, "expected": 51 }, { "description": "multiples of 4 or 6 up to 15", + "property": "sum", "factors": [4, 6], "limit": 15, "expected": 30 }, { "description": "multiples of 5, 6 or 8 up to 150", + "property": "sum", "factors": [5, 6, 8], "limit": 150, "expected": 4419 }, { "description": "multiples of 5 or 25 up to 51", + "property": "sum", "factors": [5, 25], "limit": 51, "expected": 275 }, { "description": "multiples of 43 or 47 up to 10000", + "property": "sum", "factors": [43, 47], "limit": 10000, "expected": 2203160 }, { "description": "multiples of 1 up to 100", + "property": "sum", "factors": [1], "limit": 100, "expected": 4950 }, { "description": "multiples of an empty list up to 10000", + "property": "sum", "factors": [], "limit": 10000, "expected": 0 From 72b14960638bfa7d86ebb5e0a39cb74484a2f78c Mon Sep 17 00:00:00 2001 From: rbasso Date: Tue, 7 Mar 2017 21:38:14 +0900 Subject: [PATCH 3/3] sum-of-multiples: Fix canonical-data.json formatting --- .../sum-of-multiples/canonical-data.json | 176 +++++++++--------- 1 file changed, 88 insertions(+), 88 deletions(-) diff --git a/exercises/sum-of-multiples/canonical-data.json b/exercises/sum-of-multiples/canonical-data.json index fce8ee0d62..82ff53946e 100644 --- a/exercises/sum-of-multiples/canonical-data.json +++ b/exercises/sum-of-multiples/canonical-data.json @@ -1,90 +1,90 @@ { - "exercise": "sum-of-multiples", - "version": "1.0.0", - "cases": [ - { - "description": "multiples of 3 or 5 up to 1", - "property": "sum", - "factors": [3, 5], - "limit": 1, - "expected": 0 - }, - { - "description": "multiples of 3 or 5 up to 4", - "property": "sum", - "factors": [3, 5], - "limit": 4, - "expected": 3 - }, - { - "description": "multiples of 3 or 5 up to 10", - "property": "sum", - "factors": [3, 5], - "limit": 10, - "expected": 23 - }, - { - "description": "multiples of 3 or 5 up to 100", - "property": "sum", - "factors": [3, 5], - "limit": 100, - "expected": 2318 - }, - { - "description": "multiples of 3 or 5 up to 1000", - "property": "sum", - "factors": [3, 5], - "limit": 1000, - "expected": 233168 - }, - { - "description": "multiples of 7, 13 or 17 up to 20", - "property": "sum", - "factors": [7, 13, 17], - "limit": 20, - "expected": 51 - }, - { - "description": "multiples of 4 or 6 up to 15", - "property": "sum", - "factors": [4, 6], - "limit": 15, - "expected": 30 - }, - { - "description": "multiples of 5, 6 or 8 up to 150", - "property": "sum", - "factors": [5, 6, 8], - "limit": 150, - "expected": 4419 - }, - { - "description": "multiples of 5 or 25 up to 51", - "property": "sum", - "factors": [5, 25], - "limit": 51, - "expected": 275 - }, - { - "description": "multiples of 43 or 47 up to 10000", - "property": "sum", - "factors": [43, 47], - "limit": 10000, - "expected": 2203160 - }, - { - "description": "multiples of 1 up to 100", - "property": "sum", - "factors": [1], - "limit": 100, - "expected": 4950 - }, - { - "description": "multiples of an empty list up to 10000", - "property": "sum", - "factors": [], - "limit": 10000, - "expected": 0 - } - ] + "exercise": "sum-of-multiples", + "version": "1.0.0", + "cases": [ + { + "description": "multiples of 3 or 5 up to 1", + "property": "sum", + "factors": [3, 5], + "limit": 1, + "expected": 0 + }, + { + "description": "multiples of 3 or 5 up to 4", + "property": "sum", + "factors": [3, 5], + "limit": 4, + "expected": 3 + }, + { + "description": "multiples of 3 or 5 up to 10", + "property": "sum", + "factors": [3, 5], + "limit": 10, + "expected": 23 + }, + { + "description": "multiples of 3 or 5 up to 100", + "property": "sum", + "factors": [3, 5], + "limit": 100, + "expected": 2318 + }, + { + "description": "multiples of 3 or 5 up to 1000", + "property": "sum", + "factors": [3, 5], + "limit": 1000, + "expected": 233168 + }, + { + "description": "multiples of 7, 13 or 17 up to 20", + "property": "sum", + "factors": [7, 13, 17], + "limit": 20, + "expected": 51 + }, + { + "description": "multiples of 4 or 6 up to 15", + "property": "sum", + "factors": [4, 6], + "limit": 15, + "expected": 30 + }, + { + "description": "multiples of 5, 6 or 8 up to 150", + "property": "sum", + "factors": [5, 6, 8], + "limit": 150, + "expected": 4419 + }, + { + "description": "multiples of 5 or 25 up to 51", + "property": "sum", + "factors": [5, 25], + "limit": 51, + "expected": 275 + }, + { + "description": "multiples of 43 or 47 up to 10000", + "property": "sum", + "factors": [43, 47], + "limit": 10000, + "expected": 2203160 + }, + { + "description": "multiples of 1 up to 100", + "property": "sum", + "factors": [1], + "limit": 100, + "expected": 4950 + }, + { + "description": "multiples of an empty list up to 10000", + "property": "sum", + "factors": [], + "limit": 10000, + "expected": 0 + } + ] }