Skip to content

Commit 2b64d13

Browse files
miniyk2012miniyk2012
authored
Merge pull request onlyliuxin#14 from onlyliuxin/master
合并代码，包含了某个同学的junit3，4版本的代码
2 parents cbe7103 + ae96cdf commit 2b64d13

File tree

73 files changed

+4407
-0
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+4407
-0
lines changed

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/extension/RepeatedTest.java

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package org.litejunit.extension;
2+
3+
import org.litejunit.v2.Test;
4+
import org.litejunit.v2.TestResult;
5+
6+
/**
7+
* Created by john on 2017/9/2.
8+
*/
9+
public class RepeatedTest extends TestDecorator {
10+
private int fTimesRepeat;
11+
12+
public RepeatedTest(Test test, int repeat) {
13+
super(test);
14+
if (repeat < 0)
15+
throw new IllegalArgumentException("Repetition count must be > 0");
16+
fTimesRepeat = repeat;
17+
}
18+
19+
public int countTestCases() {
20+
return super.countTestCases() * fTimesRepeat;
21+
}
22+
23+
public void run(TestResult result) {
24+
for (int i = 0; i < fTimesRepeat; i++) {
25+
if (result.shouldStop())
26+
break;
27+
super.run(result);
28+
}
29+
}
30+
31+
public String toString() {
32+
return super.toString() + "(repeated)";
33+
}
34+
}

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/extension/TestDecorator.java

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
package org.litejunit.extension;
2+
3+
import org.litejunit.v2.Assert;
4+
import org.litejunit.v2.Test;
5+
import org.litejunit.v2.TestResult;
6+
7+
/**
8+
* Created by john on 2017/9/2.
9+
*/
10+
public class TestDecorator extends Assert implements Test {
11+
protected Test test;
12+
13+
public TestDecorator(Test test) {
14+
this.test = test;
15+
}
16+
17+
/**
18+
* The basic run behaviour.
19+
*/
20+
public void basicRun(TestResult result) {
21+
test.run(result);
22+
}
23+
24+
public int countTestCases() {
25+
return test.countTestCases();
26+
}
27+
28+
public void run(TestResult result) {
29+
basicRun(result);
30+
}
31+
32+
public String toString() {
33+
return test.toString();
34+
}
35+
36+
public Test getTest() {
37+
return test;
38+
}
39+
}

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/sample/calculator/Calculator.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package org.litejunit.sample.calculator;
2+
3+
/**
4+
* Created by john on 2017/8/29.
5+
*/
6+
public class Calculator {
7+
8+
private int result = 0;
9+
10+
public void add(int x) {
11+
result += x;
12+
}
13+
14+
public void subtract(int x) {
15+
result -= x;
16+
}
17+
18+
public int getResult() {
19+
return this.result;
20+
}
21+
22+
public static void main(String[] args) {
23+
Calculator calculator = new Calculator();
24+
calculator.add(10);
25+
calculator.subtract(5);
26+
System.out.println(calculator.getResult());
27+
}
28+
}

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/sample/calculator/CalculatorTest.java

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
package org.litejunit.sample.calculator;
2+
3+
4+
import org.litejunit.v1.TestCase;
5+
import org.litejunit.v1.TestResult;
6+
import org.litejunit.v1.TestSuite;
7+
8+
import static org.litejunit.v1.Assert.assertEquals;
9+
10+
/**
11+
* Created by john on 2017/8/29.
12+
*/
13+
public class CalculatorTest extends TestCase {
14+
public CalculatorTest(String name) {
15+
super(name);
16+
17+
}
18+
19+
Calculator calculator = null;
20+
21+
public void setUp() {
22+
calculator = new Calculator();
23+
}
24+
25+
public void tearDown() {
26+
calculator = null;
27+
}
28+
29+
public void testAdd() {
30+
31+
calculator.add(10);
32+
// System.out.println("CalculatorTest.testAdd");
33+
assertEquals(5,calculator.getResult());
34+
}
35+
36+
public void testSubtract() {
37+
calculator.add(10);
38+
calculator.subtract(5);
39+
// System.out.println("CalculatorTest.testSubtract");
40+
// throw new RuntimeException("this is a test");
41+
assertEquals(5,calculator.getResult());
42+
}
43+
44+
public static void main(String[] args) {
45+
// CalculatorTest c1 = new CalculatorTest("testAdd");
46+
// CalculatorTest c2 = new CalculatorTest("testSubtract");
47+
// c1.run();
48+
// c2.run();
49+
TestResult tr = new TestResult();
50+
TestSuite ts = new TestSuite(CalculatorTest.class);
51+
ts.run(tr);
52+
53+
System.out.println(tr.failures().next().thrownException());
54+
}
55+
}

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/v1/Assert.java

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,164 @@
1+
package org.litejunit.v1;
2+
3+
4+
/**
5+
* Created by john on 2017/9/2.
6+
*/
7+
public class Assert {
8+
protected Assert() {
9+
}
10+
11+
12+
public static void assertEquals(byte expected, byte actual) {
13+
assertEquals((String) null, (byte) expected, (byte) actual);
14+
}
15+
16+
public static void assertEquals(char expected, char actual) {
17+
assertEquals((String) null, (char) expected, (char) actual);
18+
}
19+
20+
public static void assertEquals(double expected, double actual, double delta) {
21+
assertEquals((String) null, expected, actual, delta);
22+
}
23+
24+
public static void assertEquals(float expected, float actual, float delta) {
25+
assertEquals((String) null, expected, actual, delta);
26+
}
27+
28+
public static void assertEquals(int expected, int actual) {
29+
assertEquals((String) null, (int) expected, (int) actual);
30+
}
31+
32+
public static void assertEquals(long expected, long actual) {
33+
assertEquals((String) null, expected, actual);
34+
}
35+
36+
public static void assertEquals(Object expected, Object actual) {
37+
assertEquals((String) null, expected, actual);
38+
}
39+
40+
public static void assertEquals(String message, byte expected, byte actual) {
41+
assertEquals(message, new Byte(expected), new Byte(actual));
42+
}
43+
44+
public static void assertEquals(String message, char expected, char actual) {
45+
assertEquals(message, new Character(expected), new Character(actual));
46+
}
47+
48+
public static void assertEquals(String message, double expected, double actual, double delta) {
49+
if (Double.isInfinite(expected)) {
50+
if (expected != actual) {
51+
failNotEquals(message, new Double(expected), new Double(actual));
52+
}
53+
} else if (Math.abs(expected - actual) > delta) {
54+
failNotEquals(message, new Double(expected), new Double(actual));
55+
}
56+
57+
}
58+
59+
public static void assertEquals(String message, float expected, float actual, float delta) {
60+
if (Float.isInfinite(expected)) {
61+
if (expected != actual) {
62+
failNotEquals(message, new Float(expected), new Float(actual));
63+
}
64+
} else if (Math.abs(expected - actual) > delta) {
65+
failNotEquals(message, new Float(expected), new Float(actual));
66+
}
67+
68+
}
69+
70+
public static void assertEquals(String message, int expected, int actual) {
71+
assertEquals(message, new Integer(expected), new Integer(actual));
72+
}
73+
74+
public static void assertEquals(String message, long expected, long actual) {
75+
assertEquals(message, new Long(expected), new Long(actual));
76+
}
77+
78+
public static void assertEquals(String message, Object expected, Object actual) {
79+
if (expected != null || actual != null) {
80+
if (expected == null || !expected.equals(actual)) {
81+
failNotEquals(message, expected, actual);
82+
}
83+
}
84+
}
85+
86+
public static void assertEquals(String message, short expected, short actual) {
87+
assertEquals(message, new Short(expected), new Short(actual));
88+
}
89+
90+
public static void assertEquals(String message, boolean expected, boolean actual) {
91+
assertEquals(message, new Boolean(expected), new Boolean(actual));
92+
}
93+
94+
public static void assertEquals(short expected, short actual) {
95+
assertEquals((String) null, (short) expected, (short) actual);
96+
}
97+
98+
public static void assertEquals(boolean expected, boolean actual) {
99+
assertEquals((String) null, expected, actual);
100+
}
101+
102+
public static void assertNotNull(Object object) {
103+
assertNotNull((String) null, object);
104+
}
105+
106+
public static void assertNotNull(String message, Object object) {
107+
assertTrue(message, object != null);
108+
}
109+
110+
public static void assertNull(Object object) {
111+
assertNull((String) null, object);
112+
}
113+
114+
public static void assertNull(String message, Object object) {
115+
assertTrue(message, object == null);
116+
}
117+
118+
public static void assertSame(Object expected, Object actual) {
119+
assertSame((String) null, expected, actual);
120+
}
121+
122+
public static void assertSame(String message, Object expected, Object actual) {
123+
if (expected != actual) {
124+
failNotSame(message, expected, actual);
125+
}
126+
}
127+
128+
public static void assertTrue(String message, boolean condition) {
129+
if (!condition) {
130+
fail(message);
131+
}
132+
133+
}
134+
135+
public static void assertTrue(boolean condition) {
136+
assertTrue((String) null, condition);
137+
}
138+
139+
public static void fail() {
140+
fail((String) null);
141+
}
142+
143+
public static void fail(String message) {
144+
throw new AssertionFailedError(message);
145+
}
146+
147+
private static void failNotEquals(String message, Object expected, Object actual) {
148+
String formatted = "";
149+
if (message != null) {
150+
formatted = message + " ";
151+
}
152+
153+
fail(formatted + "expected:<" + expected + "> but was:<" + actual + ">");
154+
}
155+
156+
private static void failNotSame(String message, Object expected, Object actual) {
157+
String formatted = "";
158+
if (message != null) {
159+
formatted = message + " ";
160+
}
161+
162+
fail(formatted + "expected same");
163+
}
164+
}

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/v1/AssertionFailedError.java

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package org.litejunit.v1;
2+
3+
/**
4+
* Created by john on 2017/9/2.
5+
*/
6+
public class AssertionFailedError extends Error{
7+
public AssertionFailedError() {
8+
9+
}
10+
11+
public AssertionFailedError(String message) {
12+
super(message);
13+
}
14+
}

‎students/315863321/ood/ood-assignment/src/main/java/org/litejunit/v1/Test.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
package org.litejunit.v1;
2+
3+
4+
/**
5+
* Created by john on 2017/8/30.
6+
*/
7+
8+
public interface Test {
9+
int countTestCases();
10+
11+
void run(TestResult tr);
12+
}

0 commit comments

Comments
 (0)