Brian He před 6 roky
rodič
revize
d37dfd3a8b
15 změnil soubory, kde provedl 80 přidání a 70 odebrání
  1. 2
    0
      ChapterOneMicro.iml
  2. 27
    26
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java
  3. 21
    6
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java
  4. 19
    12
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java
  5. 1
    1
      src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java
  6. 5
    20
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java
  7. 3
    3
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java
  8. 2
    2
      src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java
  9. binární
      target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class
  10. binární
      target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class
  11. binární
      target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class
  12. binární
      target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class
  13. binární
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class
  14. binární
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class
  15. binární
      target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class

+ 2
- 0
ChapterOneMicro.iml Zobrazit soubor

12
     <orderEntry type="sourceFolder" forTests="false" />
12
     <orderEntry type="sourceFolder" forTests="false" />
13
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
13
     <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.12" level="project" />
14
     <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.3" level="project" />
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
   </component>
17
   </component>
16
 </module>
18
 </module>

+ 27
- 26
src/main/java/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.java Zobrazit soubor

1
+
1
 package com.zipcodewilmington.danny_do_better_exercises;
2
 package com.zipcodewilmington.danny_do_better_exercises;
2
 
3
 
3
 /**
4
 /**
11
      * @return sum of `baseValue` and `difference`
12
      * @return sum of `baseValue` and `difference`
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
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
     public Byte multiply(byte multiplicand, byte multiplier) {
204
-        return null;
205
+        return (byte)(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
 }

+ 21
- 6
src/main/java/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.java Zobrazit soubor

1
 package com.zipcodewilmington.danny_do_better_exercises;
1
 package com.zipcodewilmington.danny_do_better_exercises;
2
-
3
 /**
2
 /**
4
  * Created by dan on 6/14/17.
3
  * Created by dan on 6/14/17.
5
  */
4
  */
10
      * @return true if `x` is greater than `y`
9
      * @return true if `x` is greater than `y`
11
      */
10
      */
12
     public Boolean isGreaterThan(int x, int y) {
11
     public Boolean isGreaterThan(int x, int y) {
13
-        return null;
12
+        if(x > y){
13
+            return true;
14
+        }
15
+        return false;
14
     }
16
     }
15
-
16
     /**
17
     /**
17
      * @param x
18
      * @param x
18
      * @param y
19
      * @param y
19
      * @return true if `x` is less than `y`
20
      * @return true if `x` is less than `y`
20
      */
21
      */
22
+
21
     public Boolean isLessThan(int x, int y) {
23
     public Boolean isLessThan(int x, int y) {
22
-        return null;
24
+        /*System.out.println("The value of x = " + x);
25
+        System.out.println("The value of y = " + y);
26
+        System.out.println("x < y = " + (x < y));
27
+        */
28
+        if(x < y) {
29
+            return true;
30
+        }
31
+        return false;
23
     }
32
     }
24
 
33
 
25
     /**
34
     /**
28
      * @return true if `x` is greater than or equal to `y`
37
      * @return true if `x` is greater than or equal to `y`
29
      */
38
      */
30
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
39
     public Boolean isGreaterThanOrEqualTo(int x, int y) {
31
-        return null;
40
+        if(x >= y){
41
+            return true;
42
+        }
43
+        return false;
32
     }
44
     }
33
 
45
 
34
     /**
46
     /**
37
      * @return true if `x` is less than or equal to `y`
49
      * @return true if `x` is less than or equal to `y`
38
      */
50
      */
39
     public Boolean isLessThanOrEqualTo(int x, int y) {
51
     public Boolean isLessThanOrEqualTo(int x, int y) {
40
-        return null;
52
+        if(x <= y){
53
+            return true;
54
+        }
55
+        return false;
41
     }
56
     }
42
 }
57
 }

+ 19
- 12
src/main/java/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.java Zobrazit soubor

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
+        return "Hello World";
12
     }
12
     }
13
 
13
 
14
     /**
14
     /**
17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
17
      * @return the concatenation of two strings, `firstSegment`, and `secondSegment`
18
      */
18
      */
19
     public static String concatenation(String firstSegment, String secondSegment){
19
     public static String concatenation(String firstSegment, String secondSegment){
20
-        return null;
20
+        return firstSegment + secondSegment;
21
     }
21
     }
22
 
22
 
23
     /**
23
     /**
26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
26
      * @return the concatenation of an integer, `firstSegment`, and a String, `secondSegment`
27
      */
27
      */
28
     public static String concatenation(int firstSegment, String secondSegment){
28
     public static String concatenation(int firstSegment, String secondSegment){
29
-        return null;
29
+        return firstSegment + secondSegment;
30
     }
30
     }
31
 
31
 
32
     /**
32
     /**
34
      * @return the first 3 characters of `input`
34
      * @return the first 3 characters of `input`
35
      */
35
      */
36
     public static String getPrefix(String input){
36
     public static String getPrefix(String input){
37
-        return null;
37
+        return input.substring(0, 3);
38
     }
38
     }
39
 
39
 
40
     /**
40
     /**
42
      * @return the last 3 characters of `input`
42
      * @return the last 3 characters of `input`
43
      */
43
      */
44
     public static String getSuffix(String input){
44
     public static String getSuffix(String input){
45
-        return null;
45
+        return input.substring((input.length() - 3));
46
     }
46
     }
47
 
47
 
48
     /**
48
     /**
51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
51
      * @return the equivalence of two strings, `inputValue` and `comparableValue`
52
      */
52
      */
53
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
53
     public static Boolean compareTwoStrings(String inputValue, String comparableValue){
54
-        return null;
54
+        return inputValue.equals(comparableValue);
55
     }
55
     }
56
 
56
 
57
     /**
57
     /**
59
      * @return the middle character of `inputValue`
59
      * @return the middle character of `inputValue`
60
      */
60
      */
61
     public static Character getMiddleCharacter(String inputValue){
61
     public static Character getMiddleCharacter(String inputValue){
62
-        return null;
62
+        double middle = inputValue.length()/2;
63
+        int i = (int)middle;
64
+        if(inputValue.length() % 2 != 0) {
65
+            return inputValue.charAt(i);
66
+        } else {
67
+            return inputValue.charAt(i -1);
68
+        }
63
     }
69
     }
64
-
65
     /**
70
     /**
66
      * @param spaceDelimitedString a string, representative of a sentence, containing spaces
71
      * @param spaceDelimitedString a string, representative of a sentence, containing spaces
67
      * @return the first sequence of characters
72
      * @return the first sequence of characters
68
      */
73
      */
69
     public static String getFirstWord(String spaceDelimitedString){
74
     public static String getFirstWord(String spaceDelimitedString){
70
-        return null;
75
+        String [] array1 = spaceDelimitedString.split(" ",0);
76
+        return array1[0];
71
     }
77
     }
72
 
78
 
73
     /**
79
     /**
75
      * @return the second word of a string delimited by spaces.
81
      * @return the second word of a string delimited by spaces.
76
      */
82
      */
77
     public static String getSecondWord(String spaceDelimitedString){
83
     public static String getSecondWord(String spaceDelimitedString){
78
-        return null;
84
+        String [] array2 = spaceDelimitedString.split(" ", 0);
85
+        return array2[1];
79
     }
86
     }
80
 
87
 
81
     /**
88
     /**
82
      * @param stringToReverse
89
      * @param stringToReverse
83
      * @return an identical string with characters in reverse order.
90
      * @return an identical string with characters in reverse order.
84
      */
91
      */
85
-    public static String reverseTheTwo(String stringToReverse){
86
-        return null;
92
+    public static String reverseTheTwo(String stringToReverse) {
93
+        return new StringBuilder(stringToReverse).reverse().toString();
87
     }
94
     }
88
 }
95
 }

+ 1
- 1
src/main/java/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.java Zobrazit soubor

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
 }

+ 5
- 20
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.java Zobrazit soubor

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
78
         assertEquals(expected,actual, 0);
78
         assertEquals(expected,actual, 0);
79
     }
79
     }
80
 
80
 
81
-
82
-
83
-
84
-
85
-
86
-
87
-
88
-
89
-
90
-
91
-
92
-
93
-
94
-
95
-
96
     @Test
81
     @Test
97
     public void testSubtractions(){
82
     public void testSubtractions(){
98
         // : Given
83
         // : Given
146
         // : When
131
         // : When
147
         float actualFloat = primativeTypes.subtract(baseValue,difference);
132
         float actualFloat = primativeTypes.subtract(baseValue,difference);
148
         // : Then
133
         // : Then
149
-        assertEquals(expectedFloat,actualFloat, 0);
134
+        assertEquals(expectedFloat,actualFloat, 0.003);
150
     }
135
     }
151
     @Test
136
     @Test
152
     public void testSubtractions5() {
137
     public void testSubtractions5() {
294
     @Test
279
     @Test
295
     public void testMultiplication3() {
280
     public void testMultiplication3() {
296
         // : Given
281
         // : Given
297
-        byte multiplicand = 16;
298
-        byte multiplier = 14;
299
-        byte expectedByte = 64;
282
+        byte multiplicand = 6;
283
+        byte multiplier = 4;
284
+        byte expectedByte = 24;
300
         // : When
285
         // : When
301
         byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
286
         byte actualByte = primativeTypes.multiply(multiplicand, multiplier);
302
         // : Then
287
         // : Then

+ 3
- 3
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.java Zobrazit soubor

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
 }

+ 2
- 2
src/test/java/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.java Zobrazit soubor

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);
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ární
target/classes/com/zipcodewilmington/danny_do_better_exercises/MathUtilities.class Zobrazit soubor


binární
target/classes/com/zipcodewilmington/danny_do_better_exercises/PredicateUtilities.class Zobrazit soubor


binární
target/classes/com/zipcodewilmington/danny_do_better_exercises/StringUtilities.class Zobrazit soubor


binární
target/classes/com/zipcodewilmington/danny_do_better_exercises/ZipcodeRocks.class Zobrazit soubor


binární
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestMathUtilities.class Zobrazit soubor


binární
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestPredicateUtilities.class Zobrazit soubor


binární
target/test-classes/com/zipcodewilmington/danny_do_better_exercises/TestStringUtilities.class Zobrazit soubor