Index: trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java (revision 14371) +++ trunk/test/unit/org/openstreetmap/josm/gui/dialogs/relation/actions/RelationEditorActionsTest.java (revision 14380) @@ -1,4 +1,21 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.gui.dialogs.relation.actions; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import java.awt.Component; +import java.awt.Container; +import javax.swing.Icon; +import javax.swing.JOptionPane; +import javax.swing.text.JTextComponent; + +import org.openstreetmap.josm.testutils.mockers.JOptionPaneSimpleMocker; +import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil; + +import com.google.common.collect.ImmutableMap; + +import mockit.Mock; +import mockit.MockUp; import org.junit.Test; @@ -10,8 +27,8 @@ /** - * Check that all actions do not crash. + * Check that all dialog-less actions do not crash. */ @Test - public void testAllActions() { + public void testNoDialogActions() { new AddSelectedAfterSelection(relationEditorAccess).actionPerformed(null); new AddSelectedBeforeSelection(relationEditorAccess).actionPerformed(null); @@ -28,5 +45,4 @@ new SelectAction(relationEditorAccess).actionPerformed(null); - new DeleteCurrentRelationAction(relationEditorAccess).actionPerformed(null); new DownloadIncompleteMembersAction(relationEditorAccess, "downloadincomplete").actionPerformed(null); @@ -48,6 +64,80 @@ new SortBelowAction(relationEditorAccess).actionPerformed(null); new ReverseAction(relationEditorAccess).actionPerformed(null); + } + + /** + * Test DeleteCurrentRelationAction + */ + @Test + public void testDeleteCurrentRelationAction() { + final JOptionPaneSimpleMocker jopsMocker = new JOptionPaneSimpleMocker( + ImmutableMap.of( + "\n \n \n \n \n You are about to delete 1 " + + "relation:\n\n " + + "

\n incomplete\n

\n
\n " + + "This step is rarely necessary and cannot be undone easily after being \n " + + "uploaded to the server.
Do you really want to delete?\n \n\n", JOptionPane.YES_OPTION, + "\n \n \n \n \n You are about to delete incomplete " + + "objects.
This will cause problems \n because you don\'t see the real object.
" + + "Do you really want to delete?\n \n\n", + JOptionPane.YES_OPTION + ) + ) { + public String getStringFromOriginalMessage(Object originalMessage) { + return ((JTextComponent) ((Container) originalMessage).getComponent(0)).getText(); + } + }; + + new DeleteCurrentRelationAction(relationEditorAccess).actionPerformed(null); + + assertEquals(2, jopsMocker.getInvocationLog().size()); + + Object[] invocationLogEntry = jopsMocker.getInvocationLog().get(0); + assertEquals(JOptionPane.YES_OPTION, (int) invocationLogEntry[0]); + assertEquals("Delete relation?", invocationLogEntry[2]); + + invocationLogEntry = jopsMocker.getInvocationLog().get(1); + assertEquals(JOptionPane.YES_OPTION, (int) invocationLogEntry[0]); + assertEquals("Delete confirmation", invocationLogEntry[2]); + } + + /** + * Test SetRoleAction + */ + @Test + public void testSetRoleAction() { + final JOptionPaneSimpleMocker.MessagePanelMocker mpMocker = new JOptionPaneSimpleMocker.MessagePanelMocker(); + // JOptionPaneSimpleMocker doesn't handle showOptionDialog calls because of their potential + // complexity, but this is quite a simple use of showOptionDialog which we can mock from scratch. + final boolean[] jopMockerCalled = new boolean[] {false}; + final MockUp jopMocker = new MockUp() { + @Mock + public int showOptionDialog( + Component parentComponent, + Object message, + String title, + int optionType, + int messageType, + Icon icon, + Object[] options, + Object initialValue + ) { + assertEquals( + "You are setting an empty role on 0 objects.
This is equal to deleting the " + + "roles of these objects.
Do you really want to apply the new role?", + mpMocker.getOriginalMessage((ConditionalOptionPaneUtil.MessagePanel) message).toString() + ); + assertEquals( + "Confirm empty role", + title + ); + jopMockerCalled[0] = true; + return JOptionPane.YES_OPTION; + } + }; new SetRoleAction(relationEditorAccess).actionPerformed(null); + + assertTrue(jopMockerCalled[0]); } } Index: trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java =================================================================== --- trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (revision 14371) +++ trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (revision 14380) @@ -8,4 +8,6 @@ import java.io.File; import java.io.IOException; +import java.io.PrintWriter; +import java.io.StringWriter; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -61,4 +63,5 @@ import org.openstreetmap.josm.tools.RightAndLefthandTraffic; import org.openstreetmap.josm.tools.Territories; +import org.openstreetmap.josm.tools.bugreport.ReportedException; import org.openstreetmap.josm.tools.date.DateUtils; @@ -674,5 +677,10 @@ throw exception; } else { - Logging.debug("Thread state at timeout: {0}", Thread.getAllStackTraces()); + if (Logging.isLoggingEnabled(Logging.LEVEL_DEBUG)) { + // i.e. skip expensive formatting of stack trace if it won't be shown + final StringWriter sw = new StringWriter(); + new ReportedException(exception).printReportThreadsTo(new PrintWriter(sw)); + Logging.debug("Thread state at timeout: {0}", sw); + } throw new Exception(MessageFormat.format("Test timed out after {0}ms", timeout)); }