Revision: 1779
http://svn.sourceforge.net/spring-rich-c/?rev=1779&view=rev
Author: jhoskens
Date: 2007-07-10 03:44:37 -0700 (Tue, 10 Jul 2007)
Log Message:
-----------
Testing a mnemonic should use KeyEvent.VK_XXX keycodes instead of characters.
Lowercase letters are not mapped to keycodes and thus cannot be used to compare
to a mnemonic.
LabelInfo is already fixed to use uppercase letters only.
Modified Paths:
--------------
trunk/spring-richclient/core/src/test/java/org/springframework/richclient/core/LabelInfoTests.java
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandButtonLabelInfoTests.java
Modified:
trunk/spring-richclient/core/src/test/java/org/springframework/richclient/core/LabelInfoTests.java
===================================================================
---
trunk/spring-richclient/core/src/test/java/org/springframework/richclient/core/LabelInfoTests.java
2007-07-10 07:18:13 UTC (rev 1778)
+++
trunk/spring-richclient/core/src/test/java/org/springframework/richclient/core/LabelInfoTests.java
2007-07-10 10:44:37 UTC (rev 1779)
@@ -15,6 +15,7 @@
*/
package org.springframework.richclient.core;
+import java.awt.event.KeyEvent;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -86,7 +87,7 @@
info = LabelInfo.valueOf("S\\&ave @&as");
Assert.assertEquals("S&ave @as", info.getText());
- Assert.assertEquals('a', info.getMnemonic());
+ Assert.assertEquals(KeyEvent.VK_A, info.getMnemonic());
Assert.assertEquals(7, info.getMnemonicIndex());
}
@@ -126,7 +127,7 @@
LabelInfo info = LabelInfo.valueOf("&Save \\& Run");
Assert.assertEquals(0, info.getMnemonicIndex());
- Assert.assertEquals('S', info.getMnemonic());
+ Assert.assertEquals(KeyEvent.VK_S, info.getMnemonic());
Assert.assertEquals("Save & Run", info.getText());
}
@@ -152,7 +153,7 @@
Assert.assertEquals("Something with an @ in it", info.getText());
info = LabelInfo.valueOf("S\\&ave with an @ &as");
Assert.assertEquals("S&ave with an @ as", info.getText());
- Assert.assertEquals('a', info.getMnemonic());
+ Assert.assertEquals(KeyEvent.VK_A, info.getMnemonic());
Assert.assertEquals(16, info.getMnemonicIndex());
}
@@ -163,14 +164,14 @@
assertEquals(0, info.getMnemonic());
assertEquals(DEFAULT_MNEMONIC_INDEX, info.getMnemonicIndex());
- info = new LabelInfo("test", 't');
+ info = new LabelInfo("test", KeyEvent.VK_T);
assertEquals("test", info.getText());
- assertEquals('t', info.getMnemonic());
+ assertEquals(KeyEvent.VK_T, info.getMnemonic());
assertEquals(DEFAULT_MNEMONIC_INDEX, info.getMnemonicIndex());
- info = new LabelInfo("test", 't', 3);
+ info = new LabelInfo("test", KeyEvent.VK_T, 3);
assertEquals("test", info.getText());
- assertEquals('t', info.getMnemonic());
+ assertEquals(KeyEvent.VK_T, info.getMnemonic());
assertEquals(3, info.getMnemonicIndex());
}
@@ -201,9 +202,9 @@
}
public void testConstructorEmptyText() {
- LabelInfo info = new LabelInfo("", 'a', -1);
+ LabelInfo info = new LabelInfo("", KeyEvent.VK_A, -1);
assertEquals("", info.getText());
- assertEquals('a', info.getMnemonic());
+ assertEquals(KeyEvent.VK_A, info.getMnemonic());
assertEquals(DEFAULT_MNEMONIC_INDEX, info.getMnemonicIndex());
}
@@ -264,28 +265,28 @@
public void testConfigureLabelForWithColon() {
JTextField field = new JTextField();
JLabel label = new JLabel();
- LabelInfo info = new LabelInfo("Name:", 'N');
+ LabelInfo info = new LabelInfo("Name:", KeyEvent.VK_N);
info.configureLabelFor(label, field);
assertEquals("Name:", label.getText());
- assertEquals('N', label.getDisplayedMnemonic());
+ assertEquals(KeyEvent.VK_N, label.getDisplayedMnemonic());
assertEquals(field, label.getLabelFor());
}
public void testConfigureLabelForJPanel() {
JPanel panel = new JPanel();
JLabel label = new JLabel();
- LabelInfo info = new LabelInfo("Name", 'N');
+ LabelInfo info = new LabelInfo("Name", KeyEvent.VK_N);
info.configureLabelFor(label, panel);
assertEquals("No colon for panel", "Name", label.getText());
- assertEquals('N', label.getDisplayedMnemonic());
+ assertEquals(KeyEvent.VK_N, label.getDisplayedMnemonic());
assertEquals(panel, label.getLabelFor());
}
public void testConstructorMnemonicIndexGreaterThanLength() {
try {
- new LabelInfo("test", 't', 4);
+ new LabelInfo("test", KeyEvent.VK_T, 4);
fail("Mnemonic index must be < text.length()");
}
catch (IllegalArgumentException e) {
@@ -295,7 +296,7 @@
public void testConstructorNegativeMnemonicIndex() {
try {
- new LabelInfo("test", 't', -2);
+ new LabelInfo("test", KeyEvent.VK_T, -2);
fail("index must be >= -1");
}
catch (IllegalArgumentException e) {
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandButtonLabelInfoTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandButtonLabelInfoTests.java
2007-07-10 07:18:13 UTC (rev 1778)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/richclient/command/config/CommandButtonLabelInfoTests.java
2007-07-10 10:44:37 UTC (rev 1779)
@@ -15,6 +15,7 @@
*/
package org.springframework.richclient.command.config;
+import java.awt.event.KeyEvent;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
@@ -144,7 +145,7 @@
System.out.println("XXXXXXXXXXXXXXX " + info.getText());
System.out.println("XXXXXXXXXXX 16th char = " +
info.getText().charAt(16));
assertEquals("S&ave with an @ as", info.getText());
- assertEquals('a', info.getMnemonic());
+ assertEquals(KeyEvent.VK_A, info.getMnemonic());
assertEquals(16, info.getMnemonicIndex());
assertNull(info.getAccelerator());
}
@@ -153,7 +154,7 @@
CommandButtonLabelInfo info = CommandButtonLabelInfo.valueOf("[EMAIL
PROTECTED] &[EMAIL PROTECTED] A");
assertEquals("[EMAIL PROTECTED] as", info.getText());
- assertEquals('a', info.getMnemonic());
+ assertEquals(KeyEvent.VK_A, info.getMnemonic());
assertEquals(5, info.getMnemonicIndex());
assertNotNull("ctrl A is invalid keystroke", info.getAccelerator());
assertEquals(KeyStroke.getKeyStroke("ctrl A"), info.getAccelerator());
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
