kristofer
/
JavaExercism
Следить 1
В избранное 0
Форкнуть 1
Код Задачи 0 Pull Request'ы 0 Релизы 1 Вики Активность
Просмотр исходного кода

Fixed test dir, static method, lowercase method name (#210)

abo64 9 лет назад
Родитель
4ef21e1b87
Сommit
b3dbda3f4c
3 измененных файлов: 13 добавлений и 27 удалений
Разделённый вид Показать статистику Diff
  1. 1
    2
      exercises/sum-of-multiples/src/example/java/SumOfMultiples.java
  2. 0
    1
      exercises/sum-of-multiples/src/main/java/SumOfMultiples.java
  3. 12
    24
      exercises/sum-of-multiples/src/test/java/SumOfMultiplesTest.java

+ 1
- 2
exercises/sum-of-multiples/src/example/java/SumOfMultiples.java Просмотреть файл 

@@ -1,8 +1,7 @@
1 
-import java.util.Arrays;
2 1 
 public class SumOfMultiples {
3 2
4 3
5 
-    public int Sum(int number, int[] set) {
4 
+    public static int sum(int number, int[] set) {
6 5
7 6 
         int sum = 0;
8 7 
         int count = 0;

+ 0
- 1
exercises/sum-of-multiples/src/main/java/SumOfMultiples.java Просмотреть файл 

@@ -1,4 +1,3 @@
1 
-import java.util.Arrays;
2 1 
 public class SumOfMultiples {
3 2
4 3 
 }

exercises/sum-of-multiples/src/test/SumOfMultiplesTest.java → exercises/sum-of-multiples/src/test/java/SumOfMultiplesTest.java Просмотреть файл 

@@ -9,12 +9,11 @@ public class SumOfMultiplesTest {
9 9 
     @Test
10 10 
     public void testSumOfMultiplesOf3and4UpToOne() {
11 11
12 
-        SumOfMultiples mySum = new SumOfMultiples();
13 12 
         int[] set = {
14 13 
             3,
15 14 
             5
16 15 
         };
17 
-        int output = mySum.Sum(1, set);
16 
+        int output = SumOfMultiples.sum(1, set);
18 17 
         assertEquals(0, output);
19 18
20 19 
     }
 
@@ -24,12 +23,11 @@ public class SumOfMultiplesTest {
24 23 
     @Ignore
25 24 
     public void testSumOfMultiplesOf3and5UpToFour() {
26 25
27 
-        SumOfMultiples mySum = new SumOfMultiples();
28 26 
         int[] set = {
29 27 
             3,
30 28 
             5
31 29 
         };
32 
-        int output = mySum.Sum(4, set);
30 
+        int output = SumOfMultiples.sum(4, set);
33 31 
         assertEquals(3, output);
34 32
35 33 
     }
 
@@ -39,12 +37,11 @@ public class SumOfMultiplesTest {
39 37 
     @Ignore
40 38 
     public void testSumOfMultiplesOf3and5UpToTen() {
41 39
42 
-        SumOfMultiples mySum = new SumOfMultiples();
43 40 
         int[] set = {
44 41 
             3,
45 42 
             5
46 43 
         };
47 
-        int output = mySum.Sum(10, set);
44 
+        int output = SumOfMultiples.sum(10, set);
48 45 
         assertEquals(23, output);
49 46
50 47 
     }
 
@@ -54,12 +51,11 @@ public class SumOfMultiplesTest {
54 51 
     @Ignore
55 52 
     public void testSumOfMultiplesOf3and5UpToOneHundred() {
56 53
57 
-        SumOfMultiples mySum = new SumOfMultiples();
58 54 
         int[] set = {
59 55 
             3,
60 56 
             5
61 57 
         };
62 
-        int output = mySum.Sum(100, set);
58 
+        int output = SumOfMultiples.sum(100, set);
63 59 
         assertEquals(2318, output);
64 60
65 61 
     }
 
@@ -69,12 +65,11 @@ public class SumOfMultiplesTest {
69 65 
     @Ignore
70 66 
     public void testSumOfMultiplesOf3and5UpToOneThousand() {
71 67
72 
-        SumOfMultiples mySum = new SumOfMultiples();
73 68 
         int[] set = {
74 69 
             3,
75 70 
             5
76 71 
         };
77 
-        int output = mySum.Sum(1000, set);
72 
+        int output = SumOfMultiples.sum(1000, set);
78 73 
         assertEquals(233168, output);
79 74
80 75 
     }
 
@@ -84,13 +79,12 @@ public class SumOfMultiplesTest {
84 79 
     @Ignore
85 80 
     public void testSumOfMultiplesOf7and13and17UpToTwenty() {
86 81
87 
-        SumOfMultiples mySum = new SumOfMultiples();
88 82 
         int[] set = {
89 83 
             7,
90 84 
             13,
91 85 
             17
92 86 
         };
93 
-        int output = mySum.Sum(20, set);
87 
+        int output = SumOfMultiples.sum(20, set);
94 88 
         assertEquals(51, output);
95 89
96 90 
     }
 
@@ -100,12 +94,11 @@ public class SumOfMultiplesTest {
100 94 
     @Ignore
101 95 
     public void testSumOfMultiplesOf4and6UpToFifteen() {
102 96
103 
-        SumOfMultiples mySum = new SumOfMultiples();
104 97 
         int[] set = {
105 98 
             4,
106 99 
             6
107 100 
         };
108 
-        int output = mySum.Sum(15, set);
101 
+        int output = SumOfMultiples.sum(15, set);
109 102 
         assertEquals(30, output);
110 103
111 104 
     }
 
@@ -115,13 +108,12 @@ public class SumOfMultiplesTest {
115 108 
     @Ignore
116 109 
     public void testSumOfMultiplesOf5and6and8UpToOneHundredFifty() {
117 110
118 
-        SumOfMultiples mySum = new SumOfMultiples();
119 111 
         int[] set = {
120 112 
             5,
121 113 
             6,
122 114 
             8
123 115 
         };
124 
-        int output = mySum.Sum(150, set);
116 
+        int output = SumOfMultiples.sum(150, set);
125 117 
         assertEquals(4419, output);
126 118
127 119 
     }
 
@@ -131,12 +123,11 @@ public class SumOfMultiplesTest {
131 123 
     @Ignore
132 124 
     public void testSumOfMultiplesOf5and25UpToTwoHundredSeventyFive() {
133 125
134 
-        SumOfMultiples mySum = new SumOfMultiples();
135 126 
         int[] set = {
136 127 
             5,
137 128 
             25
138 129 
         };
139 
-        int output = mySum.Sum(51, set);
130 
+        int output = SumOfMultiples.sum(51, set);
140 131 
         assertEquals(275, output);
141 132
142 133 
     }
 
@@ -146,12 +137,11 @@ public class SumOfMultiplesTest {
146 137 
     @Ignore
147 138 
     public void testSumOfMultiplesOf43and47UpToTenThousand() {
148 139
149 
-        SumOfMultiples mySum = new SumOfMultiples();
150 140 
         int[] set = {
151 141 
             43,
152 142 
             47
153 143 
         };
154 
-        int output = mySum.Sum(10000, set);
144 
+        int output = SumOfMultiples.sum(10000, set);
155 145 
         assertEquals(2203160, output);
156 146
157 147 
     }
 
@@ -161,11 +151,10 @@ public class SumOfMultiplesTest {
161 151 
     @Ignore
162 152 
     public void testSumOfMultiplesOfOneUpToOneHundred() {
163 153
164 
-        SumOfMultiples mySum = new SumOfMultiples();
165 154 
         int[] set = {
166 155 
             1
167 156 
         };
168 
-        int output = mySum.Sum(100, set);
157 
+        int output = SumOfMultiples.sum(100, set);
169 158 
         assertEquals(4950, output);
170 159
171 160 
     }
 
@@ -175,9 +164,8 @@ public class SumOfMultiplesTest {
175 164 
     @Ignore
176 165 
     public void testSumOfMultiplesOfNoneUpToTenThousand() {
177 166
178 
-        SumOfMultiples mySum = new SumOfMultiples();
179 167 
         int[] set = {};
180 
-        int output = mySum.Sum(10000, set);
168 
+        int output = SumOfMultiples.sum(10000, set);
181 169 
         assertEquals(0, output);
182 170
183 171 
     }