Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
A
Assessment 2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scott Crooks
Assessment 2
Commits
415eb83a
Commit
415eb83a
authored
11 months ago
by
Scott Crooks
Browse files
Options
Downloads
Plain Diff
Merge branch '1-fix-errors-in-assignment' into 'main'
Resolve "Fix errors in assignment" Closes
#1
See merge request
!1
parents
c46bd751
57597a4a
No related branches found
No related tags found
1 merge request
!1
Resolve "Fix errors in assignment"
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+10
-4
10 additions, 4 deletions
src/main/java/dotsandboxes/DotsAndBoxesGrid.java
src/test/java/dotsandboxes/DotsAndBoxesGridTest.java
+56
-0
56 additions, 0 deletions
src/test/java/dotsandboxes/DotsAndBoxesGridTest.java
with
66 additions
and
4 deletions
src/main/java/dotsandboxes/DotsAndBoxesGrid.java
+
10
−
4
View file @
415eb83a
...
...
@@ -110,9 +110,13 @@ public class DotsAndBoxesGrid {
return
false
;
}
// A box is complete if the north and south horizontals and the east and west verticals have all been drawn.
// FIXME: You'll need to fix this code (after writing a test first).
return
true
;
// Could be shorter but this is more readable
boolean
north
=
horizontals
[
x
][
y
];
boolean
south
=
horizontals
[
x
][
y
+
1
];
boolean
west
=
verticals
[
x
][
y
];
boolean
east
=
verticals
[
x
+
1
][
y
];
return
north
&&
south
&&
west
&&
east
;
}
/** Tries to claim a box for a player. If the box is complete, sets the ownership and returns true. */
...
...
@@ -139,7 +143,8 @@ public class DotsAndBoxesGrid {
throw
new
IndexOutOfBoundsException
(
String
.
format
(
"y was %d, which is out of range. Range is 0 to %d"
,
y
,
height
));
}
// FIXME: You need to throw an exception if the line was already drawn.
// You need to throw an exception if the line was already drawn.
if
(
horizontals
[
x
][
y
])
throw
new
IllegalArgumentException
(
"Line is already taken."
);
this
.
horizontals
[
x
][
y
]
=
true
;
...
...
@@ -171,6 +176,7 @@ public class DotsAndBoxesGrid {
}
// You need to throw an exception if the line was already drawn.
if
(
verticals
[
x
][
y
])
throw
new
IllegalArgumentException
(
"Line is already taken."
);
this
.
verticals
[
x
][
y
]
=
true
;
// Try to claim the north or south boxes
...
...
This diff is collapsed.
Click to expand it.
src/test/java/dotsandboxes/DotsAndBoxesGridTest.java
+
56
−
0
View file @
415eb83a
...
...
@@ -28,4 +28,60 @@ public class DotsAndBoxesGridTest {
}
// FIXME: You need to write tests for the two known bugs in the code.
@Test
public
void
testBoxCompleteFull
()
{
DotsAndBoxesGrid
grid
=
new
DotsAndBoxesGrid
(
3
,
3
,
2
);
grid
.
drawHorizontal
(
0
,
0
,
1
);
grid
.
drawHorizontal
(
0
,
1
,
1
);
grid
.
drawVertical
(
0
,
0
,
1
);
grid
.
drawVertical
(
1
,
0
,
1
);
assertTrue
(
grid
.
boxComplete
(
0
,
0
));
}
@Test
public
void
testBoxCompletePartial
()
{
DotsAndBoxesGrid
grid
=
new
DotsAndBoxesGrid
(
3
,
3
,
2
);
grid
.
drawHorizontal
(
1
,
1
,
1
);
grid
.
drawVertical
(
1
,
1
,
1
);
grid
.
drawVertical
(
2
,
1
,
1
);
assertFalse
(
grid
.
boxComplete
(
1
,
1
));
}
@Test
public
void
testDrawVerticalOnce
()
{
DotsAndBoxesGrid
grid
=
new
DotsAndBoxesGrid
(
3
,
3
,
2
);
assertFalse
(
grid
.
drawVertical
(
1
,
1
,
1
));
}
@Test
public
void
testVerticalCannotBeRedrawn
()
{
DotsAndBoxesGrid
grid
=
new
DotsAndBoxesGrid
(
3
,
3
,
2
);
grid
.
drawVertical
(
1
,
1
,
1
);
Exception
exception
=
assertThrows
(
IllegalArgumentException
.
class
,
()
->
{
grid
.
drawVertical
(
1
,
1
,
2
);
});
assertTrue
(
exception
instanceof
IllegalArgumentException
);
}
@Test
public
void
testDrawHorizontalOnce
()
{
DotsAndBoxesGrid
grid
=
new
DotsAndBoxesGrid
(
3
,
3
,
2
);
assertFalse
(
grid
.
drawHorizontal
(
1
,
1
,
1
));
}
@Test
public
void
testHorizontalCannotBeRedrawn
()
{
DotsAndBoxesGrid
grid
=
new
DotsAndBoxesGrid
(
3
,
3
,
2
);
grid
.
drawHorizontal
(
1
,
1
,
1
);
Exception
exception
=
assertThrows
(
IllegalArgumentException
.
class
,
()
->
{
grid
.
drawHorizontal
(
1
,
1
,
2
);
});
assertTrue
(
exception
instanceof
IllegalArgumentException
);
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment