Skip to content

Commit 37ef89d

Browse files
jonahgrahamSarikaSinha
jonahgraham
authored and
SarikaSinha
committed
Bug 526917 - Revert "[Tests] OpenFromClipboardTests Failed"
TestAgainException isn't handled, so tests aren't actually running again with this flag. Alternative here is to refactor to extend AbstractDebugTest instead, or to use AbstractDebugTest.runBare here. This reverts commit 656256f. Change-Id: I04589fc4bf8560493cb2ca82bdf2edc6cde5d23e Reviewed-on: https://git.eclipse.org/r/c/jdt/eclipse.jdt.debug/+/192111 Tested-by: JDT Bot <[email protected]> Reviewed-by: Sarika Sinha <[email protected]>
1 parent fbb7d46 commit 37ef89d

File tree

1 file changed

+1
-103
lines changed

1 file changed

+1
-103
lines changed

‎org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java‎

Lines changed: 1 addition & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2010, 2018 IBM Corporation and others.
2+
* Copyright (c) 2010, 2022 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -166,9 +166,6 @@ public void testClassFileLine_1() throws Exception {
166166

167167
setupTypeTest("OpenFromClipboardTests");
168168
List<?> matches = getJavaElementMatches(s);
169-
if (matches.size() != 1) {
170-
throw new TestAgainException("testClassFileLine_1 test again");
171-
}
172169
assertEquals(1, matches.size());
173170
}
174171

@@ -178,9 +175,6 @@ public void testClassFileLine_2() throws Exception {
178175

179176
setupTypeTest("OpenFromClipboardTests");
180177
List<?> matches = getJavaElementMatches(s);
181-
if (matches.size() != 1) {
182-
throw new TestAgainException("testClassFileLine_2 test again");
183-
}
184178
assertEquals(1, matches.size());
185179
}
186180

@@ -190,9 +184,6 @@ public void testClassFileLine_3() throws Exception {
190184

191185
setupTypeTest("OpenFromClipboard$Tests");
192186
List<?> matches = getJavaElementMatches(s);
193-
if (matches.size() != 1) {
194-
throw new TestAgainException("testClassFileLine_3 test again");
195-
}
196187
assertEquals(1, matches.size());
197188
}
198189

@@ -205,9 +196,6 @@ public void testDBCS() throws Exception {
205196
setupTypeTest(typeName);
206197

207198
List<?> matches= getJavaElementMatches(s);
208-
if (matches.size() != 1) {
209-
throw new TestAgainException("testDBCS test again");
210-
}
211199
assertEquals(1, matches.size());
212200
}
213201

@@ -220,9 +208,6 @@ public void testUmlaut() throws Exception {
220208
setupTypeTest(typeName);
221209

222210
List<?> matches= getJavaElementMatches(s);
223-
if (matches.size() != 1) {
224-
throw new TestAgainException("testUmlaut test again");
225-
}
226211
assertEquals(1, matches.size());
227212
}
228213

@@ -232,9 +217,6 @@ public void testClassFile_1() throws Exception {
232217

233218
setupTypeTest("OpenFromClipboardTests");
234219
List<?> matches = getJavaElementMatches(s);
235-
if (matches.size() != 1) {
236-
throw new TestAgainException("testClassFile_1 test again");
237-
}
238220
assertEquals(1, matches.size());
239221
}
240222

@@ -244,9 +226,6 @@ public void testTypeLine_1() throws Exception {
244226

245227
setupTypeTest("OpenFromClipboardTests");
246228
List<?> matches = getJavaElementMatches(s);
247-
if (matches.size() != 1) {
248-
throw new TestAgainException("testTypeLine_1 test again");
249-
}
250229
assertEquals(1, matches.size());
251230
}
252231

@@ -256,9 +235,6 @@ public void testTypeLine_2() throws Exception {
256235

257236
setupTypeTest("OpenFromClipboardTests");
258237
List<?> matches = getJavaElementMatches(s);
259-
if (matches.size() != 1) {
260-
throw new TestAgainException("testTypeLine_2 test again");
261-
}
262238
assertEquals(1, matches.size());
263239
}
264240

@@ -269,9 +245,6 @@ public void testStackTraceLine_1() throws Exception {
269245

270246
setupTypeTest("OpenFromClipboardTests");
271247
List<?> matches = getJavaElementMatches(s);
272-
if (matches.size() != 1) {
273-
throw new TestAgainException("testStackTraceLine_1 test again");
274-
}
275248
assertEquals(1, matches.size());
276249
}
277250

@@ -281,9 +254,6 @@ public void testStackTraceLine_2() throws Exception {
281254

282255
setupTypeTest("OpenFromClipboardTests");
283256
List<?> matches = getJavaElementMatches(s);
284-
if (matches.size() != 1) {
285-
throw new TestAgainException("testStackTraceLine_2 test again");
286-
}
287257
assertEquals(1, matches.size());
288258
}
289259

@@ -293,9 +263,6 @@ public void testStackTraceLine_3() throws Exception {
293263

294264
setupTypeTest("OpenFromClipboardTests");
295265
List<?> matches = getJavaElementMatches(s);
296-
if (matches.size() != 1) {
297-
throw new TestAgainException("testStackTraceLine_3 test again");
298-
}
299266
assertEquals(1, matches.size());
300267
}
301268

@@ -305,9 +272,6 @@ public void testStackTraceLine_4() throws Exception {
305272

306273
setupTypeTest("OpenFromClipboardTests");
307274
List<?> matches = getJavaElementMatches(s);
308-
if (matches.size() != 1) {
309-
throw new TestAgainException("testStackTraceLine_4 test again");
310-
}
311275
assertEquals(1, matches.size());
312276
}
313277

@@ -317,9 +281,6 @@ public void testStackTraceLine_5() throws Exception {
317281

318282
setupTypeTest("OpenFromClipboardTests");
319283
List<?> matches = getJavaElementMatches(s);
320-
if (matches.size() != 1) {
321-
throw new TestAgainException("testStackTraceLine_5 test again");
322-
}
323284
assertEquals(1, matches.size());
324285
}
325286

@@ -329,9 +290,6 @@ public void testStackTraceLine_6() throws Exception {
329290

330291
setupTypeTest("OpenFromClipboard$Tests");
331292
List<?> matches = getJavaElementMatches(s);
332-
if (matches.size() != 1) {
333-
throw new TestAgainException("testStackTraceLine_6 test again");
334-
}
335293
assertEquals(1, matches.size());
336294
}
337295

@@ -342,9 +300,6 @@ public void testStackTraceLine_7() throws Exception {
342300

343301
setupTypeTest("OpenFromClipboardTests");
344302
List<?> matches = getJavaElementMatches(s);
345-
if (matches.size() != 1) {
346-
throw new TestAgainException("testStackTraceLine_7 test again");
347-
}
348303
assertEquals(1, matches.size());
349304
}
350305

@@ -370,9 +325,6 @@ public void testMethod_1() throws Exception {
370325

371326
setupMethodTest();
372327
List<?> matches = getJavaElementMatches(s);
373-
if (matches.size() != 1) {
374-
throw new TestAgainException("testMethod_1 test again");
375-
}
376328
assertEquals(1, matches.size());
377329
}
378330

@@ -382,9 +334,6 @@ public void testMethod_2() throws Exception {
382334

383335
setupMethodTest();
384336
List<?> matches = getJavaElementMatches(s);
385-
if (matches.size() != 1) {
386-
throw new TestAgainException("testMethod_2 test again");
387-
}
388337
assertEquals(1, matches.size());
389338
}
390339

@@ -394,9 +343,6 @@ public void testMethod_3() throws Exception {
394343

395344
setupMethodTest();
396345
List<?> matches = getJavaElementMatches(s);
397-
if (matches.size() != 1) {
398-
throw new TestAgainException("testMethod_3 test again");
399-
}
400346
assertEquals(1, matches.size());
401347
}
402348

@@ -406,9 +352,6 @@ public void testMethod_4() throws Exception {
406352

407353
setupMethodTest();
408354
List<?> matches = getJavaElementMatches(s);
409-
if (matches.size() != 1) {
410-
throw new TestAgainException("testMethod_4 test again");
411-
}
412355
assertEquals(1, matches.size());
413356
}
414357

@@ -418,9 +361,6 @@ public void testMethod_5() throws Exception {
418361

419362
setupMethodTest();
420363
List<?> matches = getJavaElementMatches(s);
421-
if (matches.size() != 1) {
422-
throw new TestAgainException("testMethod_5 test again");
423-
}
424364
assertEquals(1, matches.size());
425365
}
426366

@@ -430,9 +370,6 @@ public void testMethod_6() throws Exception {
430370

431371
setupMethodTest();
432372
List<?> matches = getJavaElementMatches(s);
433-
if (matches.size() != 1) {
434-
throw new TestAgainException("testMethod_6 test again");
435-
}
436373
assertEquals(1, matches.size());
437374
}
438375

@@ -442,9 +379,6 @@ public void testMethod_7() throws Exception {
442379

443380
setupMethodTest();
444381
List<?> matches = getJavaElementMatches(s);
445-
if (matches.size() != 1) {
446-
throw new TestAgainException("testMethod_7 test again");
447-
}
448382
assertEquals(1, matches.size());
449383
}
450384

@@ -489,9 +423,6 @@ public void testMethod_10() throws Exception {
489423

490424
setupMethodWithDollarSignTest();
491425
List<?> matches = getJavaElementMatches(s);
492-
if (matches.size() != 1) {
493-
throw new TestAgainException("testMethod_10 test again");
494-
}
495426
assertEquals(1, matches.size());
496427
}
497428

@@ -501,9 +432,6 @@ public void testMethod_11() throws Exception {
501432

502433
setupMethodWithDollarSignTest();
503434
List<?> matches = getJavaElementMatches(s);
504-
if (matches.size() != 1) {
505-
throw new TestAgainException("testMethod_11 test again");
506-
}
507435
assertEquals(1, matches.size());
508436
}
509437

@@ -525,9 +453,6 @@ public void testMember_1() throws Exception {
525453

526454
setupMemberTest();
527455
List<?> matches = getJavaElementMatches(s);
528-
if (matches.size() != 1) {
529-
throw new TestAgainException("testMember_1 test again");
530-
}
531456
assertEquals(1, matches.size());
532457
}
533458

@@ -537,9 +462,6 @@ public void testMember_2() throws Exception {
537462

538463
setupMemberTest();
539464
List<?> matches = getJavaElementMatches(s);
540-
if (matches.size() != 1) {
541-
throw new TestAgainException("testMember_2 test again");
542-
}
543465
assertEquals(1, matches.size());
544466
}
545467

@@ -549,9 +471,6 @@ public void testMember_3() throws Exception {
549471

550472
setupMemberTest();
551473
List<?> matches = getJavaElementMatches(s);
552-
if (matches.size() != 1) {
553-
throw new TestAgainException("testMember_3 test again");
554-
}
555474
assertEquals(1, matches.size());
556475
}
557476

@@ -574,9 +493,6 @@ public void testQualifiedName_2() throws Exception {
574493

575494
setupMemberTest();
576495
List<?> matches = getJavaElementMatches(s);
577-
if (matches.size() != 1) {
578-
throw new TestAgainException("testQualifiedName_2 test again");
579-
}
580496
assertEquals(1, matches.size());
581497
}
582498

@@ -586,9 +502,6 @@ public void testQualifiedName_3() throws Exception {
586502

587503
setupMemberTest();
588504
List<?> matches = getJavaElementMatches(s);
589-
if (matches.size() != 1) {
590-
throw new TestAgainException("testQualifiedName_3 test again");
591-
}
592505
assertEquals(1, matches.size());
593506
}
594507

@@ -617,9 +530,6 @@ public void testQualifiedName_4() throws Exception {
617530

618531
setupQualifiedNameWithDollarSignTest();
619532
List<?> matches = getJavaElementMatches(s);
620-
if (matches.size() != 1) {
621-
throw new TestAgainException("testQualifiedName_4 test again");
622-
}
623533
assertEquals(1, matches.size());
624534
}
625535

@@ -629,9 +539,6 @@ public void testQualifiedName_5() throws Exception {
629539

630540
setupQualifiedNameWithDollarSignTest();
631541
List<?> matches = getJavaElementMatches(s);
632-
if (matches.size() != 1) {
633-
throw new TestAgainException("testQualifiedName_5 test again");
634-
}
635542
assertEquals(1, matches.size());
636543
}
637544

@@ -641,9 +548,6 @@ public void testQualifiedName_6() throws Exception {
641548

642549
setupQualifiedNameWithDollarSignTest();
643550
List<?> matches = getJavaElementMatches(s);
644-
if (matches.size() != 1) {
645-
throw new TestAgainException("testQualifiedName_6 test again");
646-
}
647551
assertEquals(1, matches.size());
648552
}
649553

@@ -665,9 +569,6 @@ public void testStackElement_1() throws Exception {
665569

666570
setupStackElementTest();
667571
List<?> matches = getJavaElementMatches(s);
668-
if (matches.size() != 1) {
669-
throw new TestAgainException("testStackElement_1 test again");
670-
}
671572
assertEquals(1, matches.size());
672573
}
673574

@@ -677,9 +578,6 @@ public void testStackElement_2() throws Exception {
677578

678579
setupStackElementTest();
679580
List<?> matches = getJavaElementMatches(s);
680-
if (matches.size() != 1) {
681-
throw new TestAgainException("testStackElement_2 test again");
682-
}
683581
assertEquals(1, matches.size());
684582
}
685583

0 commit comments

Comments
 (0)