@@ -17,7 +17,7 @@ private void assertDoublesEqual(double d1, double d2, String numberPart) {
17
17
18
18
private void assertComplexNumbersEqual (ComplexNumber c1 , ComplexNumber c2 ) {
19
19
assertDoublesEqual (c1 .getReal (), c2 .getReal (), "real" );
20
- assertDoublesEqual (c1 .getImag (), c2 .getImag (), "imaginary" );
20
+ assertDoublesEqual (c1 .getImaginary (), c2 .getImaginary (), "imaginary" );
21
21
}
22
22
23
23
// Tests
@@ -49,31 +49,31 @@ public void testRealPartOfNumberWithRealAndImaginaryParts() {
49
49
@ Test
50
50
public void testImaginaryPartOfPurelyRealNumber () {
51
51
double expected = 0.0 ;
52
- double actual = new ComplexNumber (1.0 , 0 ).getImag ();
52
+ double actual = new ComplexNumber (1.0 , 0 ).getImaginary ();
53
53
assertDoublesEqual (expected , actual , "imaginary" );
54
54
}
55
55
56
56
@ Ignore ("Remove to run test" )
57
57
@ Test
58
58
public void testImaginaryPartOfPurelyImaginaryNumber () {
59
59
double expected = 1.0 ;
60
- double actual = new ComplexNumber (0 , 1.0 ).getImag ();
60
+ double actual = new ComplexNumber (0 , 1.0 ).getImaginary ();
61
61
assertDoublesEqual (expected , actual , "imaginary" );
62
62
}
63
63
64
64
@ Ignore ("Remove to run test" )
65
65
@ Test
66
66
public void testImaginaryPartOfNumberWithRealAndImaginaryParts () {
67
67
double expected = 2.0 ;
68
- double actual = new ComplexNumber (1.0 , 2.0 ).getImag ();
68
+ double actual = new ComplexNumber (1.0 , 2.0 ).getImaginary ();
69
69
assertDoublesEqual (expected , actual , "imaginary" );
70
70
}
71
71
72
72
@ Ignore ("Remove to run test" )
73
73
@ Test
74
74
public void testImaginaryUnitExhibitsDefiningProperty () {
75
75
ComplexNumber expected = new ComplexNumber (-1.0 , 0 );
76
- ComplexNumber actual = new ComplexNumber (0 , 1.0 ).times (new ComplexNumber (0 , 1.0 ));
76
+ ComplexNumber actual = new ComplexNumber (0 , 1.0 ).multiply (new ComplexNumber (0 , 1.0 ));
77
77
assertComplexNumbersEqual (expected , actual );
78
78
}
79
79
@@ -105,71 +105,71 @@ public void testAdditionWithRealAndImaginaryParts() {
105
105
@ Test
106
106
public void testSubtractionWithPurelyRealNumbers () {
107
107
ComplexNumber expected = new ComplexNumber (-1.0 , 0.0 );
108
- ComplexNumber actual = new ComplexNumber (1.0 , 0.0 ).minus (new ComplexNumber (2.0 , 0.0 ));
108
+ ComplexNumber actual = new ComplexNumber (1.0 , 0.0 ).subtract (new ComplexNumber (2.0 , 0.0 ));
109
109
assertComplexNumbersEqual (expected , actual );
110
110
}
111
111
112
112
@ Ignore ("Remove to run test" )
113
113
@ Test
114
114
public void testSubtractionWithPurelyImaginaryNumbers () {
115
115
ComplexNumber expected = new ComplexNumber (0 , -1.0 );
116
- ComplexNumber actual = new ComplexNumber (0 , 1.0 ).minus (new ComplexNumber (0 , 2.0 ));
116
+ ComplexNumber actual = new ComplexNumber (0 , 1.0 ).subtract (new ComplexNumber (0 , 2.0 ));
117
117
assertComplexNumbersEqual (expected , actual );
118
118
}
119
119
120
120
@ Ignore ("Remove to run test" )
121
121
@ Test
122
122
public void testSubtractionWithRealAndImaginaryParts () {
123
123
ComplexNumber expected = new ComplexNumber (-2.0 , -2.0 );
124
- ComplexNumber actual = new ComplexNumber (1.0 , 2.0 ).minus (new ComplexNumber (3.0 , 4.0 ));
124
+ ComplexNumber actual = new ComplexNumber (1.0 , 2.0 ).subtract (new ComplexNumber (3.0 , 4.0 ));
125
125
assertComplexNumbersEqual (expected , actual );
126
126
}
127
127
128
128
@ Ignore ("Remove to run test" )
129
129
@ Test
130
130
public void testMultiplicationWithPurelyRealNumbers () {
131
131
ComplexNumber expected = new ComplexNumber (2.0 , 0 );
132
- ComplexNumber actual = new ComplexNumber (1.0 , 0 ).times (new ComplexNumber (2.0 , 0 ));
132
+ ComplexNumber actual = new ComplexNumber (1.0 , 0 ).multiply (new ComplexNumber (2.0 , 0 ));
133
133
assertComplexNumbersEqual (expected , actual );
134
134
}
135
135
136
136
@ Ignore ("Remove to run test" )
137
137
@ Test
138
138
public void testMultiplicationWithPurelyImaginaryNumbers () {
139
139
ComplexNumber expected = new ComplexNumber (-2.0 , 0 );
140
- ComplexNumber actual = new ComplexNumber (0 , 1.0 ).times (new ComplexNumber (0 , 2.0 ));
140
+ ComplexNumber actual = new ComplexNumber (0 , 1.0 ).multiply (new ComplexNumber (0 , 2.0 ));
141
141
assertComplexNumbersEqual (expected , actual );
142
142
}
143
143
144
144
@ Ignore ("Remove to run test" )
145
145
@ Test
146
146
public void testMultiplicationWithRealAndImaginaryParts () {
147
147
ComplexNumber expected = new ComplexNumber (-5.0 , 10.0 );
148
- ComplexNumber actual = new ComplexNumber (1.0 , 2.0 ).times (new ComplexNumber (3.0 , 4.0 ));
148
+ ComplexNumber actual = new ComplexNumber (1.0 , 2.0 ).multiply (new ComplexNumber (3.0 , 4.0 ));
149
149
assertComplexNumbersEqual (expected , actual );
150
150
}
151
151
152
152
@ Ignore ("Remove to run test" )
153
153
@ Test
154
154
public void testDivisionWithPurelyRealNumbers () {
155
155
ComplexNumber expected = new ComplexNumber (0.5 , 0 );
156
- ComplexNumber actual = new ComplexNumber (1.0 , 0 ).div (new ComplexNumber (2.0 , 0 ));
156
+ ComplexNumber actual = new ComplexNumber (1.0 , 0 ).divide (new ComplexNumber (2.0 , 0 ));
157
157
assertComplexNumbersEqual (expected , actual );
158
158
}
159
159
160
160
@ Ignore ("Remove to run test" )
161
161
@ Test
162
162
public void testDivisionWithPurelyImaginaryNumbers () {
163
163
ComplexNumber expected = new ComplexNumber (0.5 , 0 );
164
- ComplexNumber actual = new ComplexNumber (0 , 1.0 ).div (new ComplexNumber (0 , 2.0 ));
164
+ ComplexNumber actual = new ComplexNumber (0 , 1.0 ).divide (new ComplexNumber (0 , 2.0 ));
165
165
assertComplexNumbersEqual (expected , actual );
166
166
}
167
167
168
168
@ Ignore ("Remove to run test" )
169
169
@ Test
170
170
public void testDivisionWithRealAndImaginaryParts () {
171
171
ComplexNumber expected = new ComplexNumber (0.44 , 0.08 );
172
- ComplexNumber actual = new ComplexNumber (1.0 , 2.0 ).div (new ComplexNumber (3.0 , 4.0 ));
172
+ ComplexNumber actual = new ComplexNumber (1.0 , 2.0 ).divide (new ComplexNumber (3.0 , 4.0 ));
173
173
assertComplexNumbersEqual (expected , actual );
174
174
}
175
175
0 commit comments