Author: pyaschenko
Date: 2010-10-27 12:37:39 -0400 (Wed, 27 Oct 2010)
New Revision: 19706
Added:
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/byte-converter.js
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/number-converter.js
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/ByteConverterTest.java
Removed:
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/converter-number.js
Modified:
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/NumberConverterTest.java
Log:
https://jira.jboss.org/browse/RF-9521
Added:
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/byte-converter.js
===================================================================
---
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/byte-converter.js
(rev 0)
+++
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/byte-converter.js 2010-10-27
16:37:39 UTC (rev 19706)
@@ -0,0 +1,11 @@
+RichFaces.csv.addConverter({"byte":
+(function(rf) {
+ return function (value, params) {
+ var result = parseInt(value);
+ if (isNaN(result) || result<-128 || result>127) {
+ throw rf.csv.getMessage(params.customMessage, 'BYTE_CONVERTER_BYTE', [value,
0, params.componentId]);
+ }
+ return result;
+ }
+})(window.RichFaces || (window.RichFaces={}))
+});
\ No newline at end of file
Deleted:
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/converter-number.js
===================================================================
---
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/converter-number.js 2010-10-27
16:32:43 UTC (rev 19705)
+++
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/converter-number.js 2010-10-27
16:37:39 UTC (rev 19706)
@@ -1,13 +0,0 @@
-RichFaces.csv.addConverter({"number":
-(function(rf) {
- return function (value, params) {
- var result;
- if (isNaN(value)) {
- throw rf.csv.getMessage(params.customMessage, 'NUMBER_CONVERTER_NUMBER',
[value, 0, params.componentId]);
- } else {
- result = parseInt(value);
- }
- return result;
- }
-})(window.RichFaces || (window.RichFaces={}))
-});
\ No newline at end of file
Copied:
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/number-converter.js
(from rev 19702,
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/converter-number.js)
===================================================================
---
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/number-converter.js
(rev 0)
+++
branches/RF-8742/ui/validator/ui/src/main/resources/META-INF/resources/org.richfaces/number-converter.js 2010-10-27
16:37:39 UTC (rev 19706)
@@ -0,0 +1,13 @@
+RichFaces.csv.addConverter({"number":
+(function(rf) {
+ return function (value, params) {
+ var result;
+ if (isNaN(value)) {
+ throw rf.csv.getMessage(params.customMessage, 'NUMBER_CONVERTER_NUMBER',
[value, 0, params.componentId]);
+ } else {
+ result = parseInt(value);
+ }
+ return result;
+ }
+})(window.RichFaces || (window.RichFaces={}))
+});
\ No newline at end of file
Added:
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/ByteConverterTest.java
===================================================================
---
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/ByteConverterTest.java
(rev 0)
+++
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/ByteConverterTest.java 2010-10-27
16:37:39 UTC (rev 19706)
@@ -0,0 +1,62 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site:
http://www.fsf.org.
+ */
+package org.richfaces.convert;
+
+import static org.junit.Assert.*;
+
+import javax.faces.convert.ByteConverter;
+import javax.faces.convert.NumberConverter;
+
+import org.junit.Test;
+import org.richfaces.application.MessageFactory;
+import org.richfaces.application.ServiceTracker;
+import org.richfaces.appplication.FacesMessages;
+
+/**
+ * @author Pavel Yaschenko
+ *
+ */
+public class ByteConverterTest extends BaseConverterTest {
+
+ public ByteConverterTest() {
+ super("META-INF/resources/org.richfaces/byte-converter.js");
+ }
+
+ @Test
+ @TestDataHolder(
+ successes = {
+ @TestData(submittedValue = "-128"),
+ @TestData(submittedValue = "0"),
+ @TestData(submittedValue = "127")
+ },
+ failures = {
+ @TestData(submittedValue = "-129"),
+ @TestData(submittedValue = "128"),
+ @TestData(submittedValue = "aaa")
+ }
+ )
+ public void testSuccess() throws Exception {
+
setClientConverterClassName("RichFaces.csv.getConverter('byte')");
+ setConverterId(ByteConverter.CONVERTER_ID);
+ setConversionErrorMessageEnum(FacesMessages.BYTE_CONVERTER_BYTE);
+ }
+}
Modified:
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/NumberConverterTest.java
===================================================================
---
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/NumberConverterTest.java 2010-10-27
16:32:43 UTC (rev 19705)
+++
branches/RF-8742/ui/validator/ui/src/test/java/org/richfaces/convert/NumberConverterTest.java 2010-10-27
16:37:39 UTC (rev 19706)
@@ -37,7 +37,7 @@
public class NumberConverterTest extends BaseConverterTest {
public NumberConverterTest() {
- super("META-INF/resources/org.richfaces/converter-number.js");
+ super("META-INF/resources/org.richfaces/number-converter.js");
}
@Test