Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

implement error object on multiple exercises #1337

Merged
merged 11 commits into from
Sep 24, 2018
Merged

implement error object on multiple exercises #1337

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7290b84
phone-number: implement error object
rpottsoh Sep 21, 2018
c9b67b6
say: implement error object
rpottsoh Sep 21, 2018
9cdc064
variable-length-quantity: implement error object
rpottsoh Sep 21, 2018
662987b
queen-attack: implement error object
rpottsoh Sep 21, 2018
db9a01b
forth: implement error object
rpottsoh Sep 21, 2018
5ba35c7
forth: add mention of 'error' to comment
rpottsoh Sep 23, 2018
a317aa4
phone-number: add mention of 'error' to comment
rpottsoh Sep 23, 2018
a0cee46
say: add mention of 'error' to comment
rpottsoh Sep 23, 2018
191f808
variable-length-quantity: add mention of 'error' to comment
rpottsoh Sep 23, 2018
1b1cc6b
queen-attack: add mention of 'error' to comment
rpottsoh Sep 23, 2018
aaadbac
queen-attack: fix word omission from error message
rpottsoh Sep 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions exercises/forth/canonical-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exercise": "forth",
"version": "1.6.0",
"version": "1.7.0",
"comments": [
"The cases are split into multiple sections, all with the same structure.",
"In all cases, the `expected` key is the resulting stack",
Expand Down Expand Up @@ -37,15 +37,15 @@
"input": {
"instructions": ["+"]
},
"expected": null
"expected": {"error": "empty stack"}
},
{
"description": "errors if there is only one value on the stack",
"property": "evaluate",
"input": {
"instructions": ["1 +"]
},
"expected": null
"expected": {"error": "only one value on stack"}
}
]
},
Expand All @@ -66,15 +66,15 @@
"input": {
"instructions": ["-"]
},
"expected": null
"expected": {"error": "empty stack"}
},
{
"description": "errors if there is only one value on the stack",
"property": "evaluate",
"input": {
"instructions": ["1 -"]
},
"expected": null
"expected": {"error": "only one value on the stack"}
}
]
},
Expand All @@ -95,15 +95,15 @@
"input": {
"instructions": ["*"]
},
"expected": null
"expected": {"error": "empty stack"}
},
{
"description": "errors if there is only one value on the stack",
"property": "evaluate",
"input": {
"instructions": ["1 *"]
},
"expected": null
"expected": {"error": "only one value on the stack"}
}
]
},
Expand Down Expand Up @@ -132,23 +132,23 @@
"input": {
"instructions": ["4 0 /"]
},
"expected": null
"expected": {"error": "divide by zero"}
},
{
"description": "errors if there is nothing on the stack",
"property": "evaluate",
"input": {
"instructions": ["/"]
},
"expected": null
"expected": {"error": "empty stack"}
},
{
"description": "errors if there is only one value on the stack",
"property": "evaluate",
"input": {
"instructions": ["1 /"]
},
"expected": null
"expected": {"error": "only one value on the stack"}
}
]
},
Expand Down Expand Up @@ -198,7 +198,7 @@
"input": {
"instructions": ["dup"]
},
"expected": null
"expected": {"error": "empty stack"}
}
]
},
Expand Down Expand Up @@ -227,7 +227,7 @@
"input": {
"instructions": ["drop"]
},
"expected": null
"expected": {"error": "empty stack"}
}
]
},
Expand Down Expand Up @@ -256,15 +256,15 @@
"input": {
"instructions": ["swap"]
},
"expected": null
"expected": {"error": "empty stack"}
},
{
"description": "errors if there is only one value on the stack",
"property": "evaluate",
"input": {
"instructions": ["1 swap"]
},
"expected": null
"expected": {"error": "only one value on the stack"}
}
]
},
Expand Down Expand Up @@ -293,15 +293,15 @@
"input": {
"instructions": ["over"]
},
"expected": null
"expected": {"error": "empty stack"}
},
{
"description": "errors if there is only one value on the stack",
"property": "evaluate",
"input": {
"instructions": ["1 over"]
},
"expected": null
"expected": {"error": "only one value on the stack stack"}
}
]
},
Expand Down Expand Up @@ -395,15 +395,15 @@
"input": {
"instructions": [": 1 2 ;"]
},
"expected": null
"expected": {"error": "illegal operation"}
},
{
"description": "errors if executing a non-existent word",
"property": "evaluate",
"input": {
"instructions": ["foo"]
},
"expected": null
"expected": {"error": "undefined operation"}
}
]
},
Expand Down
28 changes: 14 additions & 14 deletions exercises/phone-number/canonical-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exercise": "phone-number",
"version": "1.5.0",
"version": "1.6.0",
"cases": [
{
"description": "Cleanup user-entered phone numbers",
Expand Down Expand Up @@ -40,15 +40,15 @@
"input": {
"phrase": "123456789"
},
"expected": null
"expected": {"error": "incorrect number of digits"}
},
{
"description": "invalid when 11 digits does not start with a 1",
"property": "clean",
"input": {
"phrase": "22234567890"
},
"expected": null
"expected": {"error": "11 digits must start with 1"}
},
{
"description": "valid when 11 digits and starting with 1",
Expand All @@ -72,87 +72,87 @@
"input": {
"phrase": "321234567890"
},
"expected": null
"expected": {"error": "more than 11 digits"}
},
{
"description": "invalid with letters",
"property": "clean",
"input": {
"phrase": "123-abc-7890"
},
"expected": null
"expected": {"error": "alphanumerics not permitted"}
},
{
"description": "invalid with punctuations",
"property": "clean",
"input": {
"phrase": "123-@:!-7890"
},
"expected": null
"expected": {"error": "punctuations not permitted"}
},
{
"description": "invalid if area code starts with 0",
"property": "clean",
"input": {
"phrase": "(023) 456-7890"
},
"expected": null
"expected": {"error": "area code cannot start with zero"}
},
{
"description": "invalid if area code starts with 1",
"property": "clean",
"input": {
"phrase": "(123) 456-7890"
},
"expected": null
"expected": {"error": "area code cannot start with one"}
},
{
"description": "invalid if exchange code starts with 0",
"property": "clean",
"input": {
"phrase": "(223) 056-7890"
},
"expected": null
"expected": {"error": "exchange cannot start with zero"}
},
{
"description": "invalid if exchange code starts with 1",
"property": "clean",
"input": {
"phrase": "(223) 156-7890"
},
"expected": null
"expected": {"error": "exchange cannot start with one"}
},
{
"description": "invalid if area code starts with 0 on valid 11-digit number",
"property": "clean",
"input": {
"phrase": "1 (023) 456-7890"
},
"expected": null
"expected": {"error": "area code cannot start with zero"}
},
{
"description": "invalid if area code starts with 1 on valid 11-digit number",
"property": "clean",
"input": {
"phrase": "1 (123) 456-7890"
},
"expected": null
"expected": {"error": "area code cannot start with one"}
},
{
"description": "invalid if exchange code starts with 0 on valid 11-digit number",
"property": "clean",
"input": {
"phrase": "1 (223) 056-7890"
},
"expected": null
"expected": {"error": "exchange code cannot start with zero"}
},
{
"description": "invalid if exchange code starts with 1 on valid 11-digit number",
"property": "clean",
"input": {
"phrase": "1 (223) 156-7890"
},
"expected": null
"expected": {"error": "exchange code cannot start with one"}
}
]
}
Expand Down
10 changes: 5 additions & 5 deletions exercises/queen-attack/canonical-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exercise": "queen-attack",
"version": "2.1.0",
"version": "2.2.0",
"comments": [
"Testing invalid positions will vary by language. The expected",
"value of -1 is there to indicate some sort of failure should",
Expand Down Expand Up @@ -38,7 +38,7 @@
}
}
},
"expected": -1
"expected": {"error": "row not positive"}
},
{
"description": "queen must have row on board",
Expand All @@ -51,7 +51,7 @@
}
}
},
"expected": -1
"expected": {"error": "row not board"}
},
{
"description": "queen must have positive column",
Expand All @@ -64,7 +64,7 @@
}
}
},
"expected": -1
"expected": {"error": "column not positive"}
},
{
"description": "queen must have column on board",
Expand All @@ -77,7 +77,7 @@
}
}
},
"expected": -1
"expected": {"error": "column not on board"}
}
]
},
Expand Down
6 changes: 3 additions & 3 deletions exercises/say/canonical-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exercise": "say",
"version": "1.1.0",
"version": "1.2.0",
"comments": [
"Here -1 is used as expected value to indicate that the",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to update the comments to reflect the new error object?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes it would. 😄 Thanks for pointing it out.

"input value is out of the range described in the exercise."
Expand Down Expand Up @@ -116,15 +116,15 @@
"input": {
"number": -1
},
"expected": -1
"expected": {"error": "input out of range"}
},
{
"description": "numbers above 999,999,999,999 are out of range",
"property": "say",
"input": {
"number": 1000000000000
},
"expected": -1
"expected": {"error": "input out of range"}
}
]
}
6 changes: 3 additions & 3 deletions exercises/variable-length-quantity/canonical-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"exercise": "variable-length-quantity",
"version": "1.1.0",
"version": "1.2.0",
"comments": [
"JSON doesn't allow hexadecimal literals.",
"All numbers are given as decimal literals instead.",
Expand Down Expand Up @@ -205,15 +205,15 @@
"input": {
"integers": [255]
},
"expected": null
"expected": {"error": "incomplete sequence"}
},
{
"description": "incomplete sequence causes error, even if value is zero",
"property": "decode",
"input": {
"integers": [128]
},
"expected": null
"expected": {"error": "incomplete sequence"}
},
{
"description": "multiple values",
Expand Down