Skip to content

Commit 5bec3f8

Browse files
author
Jay Bhaskar
committed
8339511: [TestBug] Convert Non parametrized base tests to JUnit 5
Reviewed-by: kcr, angorya
1 parent 5171753 commit 5bec3f8

File tree

170 files changed

+2336
-1592
lines changed

Some content is hidden

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

170 files changed

+2336
-1592
lines changed

‎modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingListTest.java

+28-16
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import javafx.beans.binding.Bindings;
3030
import javafx.collections.FXCollections;
3131
import javafx.collections.ObservableList;
32-
import org.junit.Before;
33-
import org.junit.Test;
32+
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Test;
3434

3535
import java.util.ArrayList;
3636
import java.util.Arrays;
3737
import java.util.List;
3838

39-
import static org.junit.Assert.*;
39+
import static org.junit.jupiter.api.Assertions.*;
4040

4141
public class BidirectionalContentBindingListTest {
4242

@@ -47,7 +47,7 @@ public class BidirectionalContentBindingListTest {
4747
private List<Integer> list1;
4848
private List<Integer> list2;
4949

50-
@Before
50+
@BeforeEach
5151
public void setUp() {
5252
list0 = new ArrayList<>();
5353
list1 = new ArrayList<>(Arrays.asList(-1));
@@ -100,19 +100,25 @@ public void testBind() {
100100
assertEquals(list2_sorted, op2);
101101
}
102102

103-
@Test(expected = NullPointerException.class)
103+
@Test
104104
public void testBind_Null_X() {
105-
Bindings.bindContentBidirectional(null, op2);
105+
assertThrows(NullPointerException.class, () -> {
106+
Bindings.bindContentBidirectional(null, op2);
107+
});
106108
}
107109

108-
@Test(expected = NullPointerException.class)
110+
@Test
109111
public void testBind_X_Null() {
110-
Bindings.bindContentBidirectional(op1, null);
112+
assertThrows(NullPointerException.class, () -> {
113+
Bindings.bindContentBidirectional(op1, null);
114+
});
111115
}
112116

113-
@Test(expected = IllegalArgumentException.class)
117+
@Test
114118
public void testBind_X_Self() {
115-
Bindings.bindContentBidirectional(op1, op1);
119+
assertThrows(IllegalArgumentException.class, () -> {
120+
Bindings.bindContentBidirectional(op1, op1);
121+
});
116122
}
117123

118124
@Test
@@ -158,19 +164,25 @@ public void testUnbind() {
158164
assertEquals(list2, op2);
159165
}
160166

161-
@Test(expected = NullPointerException.class)
167+
@Test
162168
public void testUnbind_Null_X() {
163-
Bindings.unbindContentBidirectional(null, op2);
169+
assertThrows(NullPointerException.class, () -> {
170+
Bindings.unbindContentBidirectional(null, op2);
171+
});
164172
}
165173

166-
@Test(expected = NullPointerException.class)
174+
@Test
167175
public void testUnbind_X_Null() {
168-
Bindings.unbindContentBidirectional(op1, null);
176+
assertThrows(NullPointerException.class, () -> {
177+
Bindings.unbindContentBidirectional(op1, null);
178+
});
169179
}
170180

171-
@Test(expected = IllegalArgumentException.class)
181+
@Test
172182
public void testUnbind_X_Self() {
173-
Bindings.unbindContentBidirectional(op1, op1);
183+
assertThrows(IllegalArgumentException.class, () -> {
184+
Bindings.unbindContentBidirectional(op1, op1);
185+
});
174186
}
175187

176188
@Test

‎modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingMapTest.java

+28-16
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
import javafx.beans.binding.Bindings;
3030
import javafx.collections.FXCollections;
3131
import javafx.collections.ObservableMap;
32-
import org.junit.Before;
33-
import org.junit.Test;
32+
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Test;
3434

3535
import java.util.HashMap;
3636
import java.util.Map;
3737

38-
import static org.junit.Assert.*;
38+
import static org.junit.jupiter.api.Assertions.*;
3939

4040
public class BidirectionalContentBindingMapTest {
4141

@@ -50,7 +50,7 @@ public class BidirectionalContentBindingMapTest {
5050
private Map<String, Integer> map1;
5151
private Map<String, Integer> map2;
5252

53-
@Before
53+
@BeforeEach
5454
public void setUp() {
5555
map0 = new HashMap<>();
5656
map1 = new HashMap<>();
@@ -102,19 +102,25 @@ public void testBind() {
102102
assertEquals(map2, op2);
103103
}
104104

105-
@Test(expected = NullPointerException.class)
105+
@Test
106106
public void testBind_Null_X() {
107-
Bindings.bindContentBidirectional(null, op2);
107+
assertThrows(NullPointerException.class, () -> {
108+
Bindings.bindContentBidirectional(null, op2);
109+
});
108110
}
109111

110-
@Test(expected = NullPointerException.class)
112+
@Test
111113
public void testBind_X_Null() {
112-
Bindings.bindContentBidirectional(op1, null);
114+
assertThrows(NullPointerException.class, () -> {
115+
Bindings.bindContentBidirectional(op1, null);
116+
});
113117
}
114118

115-
@Test(expected = IllegalArgumentException.class)
119+
@Test
116120
public void testBind_X_Self() {
117-
Bindings.bindContentBidirectional(op1, op1);
121+
assertThrows(IllegalArgumentException.class, () -> {
122+
Bindings.bindContentBidirectional(op1, op1);
123+
});
118124
}
119125

120126
@Test
@@ -164,19 +170,25 @@ public void testUnbind() {
164170
assertEquals(map2, op2);
165171
}
166172

167-
@Test(expected = NullPointerException.class)
173+
@Test
168174
public void testUnbind_Null_X() {
169-
Bindings.unbindContentBidirectional(null, op2);
175+
assertThrows(NullPointerException.class, () -> {
176+
Bindings.unbindContentBidirectional(null, op2);
177+
});
170178
}
171179

172-
@Test(expected = NullPointerException.class)
180+
@Test
173181
public void testUnbind_X_Null() {
174-
Bindings.unbindContentBidirectional(op1, null);
182+
assertThrows(NullPointerException.class, () -> {
183+
Bindings.unbindContentBidirectional(op1, null);
184+
});
175185
}
176186

177-
@Test(expected = IllegalArgumentException.class)
187+
@Test
178188
public void testUnbind_X_Self() {
179-
Bindings.unbindContentBidirectional(op1, op1);
189+
assertThrows(IllegalArgumentException.class, () -> {
190+
Bindings.unbindContentBidirectional(op1, op1);
191+
});
180192
}
181193

182194
@Test

‎modules/javafx.base/src/test/java/test/com/sun/javafx/binding/BidirectionalContentBindingSetTest.java

+28-16
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
import javafx.beans.binding.Bindings;
3030
import javafx.collections.FXCollections;
3131
import javafx.collections.ObservableSet;
32-
import org.junit.Before;
33-
import org.junit.Test;
32+
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Test;
3434

3535
import java.util.HashSet;
3636
import java.util.Set;
3737

38-
import static org.junit.Assert.*;
38+
import static org.junit.jupiter.api.Assertions.*;
3939

4040
public class BidirectionalContentBindingSetTest {
4141

@@ -46,7 +46,7 @@ public class BidirectionalContentBindingSetTest {
4646
private Set<Integer> set1;
4747
private Set<Integer> set2;
4848

49-
@Before
49+
@BeforeEach
5050
public void setUp() {
5151
set0 = new HashSet<>();
5252
set1 = new HashSet<>();
@@ -98,19 +98,25 @@ public void testBind() {
9898
assertEquals(set2, op2);
9999
}
100100

101-
@Test(expected = NullPointerException.class)
101+
@Test
102102
public void testBind_Null_X() {
103-
Bindings.bindContentBidirectional(null, op2);
103+
assertThrows(NullPointerException.class, () -> {
104+
Bindings.bindContentBidirectional(null, op2);
105+
});
104106
}
105107

106-
@Test(expected = NullPointerException.class)
108+
@Test
107109
public void testBind_X_Null() {
108-
Bindings.bindContentBidirectional(op1, null);
110+
assertThrows(NullPointerException.class, () -> {
111+
Bindings.bindContentBidirectional(op1, null);
112+
});
109113
}
110114

111-
@Test(expected = IllegalArgumentException.class)
115+
@Test
112116
public void testBind_X_Self() {
113-
Bindings.bindContentBidirectional(op1, op1);
117+
assertThrows(IllegalArgumentException.class, () -> {
118+
Bindings.bindContentBidirectional(op1, op1);
119+
});
114120
}
115121

116122
@Test
@@ -160,19 +166,25 @@ public void testUnbind() {
160166
assertEquals(set2, op2);
161167
}
162168

163-
@Test(expected = NullPointerException.class)
169+
@Test
164170
public void testUnbind_Null_X() {
165-
Bindings.unbindContentBidirectional(null, op2);
171+
assertThrows(NullPointerException.class, () -> {
172+
Bindings.unbindContentBidirectional(null, op2);
173+
});
166174
}
167175

168-
@Test(expected = NullPointerException.class)
176+
@Test
169177
public void testUnbind_X_Null() {
170-
Bindings.unbindContentBidirectional(op1, null);
178+
assertThrows(NullPointerException.class, () -> {
179+
Bindings.unbindContentBidirectional(op1, null);
180+
});
171181
}
172182

173-
@Test(expected = IllegalArgumentException.class)
183+
@Test
174184
public void testUnbind_X_Self() {
175-
Bindings.unbindContentBidirectional(op1, op1);
185+
assertThrows(IllegalArgumentException.class, () -> {
186+
Bindings.unbindContentBidirectional(op1, op1);
187+
});
176188
}
177189

178190
@Test

‎modules/javafx.base/src/test/java/test/com/sun/javafx/binding/ContentBindingListTest.java

+33-20
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929
import javafx.beans.binding.Bindings;
3030
import javafx.collections.FXCollections;
3131
import javafx.collections.ObservableList;
32-
import org.junit.Before;
33-
import org.junit.Test;
32+
import org.junit.jupiter.api.BeforeEach;
33+
import org.junit.jupiter.api.Test;
3434

3535
import java.util.ArrayList;
3636
import java.util.Arrays;
3737
import java.util.List;
3838

39-
import static org.junit.Assert.*;
39+
import static org.junit.jupiter.api.Assertions.*;
4040

4141
public class ContentBindingListTest {
4242

@@ -47,7 +47,7 @@ public class ContentBindingListTest {
4747
private List<Integer> list1;
4848
private List<Integer> list2;
4949

50-
@Before
50+
@BeforeEach
5151
public void setUp() {
5252
list0 = new ArrayList<>();
5353
list1 = new ArrayList<>(Arrays.asList(0));
@@ -84,19 +84,25 @@ public void testBind() {
8484
assertEquals(list2_sorted, op2);
8585
}
8686

87-
@Test(expected = NullPointerException.class)
87+
@Test
8888
public void testBind_Null_X() {
89-
Bindings.bindContent(null, op2);
89+
assertThrows(NullPointerException.class, () -> {
90+
Bindings.bindContent(null, op2);
91+
});
9092
}
9193

92-
@Test(expected = NullPointerException.class)
94+
@Test
9395
public void testBind_X_Null() {
94-
Bindings.bindContent(op1, null);
96+
assertThrows(NullPointerException.class, () -> {
97+
Bindings.bindContent(op1, null);
98+
});
9599
}
96100

97-
@Test(expected = IllegalArgumentException.class)
101+
@Test
98102
public void testBind_X_Self() {
99-
Bindings.bindContent(op2, op2);
103+
assertThrows(IllegalArgumentException.class, () -> {
104+
Bindings.bindContent(op2, op2);
105+
});
100106
}
101107

102108
@Test
@@ -123,21 +129,28 @@ public void testUnbind() {
123129
assertEquals(list1, op2);
124130
}
125131

126-
@Test(expected = NullPointerException.class)
132+
@Test
127133
public void testUnbind_Null_X() {
128-
Bindings.unbindContent(null, op2);
134+
assertThrows(NullPointerException.class, () -> {
135+
Bindings.unbindContent(null, op2);
136+
});
129137
}
130138

131-
@Test(expected = NullPointerException.class)
139+
@Test
132140
public void testUnbind_X_Null() {
133-
Bindings.unbindContent(op1, null);
141+
assertThrows(NullPointerException.class, () -> {
142+
Bindings.unbindContent(op1, null);
143+
});
134144
}
135145

136-
@Test(expected = IllegalArgumentException.class)
146+
@Test
137147
public void testUnbind_X_Self() {
138-
Bindings.unbindContent(op2, op2);
148+
assertThrows(IllegalArgumentException.class, () -> {
149+
Bindings.unbindContent(op2, op2);
150+
});
139151
}
140152

153+
141154
@Test
142155
public void testChaining() {
143156
Bindings.bindContent(op1, op2);
@@ -174,7 +187,7 @@ public void testHashCode() {
174187
}
175188

176189
@Test
177-
public void testEquals() {
190+
public void testEquals() {
178191
final Object golden = ContentBinding.bind(op1, op2);
179192
ContentBinding.unbind(op1, op2);
180193

@@ -187,7 +200,7 @@ public void testEquals() {
187200
ContentBinding.unbind(op2, op3);
188201
assertFalse(golden.equals(ContentBinding.bind(op2, op3)));
189202
ContentBinding.unbind(op2, op3);
190-
}
203+
}
191204

192205
@Test
193206
public void testEqualsWithGCedProperty() {
@@ -209,8 +222,8 @@ public void testAlreadyBound() {
209222
final Thread.UncaughtExceptionHandler exceptionHandler =
210223
Thread.currentThread().getUncaughtExceptionHandler();
211224
Thread.currentThread().setUncaughtExceptionHandler((t, e) -> {
212-
throw new AssertionError("We don't expect any exceptions in this test!", e);
213-
}
225+
throw new AssertionError("We don't expect any exceptions in this test!", e);
226+
}
214227
);
215228

216229
ContentBinding.bind(op1, op2);

0 commit comments

Comments
 (0)