Skip to content

Commit ed17cba

Browse files
ponderosaTXponderosaTX
committed
This revision reverts the superclass of test classes with no assertXXX or
fail operations outside the main test thread to DrJavaTestCase. Using MultiThreadedTestCase almost everywhere was too expensive measured in the time required to run all unit tests. The following files were modified, added, or removed: modified: src/edu/rice/cs/drjava/CommandLineTest.java modified: src/edu/rice/cs/drjava/ConfigFileTest.java modified: src/edu/rice/cs/drjava/DependenciesTest.java modified: src/edu/rice/cs/drjava/config/BooleanOptionTest.java modified: src/edu/rice/cs/drjava/config/ColorOptionTest.java modified: src/edu/rice/cs/drjava/config/DrJavaPropertySetupTest.java modified: src/edu/rice/cs/drjava/config/FontOptionTest.java modified: src/edu/rice/cs/drjava/config/ForcedChoiceOptionTest.java modified: src/edu/rice/cs/drjava/config/IntegerOptionTest.java modified: src/edu/rice/cs/drjava/config/KeyStrokeOptionTest.java modified: src/edu/rice/cs/drjava/config/LongOptionTest.java modified: src/edu/rice/cs/drjava/config/NonNegativeIntegerOptionTest.java modified: src/edu/rice/cs/drjava/config/OptionMapLoaderTest.java modified: src/edu/rice/cs/drjava/config/SavableConfigurationTest.java modified: src/edu/rice/cs/drjava/config/StringOptionTest.java modified: src/edu/rice/cs/drjava/config/VectorOptionTest.java modified: src/edu/rice/cs/drjava/model/AbstractDJDocumentTest.java modified: src/edu/rice/cs/drjava/model/ClassAndInterfaceFinderTest.java modified: src/edu/rice/cs/drjava/model/DocumentRegionTest.java modified: src/edu/rice/cs/drjava/model/DummyGlobalModelTest.java modified: src/edu/rice/cs/drjava/model/EventNotifierTest.java modified: src/edu/rice/cs/drjava/model/FindReplaceMachineTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelJUnitTest.java modified: src/edu/rice/cs/drjava/model/GlobalModelTestCase.java modified: src/edu/rice/cs/drjava/model/MultiThreadedTestCaseTest.java modified: src/edu/rice/cs/drjava/model/TestDocGetterTest.java modified: src/edu/rice/cs/drjava/model/cache/DocumentCacheTest.java modified: src/edu/rice/cs/drjava/model/compiler/CompilerErrorModelTest.java modified: src/edu/rice/cs/drjava/model/debug/DebugTestCase.java modified: src/edu/rice/cs/drjava/model/debug/DebugWatchDataTest.java modified: src/edu/rice/cs/drjava/model/definitions/CommentTest.java modified: src/edu/rice/cs/drjava/model/definitions/IndentTest.java modified: src/edu/rice/cs/drjava/model/definitions/indent/IndentRulesTestCase.java modified: src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceInfoTest.java modified: src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceReductionTestCase.java modified: src/edu/rice/cs/drjava/model/definitions/reducedmodel/BraceTest.java modified: src/edu/rice/cs/drjava/model/definitions/reducedmodel/GapTest.java modified: src/edu/rice/cs/drjava/model/definitions/reducedmodel/ModelListTest.java modified: src/edu/rice/cs/drjava/model/javadoc/JavadocModelTest.java modified: src/edu/rice/cs/drjava/model/print/DrJavaBookTest.java modified: src/edu/rice/cs/drjava/model/repl/HistoryTest.java modified: src/edu/rice/cs/drjava/model/repl/InteractionsDJDocumentTest.java modified: src/edu/rice/cs/drjava/model/repl/InteractionsDocumentTest.java modified: src/edu/rice/cs/drjava/model/repl/InteractionsModelTest.java modified: src/edu/rice/cs/drjava/model/repl/JavaInterpreterTest.java modified: src/edu/rice/cs/drjava/model/repl/newjvm/NewJVMTest.java modified: src/edu/rice/cs/drjava/project/ProjectTest.java modified: src/edu/rice/cs/drjava/project/XMLProjectFileParserTest.java modified: src/edu/rice/cs/drjava/ui/DefinitionsPaneMemoryLeakTest.java modified: src/edu/rice/cs/drjava/ui/FindReplacePanel.java modified: src/edu/rice/cs/drjava/ui/InteractionsPaneTest.java modified: src/edu/rice/cs/drjava/ui/ProjectMenuTest.java modified: src/edu/rice/cs/drjava/ui/RecentFileManagerTest.java modified: src/edu/rice/cs/drjava/ui/config/BooleanOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/ColorOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/FileOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/FontOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/ForcedChoiceOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/IntegerOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/KeyStrokeOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/VectorFileOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/config/VectorKeyStrokeOptionComponentTest.java modified: src/edu/rice/cs/drjava/ui/predictive/PredictiveInputModelTest.java modified: src/edu/rice/cs/util/ArgumentTokenizerTest.java modified: src/edu/rice/cs/util/FileOpsTest.java modified: src/edu/rice/cs/util/ReaderWriterLockTest.java modified: src/edu/rice/cs/util/StreamRedirectorTest.java modified: src/edu/rice/cs/util/StringOpsTest.java modified: src/edu/rice/cs/util/docnavigation/JListSortNavigatorTest.java modified: src/edu/rice/cs/util/docnavigation/JTreeSortNavigatorTest.java modified: src/edu/rice/cs/util/jar/JarCreationTest.java modified: src/edu/rice/cs/util/newjvm/IntegratedMasterSlaveTest.java modified: src/edu/rice/cs/util/sexp/SExpParserTest.java modified: src/edu/rice/cs/util/sexp/TokensTest.java modified: src/edu/rice/cs/util/swing/HighlightManagerTest.java modified: src/edu/rice/cs/util/text/ConsoleDocumentTest.java modified: src/edu/rice/cs/util/text/SwingDocumentTest.java
1 parent 9d7e7b5 commit ed17cba

File tree

77 files changed

+177
-186
lines changed

Some content is hidden

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

77 files changed

+177
-186
lines changed

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
import java.io.IOException;
4343
import java.util.List;
4444

45-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
45+
import edu.rice.cs.drjava.DrJavaTestCase;
4646
import edu.rice.cs.drjava.model.OpenDefinitionsDocument;
4747
import edu.rice.cs.drjava.model.definitions.InvalidPackageException;
4848
import edu.rice.cs.drjava.ui.MainFrame;
@@ -51,10 +51,11 @@
5151
import edu.rice.cs.util.StringOps;
5252
import edu.rice.cs.util.swing.Utilities;
5353

54-
/** Tests opening/creating files specified as command line arguments.
54+
/** Tests opening/creating files specified as command line arguments. Does not use MultiThreadedTestCase because
55+
* all JUnit assertXXX calls run in the main test thread.
5556
* @version $Id$
5657
*/
57-
public final class CommandLineTest extends MultiThreadedTestCase {
58+
public final class CommandLineTest extends DrJavaTestCase {
5859
/** File separator, i.e. '/' or '\\'. */
5960
private static final char FS = File.separatorChar;
6061

@@ -87,7 +88,6 @@ public final class CommandLineTest extends MultiThreadedTestCase {
8788
private volatile String f8_name;
8889
private volatile String f8_contents;
8990

90-
9191
/** Files that do not exist (constructor deletes them), and their filenames. */
9292
private volatile File nof1;
9393
private volatile File nof2;
@@ -111,7 +111,6 @@ public final class CommandLineTest extends MultiThreadedTestCase {
111111
public void setUp() throws Exception {
112112
super.setUp();
113113

114-
// _log.log("INVOKing DrJava._initConfig() for " + this);
115114
// Perform Swing initialization in event thread because the event thread is already running
116115
Utilities.invokeAndWait(new Runnable() {
117116
public void run() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
import edu.rice.cs.drjava.config.FileConfiguration;
4040
import edu.rice.cs.drjava.config.OptionConstants;
41-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
41+
import edu.rice.cs.drjava.DrJavaTestCase;
4242
import edu.rice.cs.util.swing.Utilities;
4343
import edu.rice.cs.plt.io.IOUtil;
4444

@@ -49,7 +49,7 @@
4949
/** * Tests that a custom config file can be specified.
5050
* @version $Id$
5151
*/
52-
public final class ConfigFileTest extends MultiThreadedTestCase {
52+
public final class ConfigFileTest extends DrJavaTestCase {
5353
private static final String CUSTOM_PROPS =
5454
"indent.level = 5\n" +
5555
"history.max.size = 1\n" +

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
package edu.rice.cs.drjava;
3838

3939
import junit.framework.*;
40-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
40+
import edu.rice.cs.drjava.DrJavaTestCase;
4141

4242
/** Test that ensures all external dependencies are met!
4343
* @version $Id$
4444
*/
45-
public final class DependenciesTest extends MultiThreadedTestCase {
45+
public final class DependenciesTest extends DrJavaTestCase {
4646
public static final String REQUIRED_UTIL_VERSION = "20040521-1616";
4747

4848
/** Constructor.

‎drjava/src/edu/rice/cs/drjava/config/BooleanOptionTest.java‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,28 +29,25 @@
2929

3030
package edu.rice.cs.drjava.config;
3131

32-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
32+
import edu.rice.cs.drjava.DrJavaTestCase;
3333

3434
/** * Class according to the JUnit protocol. Tests
3535
* the proper functionality of the class BooleanOption.
3636
* @version $Id$
3737
*/
38-
public final class BooleanOptionTest extends MultiThreadedTestCase {
39-
/** @param name The name of this test case.
40-
*/
38+
public final class BooleanOptionTest extends DrJavaTestCase {
39+
/** @param name The name of this test case. */
4140
public BooleanOptionTest(String name) { super(name); }
4241

43-
public void testGetName()
44-
{
42+
public void testGetName() {
4543
BooleanOption bo1 = new BooleanOption("enable JUnit",null);
4644
BooleanOption bo2 = new BooleanOption("use menu icons",null);
4745

4846
assertEquals("enable JUnit", bo1.getName());
4947
assertEquals("use menu icons", bo2.getName());
5048
}
5149

52-
public void testParse()
53-
{
50+
public void testParse() {
5451
BooleanOption bo = new BooleanOption("enable JUnit",null);
5552

5653
assertEquals(Boolean.TRUE, bo.parse("true"));
@@ -64,8 +61,7 @@ public void testParse()
6461
catch (OptionParseException e) { }
6562
}
6663

67-
public void testFormat()
68-
{
64+
public void testFormat() {
6965
BooleanOption bo1 = new BooleanOption("max_files",null);
7066
BooleanOption bo2 = new BooleanOption("indent_size",null);
7167

‎drjava/src/edu/rice/cs/drjava/config/ColorOptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,14 @@
2929

3030
package edu.rice.cs.drjava.config;
3131

32-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
32+
import edu.rice.cs.drjava.DrJavaTestCase;
3333

3434
import java.awt.*;
3535

3636
/** Class according to the JUnit protocol. Tests the proper functionality of the class ColorOption.
3737
* @version $Id$
3838
*/
39-
public final class ColorOptionTest extends MultiThreadedTestCase {
39+
public final class ColorOptionTest extends DrJavaTestCase {
4040

4141
/** @param name The name of this test case.*/
4242
public ColorOptionTest(String name) { super(name); }

‎drjava/src/edu/rice/cs/drjava/config/DrJavaPropertySetupTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
package edu.rice.cs.drjava.config;
3838

39-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
39+
import edu.rice.cs.drjava.DrJavaTestCase;
4040

4141
import edu.rice.cs.drjava.DrJava;
4242
import edu.rice.cs.util.*;
@@ -46,7 +46,7 @@
4646
/** * Tests for the variables and language constructs that can be used in external processes.
4747
* @author Mathias Ricken
4848
*/
49-
public class DrJavaPropertySetupTest extends MultiThreadedTestCase {
49+
public class DrJavaPropertySetupTest extends DrJavaTestCase {
5050
public final String PS = File.pathSeparator; // path separator
5151
public final String FS = File.separator; // path separator
5252
public final String TMPDIR = System.getProperty("java.io.tmpdir")+

‎drjava/src/edu/rice/cs/drjava/config/FontOptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@
3636

3737
package edu.rice.cs.drjava.config;
3838

39-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
39+
import edu.rice.cs.drjava.DrJavaTestCase;
4040
import java.awt.Font;
4141

4242
/** * Class according to the JUnit protocol. Tests
4343
* the proper functionality of the class FontOption.
4444
* @version $Id$
4545
*/
46-
public final class FontOptionTest extends MultiThreadedTestCase {
46+
public final class FontOptionTest extends DrJavaTestCase {
4747

4848
public void testParse() {
4949
FontOption fo = new FontOption("font.test1", Font.decode(null));

‎drjava/src/edu/rice/cs/drjava/config/ForcedChoiceOptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,15 @@
3636

3737
package edu.rice.cs.drjava.config;
3838

39-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
39+
import edu.rice.cs.drjava.DrJavaTestCase;
4040

4141
import java.util.ArrayList;
4242

4343
/** * Class according to the JUnit protocol. Tests
4444
* the proper functionality of the class ForcedChoiceOption.
4545
* @version $Id$
4646
*/
47-
public final class ForcedChoiceOptionTest extends MultiThreadedTestCase {
47+
public final class ForcedChoiceOptionTest extends DrJavaTestCase {
4848
/** @param name The name of this test case.
4949
*/
5050
public ForcedChoiceOptionTest(String name) { super(name); }

‎drjava/src/edu/rice/cs/drjava/config/IntegerOptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@
3636

3737
package edu.rice.cs.drjava.config;
3838

39-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
39+
import edu.rice.cs.drjava.DrJavaTestCase;
4040

4141
/** Class according to the JUnit protocol. Tests the proper functionality of the class IntegerOption.
4242
* @version $Id$
4343
*/
44-
public final class IntegerOptionTest extends MultiThreadedTestCase {
44+
public final class IntegerOptionTest extends DrJavaTestCase {
4545

4646
/** @param name The name of this test case. */
4747
public IntegerOptionTest(String name) { super(name); }

‎drjava/src/edu/rice/cs/drjava/config/KeyStrokeOptionTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636

3737
package edu.rice.cs.drjava.config;
3838

39-
import edu.rice.cs.drjava.model.MultiThreadedTestCase;
39+
import edu.rice.cs.drjava.DrJavaTestCase;
4040

4141
import edu.rice.cs.plt.concurrent.JVMBuilder;
4242

@@ -49,7 +49,7 @@
4949
/** Class according to the JUnit protocol. Tests the proper functionality of the class KeyStrokeOption.
5050
* @version $Id$
5151
*/
52-
public final class KeyStrokeOptionTest extends MultiThreadedTestCase {
52+
public final class KeyStrokeOptionTest extends DrJavaTestCase {
5353
/** @param name The name of this test case. */
5454
public KeyStrokeOptionTest(String name) { super(name); }
5555

0 commit comments

Comments
 (0)