Merge branch 'enabledValidationByDefault' into release

zanata · Mar 5, 2013 · 73639ee · 73639ee
2 parents 15e7589 + ebd2217
commit 73639ee
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 15 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
@@ -96,7 +96,6 @@ public List<ValidationObject> getValidationObject(String projectSlug, String ver
          actionInfo.setDescription(zanataMessages.getMessage(actionInfo.getId().getMessagePrefix() + DESC_KEY));
          if (enabledValidations.contains(actionInfo.getId().name()))
          {
-            actionInfo.setEnabled(true);
             actionInfo.setLocked(true);
          }
       }

diff --git a/...-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java b/...-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
@@ -40,7 +40,7 @@ public class HtmlXmlTagValidation extends AbstractValidationAction
 {
    public HtmlXmlTagValidation(ValidationId id, ValidationMessages messages)
    {
-      super(new ValidationInfo(id, null, false), messages);
+      super(new ValidationInfo(id, null, true), messages);
    }
 
    private final static String tagRegex = "<[^>]+>";

diff --git a/...r/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java b/...r/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
@@ -43,7 +43,7 @@ public class JavaVariablesValidation extends AbstractValidationAction
 {
    public JavaVariablesValidation(ValidationId id, ValidationMessages messages)
    {
-      super(new ValidationInfo(id, null, false), messages);
+      super(new ValidationInfo(id, null, true), messages);
    }
 
    @Override

diff --git a/...rc/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java b/...rc/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
@@ -38,7 +38,7 @@ public class NewlineLeadTrailValidation extends AbstractValidationAction
 {
    public NewlineLeadTrailValidation(ValidationId id, ValidationMessages messages)
    {
-      super(new ValidationInfo(id, null, false), messages);
+      super(new ValidationInfo(id, null, true), messages);
    }
 
    private final static String leadNewlineRegex = "^\n";

diff --git a/...src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java b/...src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
@@ -47,7 +47,12 @@ public class PrintfVariablesValidation extends AbstractValidationAction
 
    public PrintfVariablesValidation(ValidationId id, ValidationMessages messages)
    {
-      super(new ValidationInfo(id, null, false), messages);
+      super(new ValidationInfo(id, null, true), messages);
+   }
+
+   public PrintfVariablesValidation(ValidationId id, ValidationMessages messages, boolean enabled)
+   {
+      super(new ValidationInfo(id, null, enabled), messages);
    }
 
    @Override

diff --git a/.../main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java b/.../main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
@@ -24,7 +24,7 @@ public class PrintfXSIExtensionValidation extends PrintfVariablesValidation
 
    public PrintfXSIExtensionValidation(ValidationId id, ValidationMessages messages)
    {
-      super(id, messages);
+      super(id, messages, false);
    }
 
    @Override

diff --git a/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java b/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
@@ -31,7 +31,7 @@ public class TabValidation extends AbstractValidationAction
 {
    public TabValidation(ValidationId id, ValidationMessages messages)
    {
-      super(new ValidationInfo(id, null, false), messages);
+      super(new ValidationInfo(id, null, true), messages);
    }
 
    @Override

diff --git a/...a-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java b/...a-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
@@ -52,7 +52,7 @@ public class XmlEntityValidation extends AbstractValidationAction
 
    public XmlEntityValidation(ValidationId id, ValidationMessages messages)
    {
-      super(new ValidationInfo(id, null, false), messages);
+      super(new ValidationInfo(id, null, true), messages);
    }
 
    @Override

diff --git a/...ar/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java b/...ar/src/test/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenterTest.java
@@ -1,5 +1,6 @@
 package org.zanata.webtrans.client.presenter;
 
+import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
@@ -64,15 +65,14 @@ public void onBind()
       // Given:
       when(validationService.getValidationMap()).thenReturn(ValidationFactory.getAllValidationActions(validationMessage));
 
-      when(display.addValidationSelector(ValidationId.HTML_XML.getDisplayName(), null, false, false)).thenReturn(changeHandler);
-      when(display.addValidationSelector(ValidationId.NEW_LINE.getDisplayName(), null, false, false)).thenReturn(changeHandler);
-      when(display.addValidationSelector(ValidationId.TAB.getDisplayName(), null, false, false)).thenReturn(changeHandler);
-      when(display.addValidationSelector(ValidationId.JAVA_VARIABLES.getDisplayName(), null, false, false)).thenReturn(changeHandler);
-      when(display.addValidationSelector(ValidationId.XML_ENTITY.getDisplayName(), null, false, false)).thenReturn(changeHandler);
-      when(display.addValidationSelector(ValidationId.PRINTF_VARIABLES.getDisplayName(), null, false, false)).thenReturn(changeHandler);
+      when(display.addValidationSelector(ValidationId.HTML_XML.getDisplayName(), null, true, false)).thenReturn(changeHandler);
+      when(display.addValidationSelector(ValidationId.NEW_LINE.getDisplayName(), null, true, false)).thenReturn(changeHandler);
+      when(display.addValidationSelector(ValidationId.TAB.getDisplayName(), null, true, false)).thenReturn(changeHandler);
+      when(display.addValidationSelector(ValidationId.JAVA_VARIABLES.getDisplayName(), null, true, false)).thenReturn(changeHandler);
+      when(display.addValidationSelector(ValidationId.XML_ENTITY.getDisplayName(), null, true, false)).thenReturn(changeHandler);
+      when(display.addValidationSelector(ValidationId.PRINTF_VARIABLES.getDisplayName(), null, true, false)).thenReturn(changeHandler);
       when(display.addValidationSelector(ValidationId.PRINTF_XSI_EXTENSION.getDisplayName(), null, false, false)).thenReturn(changeHandler);
 
-
       // When:
       presenter.onBind();