Bladeren bron

First Commit

Kaitrina High 6 jaren geleden
bovenliggende
commit
9d77a8fad1

+ 1
- 1
.idea/misc.xml Bestand weergeven

@@ -23,7 +23,7 @@
23 23
       </profile-state>
24 24
     </entry>
25 25
   </component>
26
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
26
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="9.0" project-jdk-type="JavaSDK">
27 27
     <output url="file://$PROJECT_DIR$/classes" />
28 28
   </component>
29 29
   <component name="masterDetails">

+ 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>

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

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

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

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

+ 23
- 10
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,8 @@ 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
+
22
+        return firstSegment.concat(secondSegment);
21 23
     }
22 24
 
23 25
     /**
@@ -26,7 +28,9 @@ public class StringUtilities {
26 28
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27 29
      */
28 30
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
31
+
32
+        StringBuilder sb = new StringBuilder();
33
+        return sb.append(firstSegment).append(secondSegment).toString();
30 34
     }
31 35
 
32 36
     /**
@@ -34,7 +38,8 @@ public class StringUtilities {
34 38
      * @return the first 3 characters of `input`
35 39
      */
36 40
     public static String getPrefix(String input){
37
-        return null;
41
+
42
+        return input.substring(0,3);
38 43
     }
39 44
 
40 45
     /**
@@ -42,7 +47,8 @@ public class StringUtilities {
42 47
      * @return the last 3 characters of `input`
43 48
      */
44 49
     public static String getSuffix(String input){
45
-        return null;
50
+
51
+        return input.substring(2, 5);
46 52
     }
47 53
 
48 54
     /**
@@ -51,7 +57,8 @@ public class StringUtilities {
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
+
61
+        return inputValue.equals(comparableValue);
55 62
     }
56 63
 
57 64
     /**
@@ -59,7 +66,7 @@ public class StringUtilities {
59 66
      * @return the middle character of `inputValue`
60 67
      */
61 68
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
69
+        return inputValue.charAt(inputValue.length()/2 - 1);
63 70
     }
64 71
 
65 72
     /**
@@ -67,7 +74,9 @@ public class StringUtilities {
67 74
      * @return the first sequence of characters
68 75
      */
69 76
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
77
+
78
+        String[] space = spaceDelimitedString.split(" ");
79
+        return space[0];
71 80
     }
72 81
 
73 82
     /**
@@ -75,7 +84,9 @@ 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
+
88
+        String[] space = spaceDelimitedString.split(" ");
89
+        return space[1];
79 90
     }
80 91
 
81 92
     /**
@@ -83,6 +94,8 @@ public class StringUtilities {
83 94
      * @return an identical string with characters in reverse order.
84 95
      */
85 96
     public static String reverseTheTwo(String stringToReverse){
86
-        return null;
97
+
98
+        return new StringBuilder(stringToReverse).reverse().toString();
99
+
87 100
     }
88 101
 }

+ 1
- 1
src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java Bestand weergeven

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

+ 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

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

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

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

@@ -56,7 +56,7 @@ public class TestStringUtilities {
56 56
     public void substringBeginTest(){
57 57
         // : Given
58 58
         String input = "Hello";
59
-        String expected = "olleH";
59
+        String expected = "Hel";
60 60
 
61 61
         // : When
62 62
         String actual = StringUtilities.getPrefix(input);
@@ -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/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.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