rhbz988202 - change field validation so that empty string is accepted

zanata · Mar 21, 2014 · 09874b4 · 09874b4
1 parent e9b8c66
commit 09874b4
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 9 deletions.
diff --git a/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java b/functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
@@ -7,8 +7,8 @@
 import org.zanata.util.WebElementUtil;
 
 /**
- * @author Patrick Huang
- *         <a href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
+ * @author Patrick Huang <a
+ *         href="mailto:pahuang@redhat.com">pahuang@redhat.com</a>
  */
 public class ServerConfigurationPage extends BasePage {
     @FindBy(id = "serverConfigForm:urlField")
@@ -17,6 +17,14 @@ public class ServerConfigurationPage extends BasePage {
     @FindBy(id = "serverConfigForm:rateLimitField:rateLimitEml")
     private WebElement rateLimitField;
 
+    @FindBy(
+            id = "serverConfigForm:maxConcurrentPerApiKeyField:maxConcurrentPerApiKeyEml")
+    private WebElement maxConcurrentField;
+
+    @FindBy(
+            id = "serverConfigForm:maxActiveRequestsPerApiKeyField:maxActiveRequestsPerApiKeyEml")
+    private WebElement maxActiveField;
+
     @FindBy(id = "serverConfigForm:save")
     private WebElement saveButton;
 
@@ -34,6 +42,26 @@ public String getRateLimit() {
         return rateLimitField.getAttribute("value");
     }
 
+    public ServerConfigurationPage inputMaxConcurrent(int max) {
+        maxConcurrentField.clear();
+        maxConcurrentField.sendKeys(max + "");
+        return this;
+    }
+
+    public String getMaxConcurrentRequestsPerApiKey() {
+        return maxConcurrentField.getAttribute("value");
+    }
+
+    public ServerConfigurationPage inputMaxActive(int max) {
+        maxActiveField.clear();
+        maxActiveField.sendKeys(max + "");
+        return this;
+    }
+
+    public String getMaxActiveRequestsPerApiKey() {
+        return maxActiveField.getAttribute("value");
+    }
+
     public AdministrationPage save() {
         saveButton.click();
         return new AdministrationPage(getDriver());

diff --git a/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java b/functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
@@ -71,9 +71,12 @@ public void canConfigureRateLimitByWebUI() {
                         ServerConfigurationPage.class);
 
         assertThat(serverConfigPage.getRateLimit(), Matchers.isEmptyString());
+        assertThat(serverConfigPage.getMaxConcurrentRequestsPerApiKey(), Matchers.isEmptyString());
+        assertThat(serverConfigPage.getMaxActiveRequestsPerApiKey(), Matchers.isEmptyString());
 
         AdministrationPage administrationPage =
-                serverConfigPage.inputRateLimit(1).save();
+                serverConfigPage.inputRateLimit(1).inputMaxConcurrent(5)
+                        .inputMaxActive(3).save();
 
         assertThat(administrationPage.getNotificationMessage(),
                 Matchers.equalTo("Configuration was successfully updated."));

diff --git a/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java b/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
@@ -23,6 +23,7 @@
 import java.io.Serializable;
 
 import javax.validation.constraints.Digits;
+import javax.validation.constraints.Pattern;
 
 import lombok.AccessLevel;
 import lombok.Getter;
@@ -94,14 +95,13 @@ public class ServerConfigurationBean implements Serializable {
     @Url(canEndInSlash = true)
     private String termsOfUseUrl;
 
-    @Digits(integer = 10, fraction = 0)
-    // TODO this won't allow empty string
+    @Pattern(regexp = "\\d{0,5}")
     private String rateLimitPerSecond;
 
-    @Digits(integer = 5, fraction = 0)
+    @Pattern(regexp = "\\d{0,5}")
     private String maxConcurrentRequestsPerApiKey;
 
-    @Digits(integer = 5, fraction = 0)
+    @Pattern(regexp = "\\d{0,5}")
     private String maxActiveRequestsPerApiKey;
 
     public String getHomeContent() {

diff --git a/zanata-war/src/test/resources/log4j.xml b/zanata-war/src/test/resources/log4j.xml
@@ -5,7 +5,7 @@
   <appender name="STDOUT" class="org.apache.log4j.ConsoleAppender">
     <param name="threshold" value="DEBUG" />
     <layout class="org.apache.log4j.PatternLayout">
-      <param name="ConversionPattern" value="%-5p [%c{1}] - %m%n" />
+      <param name="ConversionPattern" value="%d %t %-5p [%c{1}] - %m%n" />
     </layout>
   </appender>
   <!--
@@ -31,7 +31,7 @@
     <level value="OFF" />
   </logger>
   <logger name="org.zanata.rest">
-    <level value="DEBUG"/>
+    <level value="ERROR"/>
   </logger>
   <root>
     <level value="ERROR" />