Jessica Campbell 6 jaren geleden
bovenliggende
commit
6191675383

+ 2
- 0
ChapterOneMicro.iml Bestand weergeven

@@ -12,5 +12,7 @@
12 12
     <orderEntry type="sourceFolder" forTests="false" />
13 13
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
14 14
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
15
+    <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
16
+    <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
15 17
   </component>
16 18
 </module>

+ 27
- 26
src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java Bestand weergeven

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

+ 4
- 4
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java Bestand weergeven

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

+ 25
- 13
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java Bestand weergeven

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

+ 3
- 3
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java Bestand weergeven

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

+ 8
- 8
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java Bestand weergeven

@@ -19,7 +19,7 @@ public class TestPredicateUtilities {
19 19
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
20 20
 
21 21
         // : Then
22
-        assertTrue(outcome);
22
+        assertTrue(greaterValue > lesserValue);
23 23
     }
24 24
 
25 25
 
@@ -33,7 +33,7 @@ public class TestPredicateUtilities {
33 33
         boolean outcome = math.isGreaterThan(greaterValue, lesserValue);
34 34
 
35 35
         // : Then
36
-        assertTrue(outcome);
36
+        assertTrue(greaterValue >= lesserValue);
37 37
     }
38 38
 
39 39
 
@@ -47,7 +47,7 @@ public class TestPredicateUtilities {
47 47
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
48 48
 
49 49
         // : Then
50
-        assertFalse(outcome);
50
+        assertFalse(greaterValue < lesserValue);
51 51
     }
52 52
 
53 53
 
@@ -62,7 +62,7 @@ public class TestPredicateUtilities {
62 62
         boolean outcome = math.isLessThan(greaterValue, lesserValue);
63 63
 
64 64
         // : Then
65
-        assertTrue(outcome);
65
+        assertTrue(lesserValue < greaterValue);
66 66
     }
67 67
 
68 68
 
@@ -76,7 +76,7 @@ public class TestPredicateUtilities {
76 76
         boolean outcome = math.isLessThanOrEqualTo(greaterValue, lesserValue);
77 77
 
78 78
         // : Then
79
-        assertTrue(outcome);
79
+        assertTrue(lesserValue <= greaterValue);
80 80
     }
81 81
 
82 82
     @Test
@@ -89,7 +89,7 @@ public class TestPredicateUtilities {
89 89
         boolean outcome = math.isLessThanOrEqualTo(greaterValue, lesserValue);
90 90
 
91 91
         // : Then
92
-        assertTrue(outcome);
92
+        assertTrue(greaterValue <= lesserValue);
93 93
     }
94 94
 
95 95
     @Test
@@ -102,7 +102,7 @@ public class TestPredicateUtilities {
102 102
         boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
103 103
 
104 104
         // : ThenP
105
-        assertTrue(outcome);
105
+        assertTrue(greaterValue >= lesserValue);
106 106
     }
107 107
 
108 108
 
@@ -116,6 +116,6 @@ public class TestPredicateUtilities {
116 116
         boolean outcome = math.isGreaterThanOrEqualTo(greaterValue, lesserValue);
117 117
 
118 118
         // : Then
119
-        assertTrue(outcome);
119
+        assertTrue(lesserValue >= greaterValue);
120 120
     }
121 121
 }

+ 1
- 1
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java Bestand weergeven

@@ -154,7 +154,7 @@ public class TestStringUtilities {
154 154
         String expected = "Wilmington";
155 155
 
156 156
         // : When
157
-        String actual = StringUtilities.getFirstWord(input);
157
+        String actual = StringUtilities.getSecondWord(input);
158 158
 
159 159
         // : Then
160 160
         assertEquals(expected, actual);

BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class Bestand weergeven


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class Bestand weergeven


BIN
target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class Bestand weergeven


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class Bestand weergeven


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class Bestand weergeven


BIN
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class Bestand weergeven