Index: modules/swing/src/test/api/java/common/javax/swing/text/AbstractDocument_DefaultDocumentEventTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/text/AbstractDocument_DefaultDocumentEventTest.java (revision 430288) +++ modules/swing/src/test/api/java/common/javax/swing/text/AbstractDocument_DefaultDocumentEventTest.java (working copy) @@ -25,6 +25,7 @@ import java.util.Vector; import javax.swing.BasicSwingTestCase; +import javax.swing.UIManager; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import javax.swing.event.UndoableEditEvent; @@ -69,6 +70,12 @@ */ UndoableEditEvent undoEvent; + private static final String UNDO_TEXT_KEY = "AbstractDocument.undoText"; + private static final String REDO_TEXT_KEY = "AbstractDocument.redoText"; + + private String undoName; + private String redoName; + /* * @see TestCase#setUp() */ @@ -97,6 +104,9 @@ change = doc.new DefaultDocumentEvent(0, 10, DocumentEvent.EventType.CHANGE); + + undoName = UIManager.getString(UNDO_TEXT_KEY); + redoName = UIManager.getString(REDO_TEXT_KEY); } /** @@ -232,27 +242,56 @@ ref += edit.toString(); } ref += "]"; - //System.out.println(ref); assertEquals(ref, insert.toString()); - //System.out.println(insert + "\n" + remove); } public void testGetUndoPresentationName() { - assertEquals("Undo addition", insert.getUndoPresentationName()); - assertEquals("Undo deletion", remove.getUndoPresentationName()); - assertEquals("Undo style change", change.getUndoPresentationName()); + assertEquals(undoName + " " + insert.getPresentationName(), + insert.getUndoPresentationName()); + assertEquals(undoName + " " + remove.getPresentationName(), + remove.getUndoPresentationName()); + assertEquals(undoName + " " + change.getPresentationName(), + change.getUndoPresentationName()); } + public void testGetUndoPresentationNameModified() { + UIManager.put(UNDO_TEXT_KEY, "ODNU"); + try { + assertEquals("ODNU " + + UIManager.getString("AbstractDocument.additionText"), + insert.getUndoPresentationName()); + } finally { + UIManager.put(UNDO_TEXT_KEY, undoName); + } + } + public void testGetRedoPresentationName() { - assertEquals("Redo addition", insert.getRedoPresentationName()); - assertEquals("Redo deletion", remove.getRedoPresentationName()); - assertEquals("Redo style change", change.getRedoPresentationName()); + assertEquals(redoName + " " + insert.getPresentationName(), + insert.getRedoPresentationName()); + assertEquals(redoName + " " + remove.getPresentationName(), + remove.getRedoPresentationName()); + assertEquals(redoName + " " + change.getPresentationName(), + change.getRedoPresentationName()); } + public void testGetRedoPresentationNameModified() { + UIManager.put(REDO_TEXT_KEY, "ODER"); + try { + assertEquals("ODER " + + UIManager.getString("AbstractDocument.additionText"), + insert.getRedoPresentationName()); + } finally { + UIManager.put(REDO_TEXT_KEY, redoName); + } + } + public void testGetPresentationName() { - assertEquals("addition", insert.getPresentationName()); - assertEquals("deletion", remove.getPresentationName()); - assertEquals("style change", change.getPresentationName()); + assertSame(UIManager.getString("AbstractDocument.additionText"), + insert.getPresentationName()); + assertSame(UIManager.getString("AbstractDocument.deletionText"), + remove.getPresentationName()); + assertSame(UIManager.getString("AbstractDocument.styleChangeText"), + change.getPresentationName()); } public void testIsSignificant() { Index: modules/swing/src/test/api/java/common/javax/swing/undo/AbstractUndoableEditTest.java =================================================================== --- modules/swing/src/test/api/java/common/javax/swing/undo/AbstractUndoableEditTest.java (revision 430288) +++ modules/swing/src/test/api/java/common/javax/swing/undo/AbstractUndoableEditTest.java (working copy) @@ -25,16 +25,29 @@ import junit.framework.TestCase; public class AbstractUndoableEditTest extends TestCase { + private static final String UNDO_NAME_KEY = "AbstractUndoableEdit.undoText"; + private static final String REDO_NAME_KEY = "AbstractUndoableEdit.redoText"; + protected AbstractUndoableEdit obj; + private String defaultUndoName; + private String defaultRedoName; + public static void main(final String[] args) { junit.textui.TestRunner.run(AbstractUndoableEditTest.class); } protected void setUp() throws Exception { obj = new AbstractUndoableEdit(); + defaultUndoName = UIManager.getString(UNDO_NAME_KEY); + defaultRedoName = UIManager.getString(REDO_NAME_KEY); } + protected void tearDown() throws Exception { + UIManager.put(UNDO_NAME_KEY, defaultUndoName); + UIManager.put(REDO_NAME_KEY, defaultRedoName); + } + public void testToString() { String s = obj.toString(); assertNotNull(s); @@ -141,15 +154,45 @@ } public void testGetRedoPresentationName() { - assertEquals(UIManager.getString("AbstractUndoableEdit.redoText"), + assertEquals(UIManager.getString(REDO_NAME_KEY), obj.getRedoPresentationName()); } + public void testGetRedoPresentationNameModified() { + String redoName = "name of Redo"; + UIManager.put(REDO_NAME_KEY, redoName); + assertEquals(redoName, obj.getRedoPresentationName()); + + redoName = "alternative redo"; + UIManager.put(REDO_NAME_KEY, redoName); + assertEquals(redoName, obj.getRedoPresentationName()); + } + public void testGetUndoPresentationName() { - assertEquals(UIManager.getString("AbstractUndoableEdit.undoText"), + assertEquals(UIManager.getString(UNDO_NAME_KEY), obj.getUndoPresentationName()); } + public void testGetUndoPresentationNameModified() { + String undoName = "name of Undo"; + UIManager.put(UNDO_NAME_KEY, undoName); + assertEquals(undoName, obj.getUndoPresentationName()); + + undoName = "alternative undo"; + UIManager.put(UNDO_NAME_KEY, undoName); + assertEquals(undoName, obj.getUndoPresentationName()); + } + + public void testGetUndoPresentationNameNull() { + obj = new AbstractUndoableEdit() { + public String getPresentationName() { + return null; + } + }; + assertEquals(UIManager.getString(UNDO_NAME_KEY), + obj.getUndoPresentationName()); + } + public void testAddEdit() { assertEquals(false, obj.addEdit(null)); }