summaryrefslogtreecommitdiff
path: root/dice/src/test/java/bjc
diff options
context:
space:
mode:
authorBen Culkin <scorpress@gmail.com>2020-11-21 18:10:30 -0500
committerBen Culkin <scorpress@gmail.com>2020-11-21 18:10:30 -0500
commitb5c2fb1ed923d43412694729b4445a66fa9f47fc (patch)
tree2b9dc847976f3a5f7d7a2d48cff0a50e962efeb0 /dice/src/test/java/bjc
parent785a1ed2437d9810b39deb376c163e0e3e73160f (diff)
Restructure new die implementation
Diffstat (limited to 'dice/src/test/java/bjc')
-rw-r--r--dice/src/test/java/bjc/dicelang/neodice/DiePoolTest.java8
-rw-r--r--dice/src/test/java/bjc/dicelang/neodice/DieTest.java10
2 files changed, 9 insertions, 9 deletions
diff --git a/dice/src/test/java/bjc/dicelang/neodice/DiePoolTest.java b/dice/src/test/java/bjc/dicelang/neodice/DiePoolTest.java
index 1a217d3..3614cd3 100644
--- a/dice/src/test/java/bjc/dicelang/neodice/DiePoolTest.java
+++ b/dice/src/test/java/bjc/dicelang/neodice/DiePoolTest.java
@@ -12,8 +12,8 @@ public class DiePoolTest {
@Test
public void containedOneDieYieldsOneDie() {
- Die oneSidedDie = DieFactory.polyhedral(1);
- DiePool pool = DiePoolFactory.containing(oneSidedDie);
+ Die oneSidedDie = Die.polyhedral(1);
+ DiePool pool = DiePool.containing(oneSidedDie);
assertArrayEquals(
"A contained pool created with one die, yields that die",
@@ -22,8 +22,8 @@ public class DiePoolTest {
@Test
public void containedOneDieRollsOneDie() {
- Die oneSidedDie = DieFactory.polyhedral(1);
- DiePool pool = DiePoolFactory.containing(oneSidedDie);
+ Die oneSidedDie = Die.polyhedral(1);
+ DiePool pool = DiePool.containing(oneSidedDie);
for (int i = 0; i < 10; i++) {
assertArrayEquals("One-die pools roll one die",
diff --git a/dice/src/test/java/bjc/dicelang/neodice/DieTest.java b/dice/src/test/java/bjc/dicelang/neodice/DieTest.java
index 60f2ae2..202688b 100644
--- a/dice/src/test/java/bjc/dicelang/neodice/DieTest.java
+++ b/dice/src/test/java/bjc/dicelang/neodice/DieTest.java
@@ -12,7 +12,7 @@ public class DieTest {
@Test
public void onesidedDiceReturnOne() {
- Die die = DieFactory.polyhedral(1);
+ Die die = Die.polyhedral(1);
for (int i = 0; i < 10; i++) {
assertEquals("One-sided dice always return 1", 1, die.roll(rng));
@@ -21,7 +21,7 @@ public class DieTest {
@Test
public void polyhedralDiceStayInRange() {
- Die die = DieFactory.polyhedral(6);
+ Die die = Die.polyhedral(6);
for (int i = 0; i < 50; i++) {
int result = die.roll(rng);
@@ -34,9 +34,9 @@ public class DieTest {
@Test
public void polyhedralDiceEqualityFunctionsProperly() {
- Die dieA1 = DieFactory.polyhedral(1);
- Die dieA2 = DieFactory.polyhedral(1);
- Die dieB1 = DieFactory.polyhedral(2);
+ Die dieA1 = Die.polyhedral(1);
+ Die dieA2 = Die.polyhedral(1);
+ Die dieB1 = Die.polyhedral(2);
assertEquals("Polyhedral dice with the same number of sides are equal",
dieA1, dieA2);