Skip to content

Commit eebb41e

Browse files
FuadFuad
Fuad
authored and
Fuad
committed
Updates
-Fixed White space by copy pasting code and clicking Beautify on this site: http://codebeautify.org/javaviewer -Modified names for Test Cases as suggested—> now includes numbers being tested along with max number in method call.
1 parent 37ff0e6 commit eebb41e

File tree

3 files changed

+205
-171
lines changed

3 files changed

+205
-171
lines changed

‎exercises/SumOfMultiples/src/example/SumOfMultiples.java

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
import java.util.Arrays;
22
public class SumOfMultiples {
3-
4-
5-
public int Sum(int number, int [] set){
6-
7-
int sum=0;
8-
int count=0;
9-
10-
for(int i=1; i<number; i++){
11-
12-
for(int j=0; j<set.length; j++){
13-
if(i% set[j]==0){
14-
count++;
15-
}
16-
}
17-
18-
if(count>0){
19-
sum=sum+i;
20-
count=0;
21-
}
22-
}
23-
24-
return sum;
25-
}
26-
3+
4+
5+
public int Sum(int number, int[] set) {
6+
7+
int sum = 0;
8+
int count = 0;
9+
10+
for (int i = 1; i < number; i++) {
11+
12+
for (int j = 0; j < set.length; j++) {
13+
if (i % set[j] == 0) {
14+
count++;
15+
}
16+
}
17+
18+
if (count > 0) {
19+
sum = sum + i;
20+
count = 0;
21+
}
22+
}
23+
24+
return sum;
25+
}
26+
2727
}

‎exercises/SumOfMultiples/src/java/SumOfMultiples.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
import java.util.Arrays;
22
public class SumOfMultiples {
3-
3+
44
}

‎exercises/SumOfMultiples/src/test/SumOfMultiplesTest.java

Lines changed: 180 additions & 146 deletions
Original file line numberDiff line numberDiff line change
@@ -4,150 +4,184 @@
44
import org.junit.Test;
55

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

0 commit comments

Comments
 (0)