Revision: 8489
Author: [email protected]
Date: Thu Aug 5 10:38:17 2010
Log: Removed trim in ValueBoxBase, forcing parsers to handle trim()ing.
Added test for ValueBoxBase, specifically (instead of a test of TextBox as
before.) The tests include a test for exceptions and a test to make sure
strings with spaces are correctly passed through.
Review at http://gwt-code-reviews.appspot.com/738801
Review by: [email protected]
http://code.google.com/p/google-web-toolkit/source/detail?r=8489
Added:
/trunk/user/test/com/google/gwt/user/client/ui/MockParser.java
/trunk/user/test/com/google/gwt/user/client/ui/ValueBoxBaseTest.java
Modified:
/trunk/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java
=======================================
--- /dev/null
+++ /trunk/user/test/com/google/gwt/user/client/ui/MockParser.java Thu Aug
5 10:38:17 2010
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+ * use this file except in compliance with the License. You may obtain a
copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package com.google.gwt.user.client.ui;
+
+import com.google.gwt.text.shared.Parser;
+
+import java.text.ParseException;
+
+class MockParser implements Parser<String> {
+ public boolean throwException;
+ public boolean parseCalled;
+
+ public String parse(CharSequence text) throws ParseException {
+ parseCalled = true;
+
+ if (throwException) {
+ throw new ParseException("mock exception", 0);
+ } else {
+ return text.toString();
+ }
+ }
+}
=======================================
--- /dev/null
+++ /trunk/user/test/com/google/gwt/user/client/ui/ValueBoxBaseTest.java
Thu Aug 5 10:38:17 2010
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010 Google Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may
not
+ * use this file except in compliance with the License. You may obtain a
copy of
+ * the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
under
+ * the License.
+ */
+package com.google.gwt.user.client.ui;
+
+import com.google.gwt.dom.client.Document;
+import com.google.gwt.dom.client.Element;
+import com.google.gwt.junit.client.GWTTestCase;
+import com.google.gwt.text.shared.PassthroughRenderer;
+import com.google.gwt.text.shared.Renderer;
+
+import java.text.ParseException;
+
+/**
+ * Testing ValueBoxBase.
+ */
+public class ValueBoxBaseTest extends GWTTestCase {
+
+ // Test that parser exceptions are correctly thrown with an empty string
+ public void testParserExceptionWithEmptyString() {
+ Element elm = Document.get().createTextInputElement();
+ Renderer<String> renderer = PassthroughRenderer.instance();
+ MockParser parser = new MockParser();
+
+ ValueBoxBase<String> valueBoxBase =
+ new ValueBoxBase<String>(elm, renderer, parser);
+
+ parser.throwException = true;
+ valueBoxBase.setText("");
+ try {
+ String string = valueBoxBase.getValueOrThrow();
+ fail("Should have thrown ParseException");
+ } catch (ParseException e) {
+ // exception was correctly thrown
+ }
+ if (!parser.parseCalled) {
+ fail("Parser was not run");
+ }
+ }
+
+ // Test that parser exceptions are correctly thrown with a simple string
+ public void testParserExceptionWithString() {
+ Element elm = Document.get().createTextInputElement();
+ Renderer<String> renderer = PassthroughRenderer.instance();
+ MockParser parser = new MockParser();
+
+ ValueBoxBase<String> valueBoxBase =
+ new ValueBoxBase<String>(elm, renderer, parser);
+
+ parser.throwException = true;
+ valueBoxBase.setText("simple string");
+ try {
+ String string = valueBoxBase.getValueOrThrow();
+ fail("Should have thrown ParseException");
+ } catch (ParseException e) {
+ // exception was correctly thrown
+ }
+ if (!parser.parseCalled) {
+ fail("Parser was not run");
+ }
+ }
+
+ // Test that a string with padding spaces correctly passes through
+ public void testSpaces() {
+ Element elm = Document.get().createTextInputElement();
+ Renderer<String> renderer = PassthroughRenderer.instance();
+ MockParser parser = new MockParser();
+
+ ValueBoxBase<String> valueBoxBase =
+ new ValueBoxBase<String>(elm, renderer, parser);
+
+ valueBoxBase.setText(" two space padding test ");
+ try {
+ assertEquals(" two space padding ",
valueBoxBase.getValueOrThrow());
+ } catch (ParseException e) {
+ fail("Should not have thrown ParseException");
+ }
+ if (!parser.parseCalled) {
+ fail("Parser was not run");
+ }
+ }
+
+ @Override
+ public String getModuleName() {
+ return "com.google.gwt.user.User";
+ }
+}
=======================================
--- /trunk/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java Tue Jul
20 08:04:29 2010
+++ /trunk/user/src/com/google/gwt/user/client/ui/ValueBoxBase.java Thu
Aug 5 10:38:17 2010
@@ -196,13 +196,15 @@
* @throws ParseException if the value cannot be parsed
*/
public T getValueOrThrow() throws ParseException {
- String text = getText().trim();
+ String text = getText();
+
+ T parseResult = parser.parse(text);
if ("".equals(text)) {
return null;
}
- return parser.parse(text);
+ return parseResult;
}
/**
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
