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

finally done and fixed all the bugs

ghost1497 преди 6 години
родител
ревизия
d31a788999
променени са 17 файла, в които са добавени 85 реда и са изтрити 153 реда
  1. 1
    1
      .idea/compiler.xml
  2. 0
    7
      .idea/kotlinc.xml
  3. 0
    77
      .idea/misc.xml
  4. 28
    27
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java
  5. 4
    4
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java
  6. 37
    22
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java
  7. 1
    1
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java
  8. 6
    6
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java
  9. 3
    3
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java
  10. 5
    5
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java
  11. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class
  12. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class
  13. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class
  14. BIN
      target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class
  15. BIN
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class
  16. BIN
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class
  17. BIN
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class

+ 1
- 1
.idea/compiler.xml Целия файл

9
         <module name="ChapterOneMicro" />
9
         <module name="ChapterOneMicro" />
10
       </profile>
10
       </profile>
11
     </annotationProcessing>
11
     </annotationProcessing>
12
-    <bytecodeTargetLevel target="1.8">
12
+    <bytecodeTargetLevel>
13
       <module name="ChapterOneMicro" target="1.8" />
13
       <module name="ChapterOneMicro" target="1.8" />
14
     </bytecodeTargetLevel>
14
     </bytecodeTargetLevel>
15
   </component>
15
   </component>

+ 0
- 7
.idea/kotlinc.xml Целия файл

1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="KotlinCommonCompilerArguments">
4
-    <option name="languageVersion" value="1.1" />
5
-    <option name="apiVersion" value="1.1" />
6
-  </component>
7
-</project>

+ 0
- 77
.idea/misc.xml Целия файл

7
       </list>
7
       </list>
8
     </option>
8
     </option>
9
   </component>
9
   </component>
10
-  <component name="ProjectInspectionProfilesVisibleTreeState">
11
-    <entry key="Project Default">
12
-      <profile-state>
13
-        <expanded-state>
14
-          <State>
15
-            <id />
16
-          </State>
17
-        </expanded-state>
18
-        <selected-state>
19
-          <State>
20
-            <id>Android</id>
21
-          </State>
22
-        </selected-state>
23
-      </profile-state>
24
-    </entry>
25
-  </component>
26
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
10
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
27
     <output url="file://$PROJECT_DIR$/classes" />
11
     <output url="file://$PROJECT_DIR$/classes" />
28
   </component>
12
   </component>
29
-  <component name="masterDetails">
30
-    <states>
31
-      <state key="GlobalLibrariesConfigurable.UI">
32
-        <settings>
33
-          <splitter-proportions>
34
-            <option name="proportions">
35
-              <list>
36
-                <option value="0.2" />
37
-              </list>
38
-            </option>
39
-          </splitter-proportions>
40
-        </settings>
41
-      </state>
42
-      <state key="JdkListConfigurable.UI">
43
-        <settings>
44
-          <last-edited>1.8</last-edited>
45
-          <splitter-proportions>
46
-            <option name="proportions">
47
-              <list>
48
-                <option value="0.2" />
49
-              </list>
50
-            </option>
51
-          </splitter-proportions>
52
-        </settings>
53
-      </state>
54
-      <state key="ProjectJDKs.UI">
55
-        <settings>
56
-          <last-edited>1.8</last-edited>
57
-          <splitter-proportions>
58
-            <option name="proportions">
59
-              <list>
60
-                <option value="0.2" />
61
-              </list>
62
-            </option>
63
-          </splitter-proportions>
64
-        </settings>
65
-      </state>
66
-      <state key="ProjectLibrariesConfigurable.UI">
67
-        <settings>
68
-          <splitter-proportions>
69
-            <option name="proportions">
70
-              <list>
71
-                <option value="0.2" />
72
-              </list>
73
-            </option>
74
-          </splitter-proportions>
75
-        </settings>
76
-      </state>
77
-      <state key="ScopeChooserConfigurable.UI">
78
-        <settings>
79
-          <splitter-proportions>
80
-            <option name="proportions">
81
-              <list>
82
-                <option value="0.2" />
83
-              </list>
84
-            </option>
85
-          </splitter-proportions>
86
-        </settings>
87
-      </state>
88
-    </states>
89
-  </component>
90
 </project>
13
 </project>

+ 28
- 27
src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java Целия файл

10
      * @param difference value to add to starting value
10
      * @param difference value to add to starting value
11
      * @return sum of `baseValue` and `difference`
11
      * @return sum of `baseValue` and `difference`
12
      */
12
      */
13
+
13
     public Integer add(int baseValue, int difference) {
14
     public Integer add(int baseValue, int difference) {
14
-        return null;
15
+        return (baseValue + difference);
15
     }
16
     }
16
 
17
 
17
     /**
18
     /**
20
      * @return sum of `baseValue` and `difference`
21
      * @return sum of `baseValue` and `difference`
21
      */
22
      */
22
     public Long add(long baseValue, long difference) {
23
     public Long add(long baseValue, long difference) {
23
-        return null;
24
+        return (baseValue+difference);
24
     }
25
     }
25
 
26
 
26
     /**
27
     /**
29
      * @return sum of `baseValue` and `difference`
30
      * @return sum of `baseValue` and `difference`
30
      */
31
      */
31
     public Short add(short baseValue, short difference) {
32
     public Short add(short baseValue, short difference) {
32
-        return null;
33
+        return ((short)(baseValue + difference));
33
     }
34
     }
34
 
35
 
35
     /**
36
     /**
38
      * @return sum of `baseValue` and `difference`
39
      * @return sum of `baseValue` and `difference`
39
      */
40
      */
40
     public Byte add(byte baseValue, byte difference) {
41
     public Byte add(byte baseValue, byte difference) {
41
-        return null;
42
+        return (byte)(baseValue + difference);
42
     }
43
     }
43
 
44
 
44
     /**
45
     /**
47
      * @return sum of `baseValue` and `difference`
48
      * @return sum of `baseValue` and `difference`
48
      */
49
      */
49
     public Float add(float baseValue, float difference) {
50
     public Float add(float baseValue, float difference) {
50
-        return null;
51
+        return (baseValue+difference);
51
     }
52
     }
52
 
53
 
53
     /**
54
     /**
56
      * @return sum of `baseValue` and `difference`
57
      * @return sum of `baseValue` and `difference`
57
      */
58
      */
58
     public Double add(double baseValue, double difference) {
59
     public Double add(double baseValue, double difference) {
59
-        return null;
60
+        return (baseValue+difference);
60
     }
61
     }
61
 
62
 
62
     /**
63
     /**
65
      * @return difference between `baseValue` and `difference`
66
      * @return difference between `baseValue` and `difference`
66
      */
67
      */
67
     public Integer subtract(int baseValue, int difference) {
68
     public Integer subtract(int baseValue, int difference) {
68
-        return null;
69
+        return (baseValue-difference);
69
     }
70
     }
70
 
71
 
71
     /**
72
     /**
74
      * @return difference between `baseValue` and `difference`
75
      * @return difference between `baseValue` and `difference`
75
      */
76
      */
76
     public Long subtract(long baseValue, long difference) {
77
     public Long subtract(long baseValue, long difference) {
77
-        return null;
78
+        return (baseValue-difference);
78
     }
79
     }
79
 
80
 
80
     /**
81
     /**
83
      * @return difference between `baseValue` and `difference`
84
      * @return difference between `baseValue` and `difference`
84
      */
85
      */
85
     public Short subtract(short baseValue, short difference) {
86
     public Short subtract(short baseValue, short difference) {
86
-        return null;
87
+        return (short)(baseValue-difference);
87
     }
88
     }
88
 
89
 
89
     /**
90
     /**
92
      * @return difference between `baseValue` and `difference`
93
      * @return difference between `baseValue` and `difference`
93
      */
94
      */
94
     public Byte subtract(byte baseValue, byte difference) {
95
     public Byte subtract(byte baseValue, byte difference) {
95
-        return null;
96
+        return (byte)(baseValue-difference);
96
     }
97
     }
97
 
98
 
98
     /**
99
     /**
101
      * @return difference between `baseValue` and `difference`
102
      * @return difference between `baseValue` and `difference`
102
      */
103
      */
103
     public Float subtract(float baseValue, float difference) {
104
     public Float subtract(float baseValue, float difference) {
104
-        return null;
105
+        return (baseValue-difference);
105
     }
106
     }
106
 
107
 
107
     /**
108
     /**
110
      * @return difference between `baseValue` and `difference`
111
      * @return difference between `baseValue` and `difference`
111
      */
112
      */
112
     public Double subtract(double baseValue, double difference) {
113
     public Double subtract(double baseValue, double difference) {
113
-        return null;
114
+        return (baseValue-difference);
114
     }
115
     }
115
 
116
 
116
 
117
 
120
      * @return division of `dividend` by `divisor
121
      * @return division of `dividend` by `divisor
121
      */
122
      */
122
     public Integer divide(int dividend, int divisor) {
123
     public Integer divide(int dividend, int divisor) {
123
-        return null;
124
+        return (dividend/divisor);
124
     }
125
     }
125
 
126
 
126
     /**
127
     /**
129
      * @return division of `dividend` by `divisor
130
      * @return division of `dividend` by `divisor
130
      */
131
      */
131
     public Long divide(long dividend, long divisor) {
132
     public Long divide(long dividend, long divisor) {
132
-        return null;
133
+        return (dividend/divisor);
133
     }
134
     }
134
 
135
 
135
     /**
136
     /**
138
      * @return division of `dividend` by `divisor
139
      * @return division of `dividend` by `divisor
139
      */
140
      */
140
     public Short divide(short dividend, short divisor) {
141
     public Short divide(short dividend, short divisor) {
141
-        return null;
142
+        return (short)(dividend/divisor);
142
     }
143
     }
143
 
144
 
144
     /**
145
     /**
147
      * @return division of `dividend` by `divisor
148
      * @return division of `dividend` by `divisor
148
      */
149
      */
149
     public Byte divide(byte dividend, byte divisor) {
150
     public Byte divide(byte dividend, byte divisor) {
150
-        return null;
151
+        return (byte)(dividend/divisor);
151
     }
152
     }
152
 
153
 
153
     /**
154
     /**
156
      * @return division of `dividend` by `divisor
157
      * @return division of `dividend` by `divisor
157
      */
158
      */
158
     public Float divide(float dividend, float divisor) {
159
     public Float divide(float dividend, float divisor) {
159
-        return null;
160
+        return (dividend/divisor);
160
     }
161
     }
161
 
162
 
162
     /**
163
     /**
165
      * @return division of `dividend` by `divisor
166
      * @return division of `dividend` by `divisor
166
      */
167
      */
167
     public Double divide(double dividend, double divisor) {
168
     public Double divide(double dividend, double divisor) {
168
-        return null;
169
+        return (dividend/divisor);
169
     }
170
     }
170
 
171
 
171
 
172
 
175
      * @return product of `multiplicand` by `multiplier`
176
      * @return product of `multiplicand` by `multiplier`
176
      */
177
      */
177
     public Integer multiply(int multiplicand, int multiplier) {
178
     public Integer multiply(int multiplicand, int multiplier) {
178
-        return null;
179
+        return (multiplicand*multiplier);
179
     }
180
     }
180
 
181
 
181
     /**
182
     /**
184
      * @return product of `multiplicand` by `multiplier`
185
      * @return product of `multiplicand` by `multiplier`
185
      */
186
      */
186
     public Long multiply(long multiplicand, long multiplier) {
187
     public Long multiply(long multiplicand, long multiplier) {
187
-        return null;
188
+        return (multiplicand*multiplier);
188
     }
189
     }
189
 
190
 
190
     /**
191
     /**
193
      * @return product of `multiplicand` by `multiplier`
194
      * @return product of `multiplicand` by `multiplier`
194
      */
195
      */
195
     public Short multiply(short multiplicand, short multiplier) {
196
     public Short multiply(short multiplicand, short multiplier) {
196
-        return null;
197
+        return (short)(multiplicand*multiplier);
197
     }
198
     }
198
     /**
199
     /**
199
      * @param multiplicand value to be multiplied
200
      * @param multiplicand value to be multiplied
200
      * @param multiplier value to multiply by
201
      * @param multiplier value to multiply by
201
      * @return product of `multiplicand` by `multiplier`
202
      * @return product of `multiplicand` by `multiplier`
202
      */
203
      */
203
-    public Byte multiply(byte multiplicand, byte multiplier) {
204
-        return null;
204
+    public int multiply(Byte multiplicand, Byte multiplier) {
205
+        return (multiplicand*multiplier);
205
     }
206
     }
206
 
207
 
207
     /**
208
     /**
210
      * @return product of `multiplicand` by `multiplier`
211
      * @return product of `multiplicand` by `multiplier`
211
      */
212
      */
212
     public Float multiply(float multiplicand, float multiplier) {
213
     public Float multiply(float multiplicand, float multiplier) {
213
-        return null;
214
+        return (multiplicand*multiplier);
214
     }
215
     }
215
 
216
 
216
     /**
217
     /**
219
      * @return product of `multiplicand` by `multiplier`
220
      * @return product of `multiplicand` by `multiplier`
220
      */
221
      */
221
     public Double multiply(double multiplicand, double multiplier) {
222
     public Double multiply(double multiplicand, double multiplier) {
222
-        return null;
223
+        return (multiplicand*multiplier);
223
     }
224
     }
224
 
225
 
225
 
226
 
227
       * @return true
228
       * @return true
228
      */
229
      */
229
     public Boolean returnTrue() {
230
     public Boolean returnTrue() {
230
-        return null;
231
+        return true;
231
     }
232
     }
232
 
233
 
233
     /**
234
     /**
234
      * @return false
235
      * @return false
235
      */
236
      */
236
     public Boolean returnFalse() {
237
     public Boolean returnFalse() {
237
-        return null;
238
+        return false;
238
     }
239
     }
239
 
240
 
240
 }
241
 }

+ 4
- 4
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java Целия файл

10
      * @return true if `x` is greater than `y`
10
      * @return true if `x` is greater than `y`
11
      */
11
      */
12
     public Boolean isGreaterThan(int x, int y) {
12
     public Boolean isGreaterThan(int x, int y) {
13
-        return null;
13
+        return (x > y);
14
     }
14
     }
15
 
15
 
16
     /**
16
     /**
19
      * @return true if `x` is less than `y`
19
      * @return true if `x` is less than `y`
20
      */
20
      */
21
     public Boolean isLessThan(int x, int y) {
21
     public Boolean isLessThan(int x, int y) {
22
-        return null;
22
+        return (x < y);
23
     }
23
     }
24
 
24
 
25
     /**
25
     /**
28
      * @return true if `x` is greater than or equal to `y`
28
      * @return true if `x` is greater than or equal to `y`
29
      */
29
      */
30
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
30
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-        return null;
31
+        return (x >= y);
32
     }
32
     }
33
 
33
 
34
     /**
34
     /**
37
      * @return true if `x` is less than or equal to `y`
37
      * @return true if `x` is less than or equal to `y`
38
      */
38
      */
39
     public Boolean isLessThanOrEqualTo(int x, int y) {
39
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
-        return null;
40
+        return (x <= y);
41
     }
41
     }
42
 }
42
 }

+ 37
- 22
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java Целия файл

8
      * @return `Hello World` as a string
8
      * @return `Hello World` as a string
9
      */
9
      */
10
     public static String getHelloWorld() {
10
     public static String getHelloWorld() {
11
-        return null;
11
+
12
+        return ("Hello World");
12
     }
13
     }
13
 
14
 
14
     /**
15
     /**
15
-     * @param firstSegment a string to be added to
16
+     * @param firstSegment  a string to be added to
16
      * @param secondSegment a string to add
17
      * @param secondSegment a string to add
17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18
      */
19
      */
19
-    public static String concatenation(String firstSegment, String secondSegment){
20
-        return null;
20
+    public static String concatenation(String firstSegment, String secondSegment) {
21
+        return (firstSegment.concat(secondSegment));
21
     }
22
     }
22
 
23
 
23
     /**
24
     /**
24
-     * @param firstSegment a string to be added to
25
+     * @param firstSegment  a string to be added to
25
      * @param secondSegment a string to add
26
      * @param secondSegment a string to add
26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27
      */
28
      */
28
-    public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
29
+    public static String concatenation(int firstSegment, String secondSegment) {
30
+        return (firstSegment + secondSegment);
30
     }
31
     }
31
 
32
 
32
     /**
33
     /**
33
      * @param input a string to be manipulated
34
      * @param input a string to be manipulated
34
      * @return the first 3 characters of `input`
35
      * @return the first 3 characters of `input`
35
      */
36
      */
36
-    public static String getPrefix(String input){
37
-        return null;
37
+    public static String getPrefix(String input) {
38
+        return (input.substring(0, 3));
38
     }
39
     }
39
 
40
 
40
     /**
41
     /**
41
      * @param input a string to be manipulated
42
      * @param input a string to be manipulated
42
      * @return the last 3 characters of `input`
43
      * @return the last 3 characters of `input`
43
      */
44
      */
44
-    public static String getSuffix(String input){
45
-        return null;
45
+    public static String getSuffix(String input) {
46
+        return (input.substring(input.length() - 3, input.length()));
46
     }
47
     }
47
 
48
 
48
     /**
49
     /**
49
-     * @param inputValue the value to be compared
50
+     * @param inputValue      the value to be compared
50
      * @param comparableValue the value to be compared against
51
      * @param comparableValue the value to be compared against
51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52
      */
53
      */
53
-    public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
54
+    public static Boolean compareTwoStrings(String inputValue, String comparableValue) {
55
+        return(inputValue.equals(comparableValue));
55
     }
56
     }
56
 
57
 
57
     /**
58
     /**
58
      * @param inputValue the value input from user
59
      * @param inputValue the value input from user
59
      * @return the middle character of `inputValue`
60
      * @return the middle character of `inputValue`
60
      */
61
      */
61
-    public static Character getMiddleCharacter(String inputValue){
62
-        return null;
62
+    public static Character getMiddleCharacter(String inputValue) {
63
+        int middleAvg;
64
+        if (inputValue.length() % 2 == 0) {
65
+            middleAvg = (inputValue.length() / 2);
66
+        }
67
+        else{
68
+            middleAvg = (int)((inputValue.length()/2)+1);
69
+        }
70
+        return inputValue.charAt(middleAvg-1);
63
     }
71
     }
64
 
72
 
65
     /**
73
     /**
66
      * @param spaceDelimitedString a string, representative of a sentence, containing spaces
74
      * @param spaceDelimitedString a string, representative of a sentence, containing spaces
67
      * @return the first sequence of characters
75
      * @return the first sequence of characters
68
      */
76
      */
69
-    public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
77
+    public static String getFirstWord(String spaceDelimitedString) {
78
+        int indOfSp = spaceDelimitedString.indexOf(" ");
79
+        return spaceDelimitedString.substring(0, indOfSp);
71
     }
80
     }
72
 
81
 
73
     /**
82
     /**
74
      * @param spaceDelimitedString a string delimited by spaces
83
      * @param spaceDelimitedString a string delimited by spaces
75
      * @return the second word of a string delimited by spaces.
84
      * @return the second word of a string delimited by spaces.
76
      */
85
      */
77
-    public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
86
+    public static String getSecondWord(String spaceDelimitedString) {
87
+        String[] words = spaceDelimitedString.split(" ");
88
+        String secondWord = words[1];
89
+        return secondWord;
79
     }
90
     }
80
 
91
 
81
     /**
92
     /**
82
      * @param stringToReverse
93
      * @param stringToReverse
83
      * @return an identical string with characters in reverse order.
94
      * @return an identical string with characters in reverse order.
84
      */
95
      */
85
-    public static String reverseTheTwo(String stringToReverse){
86
-        return null;
96
+    public static String reverseTheTwo(String stringToReverse) {
97
+        String revStr = "";
98
+        for (int i = stringToReverse.length() - 1; i >= 0; i--) {
99
+            revStr += stringToReverse.charAt(i);
100
+        }
101
+        return revStr;
87
     }
102
     }
88
 }
103
 }

+ 1
- 1
src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java Целия файл

5
  */
5
  */
6
 public class ZipcodeRocks {
6
 public class ZipcodeRocks {
7
     public static void main(String[] args) {
7
     public static void main(String[] args) {
8
-//         System.out.println("Zipcode Rocks!");
8
+        System.out.println("Zipcode Rocks!");
9
     }
9
     }
10
 }
10
 }

+ 6
- 6
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java Целия файл

36
         // : Given
36
         // : Given
37
         short baseValue = 16384;
37
         short baseValue = 16384;
38
         short addedValue = 7;
38
         short addedValue = 7;
39
-        short expected = 32767;
39
+        short expected = 16391;
40
         // : When
40
         // : When
41
         short actual = primativeTypes.add(baseValue, addedValue);
41
         short actual = primativeTypes.add(baseValue, addedValue);
42
         // : Then
42
         // : Then
146
         // : When
146
         // : When
147
         float actualFloat = primativeTypes.subtract(baseValue,difference);
147
         float actualFloat = primativeTypes.subtract(baseValue,difference);
148
         // : Then
148
         // : Then
149
-        assertEquals(expectedFloat,actualFloat, 0);
149
+        assertEquals(expectedFloat,actualFloat, 0.005);
150
     }
150
     }
151
     @Test
151
     @Test
152
     public void testSubtractions5() {
152
     public void testSubtractions5() {
294
     @Test
294
     @Test
295
     public void testMultiplication3() {
295
     public void testMultiplication3() {
296
         // : Given
296
         // : Given
297
-        byte multiplicand = 16;
298
-        byte multiplier = 14;
299
-        byte expectedByte = 64;
297
+        byte multiplicand = 6;
298
+        byte multiplier = 4;
299
+        int expectedByte = 24;
300
         // : When
300
         // : When
301
-        byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
301
+        int actualByte = primativeTypes.multiply(multiplicand, multiplier);
302
         // : Then
302
         // : Then
303
         assertEquals(expectedByte, actualByte);
303
         assertEquals(expectedByte, actualByte);
304
     }
304
     }

+ 3
- 3
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java Целия файл

33
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
33
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
34
 
34
 
35
         // : Then
35
         // : Then
36
-        assertTrue(outcome);
36
+        assertFalse(outcome);
37
     }
37
     }
38
 
38
 
39
 
39
 
62
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
62
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
63
 
63
 
64
         // : Then
64
         // : Then
65
-        assertTrue(outcome);
65
+        assertFalse(outcome);
66
     }
66
     }
67
 
67
 
68
 
68
 
116
         boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
116
         boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
117
 
117
 
118
         // : Then
118
         // : Then
119
-        assertTrue(outcome);
119
+        assertFalse(outcome);
120
     }
120
     }
121
 }
121
 }

+ 5
- 5
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java Целия файл

56
     public void substringBeginTest(){
56
     public void substringBeginTest(){
57
         // : Given
57
         // : Given
58
         String input = "Hello";
58
         String input = "Hello";
59
-        String expected = "olleH";
59
+        String expected = "Hel";
60
 
60
 
61
         // : When
61
         // : When
62
         String actual = StringUtilities.getPrefix(input);
62
         String actual = StringUtilities.getPrefix(input);
109
     public void getTheMiddleChar1(){
109
     public void getTheMiddleChar1(){
110
         // : Given
110
         // : Given
111
         String input = "Zipcode";
111
         String input = "Zipcode";
112
-        char expected = 'c';
112
+        Character expected = 'c';
113
 
113
 
114
         // : When
114
         // : When
115
-        char actual = StringUtilities.getMiddleCharacter(input);
115
+        Character actual = StringUtilities.getMiddleCharacter(input);
116
 
116
 
117
         // : Then
117
         // : Then
118
-        Assert.assertEquals(expected, actual);
118
+        Assert.assertEquals(expected.toString(), actual.toString());
119
     }
119
     }
120
 
120
 
121
 
121
 
154
         String expected = "Wilmington";
154
         String expected = "Wilmington";
155
 
155
 
156
         // : When
156
         // : When
157
-        String actual = StringUtilities.getFirstWord(input);
157
+        String actual = StringUtilities.getSecondWord(input);
158
 
158
 
159
         // : Then
159
         // : Then
160
         assertEquals(expected, actual);
160
         assertEquals(expected, actual);

BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class Целия файл


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class Целия файл


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class Целия файл


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class Целия файл


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class Целия файл


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class Целия файл


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class Целия файл