Skip to content

Commit 68fac93

Browse files
author
rcartwright
committed
This revision cleans up some the test code by moving testing operations involving AWT/Swing components to the event thread and eliminating clearEventQueue() calls. Much remains to be done.
The following files were modified: M src/edu/rice/cs/drjava/DrJavaTestCase.java M src/edu/rice/cs/drjava/ConfigFileTest.java M src/edu/rice/cs/drjava/model/debug/jpda/DebugContextTest.java M src/edu/rice/cs/drjava/model/GlobalModelCompileSuccessTest.java M src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java M src/edu/rice/cs/drjava/model/definitions/IndentTest.java M src/edu/rice/cs/drjava/model/GlobalModelCompileSuccessOptionsTest.java M src/edu/rice/cs/drjava/model/FindReplaceMachineTest.java M src/edu/rice/cs/drjava/model/junit/JUnitErrorModelTest.java M src/edu/rice/cs/drjava/model/repl/HistoryTest.java M src/edu/rice/cs/drjava/model/repl/InteractionsDJDocumentTest.java M src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java M src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java M src/edu/rice/cs/util/text/SwingDocument.java M src/edu/rice/cs/util/swing/UtilitiesTest.java M src/edu/rice/cs/util/swing/Utilities.java git-svn-id: file:///tmp/test-svn/trunk@5444 fe72c1cf-3628-48e9-8b72-1c46755d3cff
1 parent 3c8d894 commit 68fac93

16 files changed

+151
-113
lines changed

‎drjava/src/edu/rice/cs/drjava/ConfigFileTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ public void run() {
6969
DrJava._initConfig();
7070
}
7171
});
72-
Utilities.clearEventQueue();
73-
Utilities.clearEventQueue();
72+
// Utilities.clearEventQueue();
73+
// Utilities.clearEventQueue();
7474

7575
FileConfiguration config = DrJava.getConfig();
7676
assertEquals("custom indent level", 5, config.getSetting(OptionConstants.INDENT_LEVEL).intValue());

‎drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,6 @@ public void run() {
105105
catch(BadLocationException e) { throw new UnexpectedException(e); }
106106
}
107107
});
108-
Utilities.clearEventQueue(); // make sure that all listener actions triggered by this document update have completed
108+
Utilities.clearEventQueue(); // ensure that all listener actions triggered by this document update have completed
109109
}
110110
}

‎drjava/src/edu/rice/cs/drjava/model/FindReplaceMachineTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ public void run() {
652652
}
653653
});
654654

655-
Utilities.clearEventQueue();
655+
// Utilities.clearEventQueue();
656656
assertEquals("documents should equal", doc.toString(), frm.getDocument().toString());
657657
assertEquals("findNext return value", found, _result.getFoundOffset());
658658
_assertOffsets(frm, start, found);

‎drjava/src/edu/rice/cs/drjava/model/GlobalModelCompileSuccessOptionsTest.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,7 @@ public void testCompileWithJavaAssert()
149149
* the config before running the tests. We have a guess where the jar
150150
* is -- the lib directory -- but how can we get a URL for that?)
151151
*/
152-
public void testCompileWithGenerics()
153-
throws BadLocationException, IOException, InterruptedException
154-
{
152+
public void testCompileWithGenerics()throws BadLocationException, IOException, InterruptedException {
155153
// System.out.println("testCompileWithGenerics()");
156154
// Only run this test if using a compiler with generics
157155
if (_isGenericCompiler()) {
@@ -162,8 +160,9 @@ public void testCompileWithGenerics()
162160

163161
CompileShouldSucceedListener listener = new CompileShouldSucceedListener();
164162
_model.addListener(listener);
165-
_model.getCompilerModel().compileAll();
166-
Utilities.clearEventQueue();
163+
// _model.getCompilerModel().compileAll();
164+
listener.compile(doc);
165+
167166
if (_model.getCompilerModel().getNumErrors() > 0) {
168167
fail("compile failed: " + getCompilerErrorString());
169168
}

‎drjava/src/edu/rice/cs/drjava/model/GlobalModelCompileSuccessTest.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,9 @@ public void testCompileAllDifferentSourceRoots() throws BadLocationException, IO
7777

7878
// Make sure .class exists for both files
7979
File compiled = classForJava(file, "DrJavaTestFoo");
80-
assertTrue(_name() + "Foo Class file doesn't exist after compile",
81-
compiled.exists());
80+
assertTrue(_name() + "Foo Class file doesn't exist after compile", compiled.exists());
8281
File compiled2 = classForJava(file2, "DrJavaTestBar");
83-
assertTrue(_name() + "Bar Class file doesn't exist after compile",
84-
compiled2.exists());
82+
assertTrue(_name() + "Bar Class file doesn't exist after compile", compiled2.exists());
8583
_model.removeListener(listener);
8684
}
8785

‎drjava/src/edu/rice/cs/drjava/model/GlobalModelOtherTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void run() {
110110
_model.removeListener(listener);
111111
}
112112
});
113-
Utilities.clearEventQueue();
113+
// Utilities.clearEventQueue();
114114
_log.log("testUndoEventsOccur() completed");
115115
debug.logEnd();
116116
}

‎drjava/src/edu/rice/cs/drjava/model/debug/jpda/DebugContextTest.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public void XXXtestDebugSourcepath() throws Exception {
9696

9797
// Close file so it won't be in source root set
9898
_model.closeFile(doc);
99+
99100
Utilities.clearEventQueue();
100101
debugListener.assertRegionRemovedCount(1);
101102

@@ -318,6 +319,7 @@ public synchronized void XXXtestStepIntoOverBreakpoint() throws Exception {
318319

319320
// Close doc and make sure breakpoints are removed
320321
_model.closeFile(doc);
322+
321323
Utilities.clearEventQueue();
322324
debugListener.assertRegionRemovedCount(2); //fires (no waiting)
323325

@@ -458,6 +460,7 @@ public void XXXtestNonStaticWatches() throws Exception {
458460
_debugger.addWatch("asdf");
459461
_debugger.addWatch("nullString");
460462
_debugger.addWatch("localVar");
463+
461464
Utilities.clearEventQueue();
462465
debugListener.assertWatchSetCount(7);
463466

@@ -626,6 +629,7 @@ public void XXXtestNonStaticWatches() throws Exception {
626629

627630
// Close doc and make sure breakpoints are removed
628631
_model.closeFile(doc);
632+
629633
Utilities.clearEventQueue();
630634
debugListener.assertRegionRemovedCount(2); //fires (no waiting)
631635

@@ -666,6 +670,7 @@ public void XXXtestStaticWatches() throws Exception {
666670
_debugger.addWatch("twoDeepFoo");
667671
_debugger.addWatch("threeDeepFoo");
668672
_debugger.addWatch("asdf");
673+
669674
Utilities.clearEventQueue();
670675
debugListener.assertWatchSetCount(5);
671676

‎drjava/src/edu/rice/cs/drjava/model/definitions/DefinitionsDocumentTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,7 @@ public void textUndoAndRedoAfterMultipleLineIndent() throws BadLocationException
952952

953953
_doc.addUndoableEditListener(_doc.getUndoManager());
954954
DrJava.getConfig().setSetting(OptionConstants.INDENT_LEVEL,Integer.valueOf(2));
955-
Utilities.clearEventQueue();
955+
// Utilities.clearEventQueue();
956956
_doc.insertString(0, text, null);
957957
assertEquals("insertion",text, _doc.getText());
958958
/* This is necessary here and other places where indenting or commenting takes place because the undoListener in DefinitionsPane
@@ -994,7 +994,7 @@ public void textUndoAndRedoAfterMultipleLineCommentAndUncomment()
994994

995995
_doc.addUndoableEditListener(_doc.getUndoManager());
996996
DrJava.getConfig().setSetting(OptionConstants.INDENT_LEVEL,Integer.valueOf(2));
997-
Utilities.clearEventQueue();
997+
// Utilities.clearEventQueue();
998998
_doc.insertString(0,text,null);
999999
assertEquals("insertion",text, _doc.getText());
10001000

@@ -1043,7 +1043,7 @@ public void textCompoundUndoManager() throws BadLocationException {
10431043

10441044
_doc.addUndoableEditListener(undoManager);
10451045
DrJava.getConfig().setSetting(OptionConstants.INDENT_LEVEL,Integer.valueOf(2));
1046-
Utilities.clearEventQueue();
1046+
// Utilities.clearEventQueue();
10471047
// 1
10481048

10491049
// Start a compound edit and verify the returned key

‎drjava/src/edu/rice/cs/drjava/model/definitions/IndentTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1126,20 +1126,20 @@ public void testLiveUpdateOfIndentLevel() throws BadLocationException {
11261126

11271127
_assertContents(text, _doc);
11281128
safeIndentLines(0, _doc.getLength());
1129-
Utilities.clearEventQueue();
1130-
Utilities.clearEventQueue();
1129+
// Utilities.clearEventQueue();
1130+
// Utilities.clearEventQueue();
11311131
_assertContents(indentedBefore, _doc);
11321132
// System.err.println("Changing INDENT_LEVEL option constant to 8");
11331133
setConfigSetting(OptionConstants.INDENT_LEVEL, 8);
11341134

1135-
Utilities.clearEventQueue();
1136-
Utilities.clearEventQueue();
1135+
// Utilities.clearEventQueue();
1136+
// Utilities.clearEventQueue();
11371137
// System.err.println("level is " + DrJava.getConfig().getSetting(OptionConstants.INDENT_LEVEL));
11381138
// System.err.println("doc = " + _doc);
11391139
safeIndentLines(0, _doc.getLength());
11401140

1141-
Utilities.clearEventQueue();
1142-
Utilities.clearEventQueue();
1141+
// Utilities.clearEventQueue();
1142+
// Utilities.clearEventQueue();
11431143
// System.err.println("Performing failing assertion");
11441144
_assertContents(indentedAfter, _doc);
11451145
}

‎drjava/src/edu/rice/cs/drjava/model/junit/JUnitErrorModelTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
public final class JUnitErrorModelTest extends GlobalModelTestCase {
5353

5454
private volatile JUnitErrorModel _m;
55-
protected static final Log _log = new Log("JUnitError.txt", true);
55+
protected static final Log _log = new Log("JUnitError.txt", false);
5656

5757
private static final String MONKEYTEST_FAIL_TEXT =
5858
"import junit.framework.*; \n" +
@@ -207,7 +207,7 @@ public void run() {
207207
});
208208

209209
// Wait until events triggered by running unit tests have cleared ? (should be done by code above)
210-
Utilities.clearEventQueue();
210+
// Utilities.clearEventQueue();
211211
_log.log("Event queue cleared");
212212
_m = _model.getJUnitModel().getJUnitErrorModel();
213213

@@ -375,13 +375,13 @@ public void run() {
375375

376376
listener.waitCompileDone();
377377

378-
Utilities.clearEventQueue();
378+
// Utilities.clearEventQueue();
379379

380380
_log.log("Testing the first document");
381381

382382
listener.runJUnit(doc1); // waits until JUnit is done
383383

384-
Utilities.clearEventQueue();
384+
// Utilities.clearEventQueue();
385385

386386
_log.log("First document test should be complete");
387387
listener.assertJUnitStartCount(1);
@@ -397,16 +397,16 @@ public void run() {
397397
assertEquals("The first error is on line 5", 19, _m.getError(1).lineNumber());
398398
assertEquals("The first error is on line 5", 22, _m.getError(2).lineNumber());
399399

400-
Utilities.clearEventQueue();
401-
Utilities.clearEventQueue();
400+
// Utilities.clearEventQueue();
401+
// Utilities.clearEventQueue();
402402

403403
_log.log("Testing the second document");
404404
listener.resetJUnitCounts();
405405

406406
listener.runJUnit(doc2);
407407
// runJUnit waits until the thread started in DefaultJUnitModel._rawJUnitOpenDefDocs has called notify
408408

409-
Utilities.clearEventQueue();
409+
// Utilities.clearEventQueue();
410410
_log.log("Second document testing should be complete");
411411

412412
listener.assertJUnitStartCount(1);

0 commit comments

Comments
 (0)