Преглед на файлове

Merge branch 'master' of sambhutani/ZCW-OOP-Casino into working

jonathan-hinds преди 6 години
родител
ревизия
1bb7ad26c3
променени са 4 файла, в които са добавени 48 реда и са изтрити 9 реда
  1. 0
    1
      .gitignore
  2. 0
    1
      src/main/java/io/zipcoder/casino/Casino.java
  3. 13
    1
      src/main/java/io/zipcoder/casino/SlotMachine.java
  4. 35
    6
      src/test/java/io/zipcoder/casino/SlotTest.java

+ 0
- 1
.gitignore Целия файл

10
 .loadpath
10
 .loadpath
11
 .recommenders
11
 .recommenders
12
 .DS_Store
12
 .DS_Store
13
- f4be1dfe4483806d9dd9cf3b6546e184f84a5f1a
14
 
13
 
15
 # External tool builders
14
 # External tool builders
16
 .externalToolBuilders/
15
 .externalToolBuilders/

+ 0
- 1
src/main/java/io/zipcoder/casino/Casino.java Целия файл

2
 
2
 
3
 
3
 
4
 import java.util.ArrayList;
4
 import java.util.ArrayList;
5
-import java.util.InputMismatchException;
6
 
5
 
7
 public class Casino {
6
 public class Casino {
8
     public boolean running = true;
7
     public boolean running = true;

+ 13
- 1
src/main/java/io/zipcoder/casino/SlotMachine.java Целия файл

3
 import java.util.Random;
3
 import java.util.Random;
4
 
4
 
5
 public class SlotMachine implements Game, Gamble {
5
 public class SlotMachine implements Game, Gamble {
6
-    private int betAmount;
6
+    protected int betAmount;
7
     private int payoutAmt=0;
7
     private int payoutAmt=0;
8
     String word="";
8
     String word="";
9
     String outputword="";
9
     String outputword="";
22
 
22
 
23
     @Override
23
     @Override
24
     public void bet(int betAmount) {
24
     public void bet(int betAmount) {
25
+
26
+        this.betAmount= betAmount;
25
         player.changeBalance(-betAmount);
27
         player.changeBalance(-betAmount);
28
+
26
     }
29
     }
27
 
30
 
28
     public void payout(){
31
     public void payout(){
47
     public void generateWords() {
50
     public void generateWords() {
48
         Random rand = new Random();
51
         Random rand = new Random();
49
 
52
 
53
+        generateWords(rand);
54
+
55
+    }
56
+
57
+    protected void generateWords(Random rand) {
50
         for (int i = 1; i <= 3; i++) {
58
         for (int i = 1; i <= 3; i++) {
51
             int randnum = rand.nextInt(6);
59
             int randnum = rand.nextInt(6);
52
 
60
 
79
                 word3 = word;
87
                 word3 = word;
80
             }
88
             }
81
         }
89
         }
90
+
82
         outputword= "[ " + word1+ " ]" + "   " + "[ " + word2 + " ]" + "   "+ "[ " + word3 + " ]" + "\n" ;
91
         outputword= "[ " + word1+ " ]" + "   " + "[ " + word2 + " ]" + "   "+ "[ " + word3 + " ]" + "\n" ;
92
+
83
     }
93
     }
84
 
94
 
85
     public void slotResult()
95
     public void slotResult()
122
     }
132
     }
123
 
133
 
124
     public int getPayoutAmt() {
134
     public int getPayoutAmt() {
135
+
125
         return payoutAmt;
136
         return payoutAmt;
126
     }
137
     }
127
 
138
 
130
     }
141
     }
131
 
142
 
132
     public void setWord1(String word1) {
143
     public void setWord1(String word1) {
144
+
133
         this.word1 = word1;
145
         this.word1 = word1;
134
     }
146
     }
135
 
147
 

+ 35
- 6
src/test/java/io/zipcoder/casino/SlotTest.java Целия файл

1
 package io.zipcoder.casino;
1
 package io.zipcoder.casino;
2
 
2
 
3
 
3
 
4
+import org.junit.Before;
4
 import org.junit.Test;
5
 import org.junit.Test;
5
 import org.junit.Assert;
6
 import org.junit.Assert;
7
+import java.util.Random;
6
 
8
 
7
-import java.io.ByteArrayInputStream;
8
-import java.util.NoSuchElementException;
9
-import java.util.Scanner;
10
 
9
 
11
 
10
 
12
 public class SlotTest {
11
 public class SlotTest {
12
+    private int betAmount = 10;
13
+    private SlotMachine slotmachine = new SlotMachine(betAmount);
13
 
14
 
14
     Player player = new Player("Bob", 400);
15
     Player player = new Player("Bob", 400);
15
 
16
 
16
     @Test
17
     @Test
17
     public void testSlotResult1(){
18
     public void testSlotResult1(){
18
-        int betAmount=10;
19
         String word1="MOUSE";
19
         String word1="MOUSE";
20
         String word2="MOUSE";
20
         String word2="MOUSE";
21
         String word3="MOUSE";
21
         String word3="MOUSE";
33
 
33
 
34
     @Test
34
     @Test
35
     public void testSlotResult2(){
35
     public void testSlotResult2(){
36
-        int betAmount=10;
37
         String word1="MOUSE";
36
         String word1="MOUSE";
38
         String word2="MOUSE";
37
         String word2="MOUSE";
39
         String word3="CAT";
38
         String word3="CAT";
41
 
40
 
42
         //given
41
         //given
43
         SlotMachine slotmachine = new SlotMachine(betAmount, player);
42
         SlotMachine slotmachine = new SlotMachine(betAmount, player);
44
-
45
         slotmachine.setWord1(word1);
43
         slotmachine.setWord1(word1);
46
         slotmachine.setWord2(word2);
44
         slotmachine.setWord2(word2);
47
         slotmachine.setWord3(word3);
45
         slotmachine.setWord3(word3);
120
 
118
 
121
 
119
 
122
     }
120
     }
121
+
122
+    @Test
123
+    public void testSetBetAmount(){
124
+        int betAmount=10;
125
+        SlotMachine slotmachine = new SlotMachine(betAmount);
126
+
127
+        int newBet = 40;
128
+
129
+        slotmachine.bet(newBet);
130
+
131
+        int actual = slotmachine.betAmount;
132
+
133
+        Assert.assertEquals(newBet, actual);
134
+
135
+    }
136
+
137
+    @Test
138
+    public void testGenerateWords2(){
139
+        Random random = new Random(1);
140
+
141
+
142
+        String expectedWord1 = "SQUIRREL";
143
+        String expectedWord2 = "FISH";
144
+        String expectedWord3 = "CAT";
145
+
146
+        slotmachine.generateWords(random);
147
+
148
+        Assert.assertEquals(expectedWord1, slotmachine.word1);
149
+
150
+    }
151
+
123
 }
152
 }