Merge branch 'feature/translate_radio_button_values' of https://githu…

…b.com/opensrp/opensrp-client-native-form into feature/translate_radio_button_values
opensrp · Jun 28, 2022 · a161404 · a161404
2 parents ce39719 + 3691207
commit a161404
Show file tree

Hide file tree

Showing 10 changed files with 163 additions and 113 deletions.
diff --git a/android-json-form-wizard/build.gradle b/android-json-form-wizard/build.gradle
@@ -140,7 +140,6 @@ dependencies {
     implementation 'com.jakewharton.timber:timber:4.7.1'
     implementation 'org.greenrobot:eventbus:3.1.1'
     implementation 'com.android.support:multidex:1.0.3'
-    testImplementation project(path: ':android-json-form-wizard')
 
     // PowerMock
     def powerMockVersion = '2.0.4'

diff --git a/...n-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/LengthValidator.java b/...n-form-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/LengthValidator.java
@@ -1,5 +1,7 @@
 package com.vijay.jsonwizard.validators.edittext;
 
+import android.support.annotation.NonNull;
+
 import com.rengwuxian.materialedittext.validation.METValidator;
 
 /**
@@ -9,17 +11,22 @@ public class LengthValidator extends METValidator {
 
     protected int minLength = 0;
     protected int maxLength = Integer.MAX_VALUE;
+    protected boolean isRequired;
 
-    public LengthValidator(String errorMessage, int minLength, int maxLength) {
+    public LengthValidator(String errorMessage, int minLength, int maxLength, boolean isRequired) {
         super(errorMessage);
         this.minLength = minLength;
         this.maxLength = maxLength;
+        this.isRequired = isRequired;
     }
 
     @Override
-    public boolean isValid(CharSequence charSequence, boolean isEmpty) {
-        return charSequence != null ? !isEmpty && charSequence.length() >= minLength && charSequence.length() <= maxLength && charSequence != null
-                : false;
-
+    public boolean isValid(@NonNull CharSequence charSequence, boolean isEmpty) {
+        if (isRequired && isEmpty)
+            return false;
+        else if (!isRequired && isEmpty)
+            return true;
+        else
+            return (charSequence != null && charSequence.length() >= minLength && charSequence.length() <= maxLength);
     }
 }
diff --git a/...orm-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MaxLengthValidator.java b/...orm-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MaxLengthValidator.java
@@ -7,7 +7,7 @@
  */
 public class MaxLengthValidator extends LengthValidator {
 
-    public MaxLengthValidator(String errorMessage, int maxLength) {
-        super(errorMessage, EditTextFactory.MIN_LENGTH, maxLength);
+    public MaxLengthValidator(String errorMessage, int maxLength, boolean isRequired) {
+        super(errorMessage, EditTextFactory.MIN_LENGTH, maxLength, isRequired);
     }
 }
diff --git a/...orm-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MinLengthValidator.java b/...orm-wizard/src/main/java/com/vijay/jsonwizard/validators/edittext/MinLengthValidator.java
@@ -7,7 +7,7 @@
  */
 public class MinLengthValidator extends LengthValidator {
 
-    public MinLengthValidator(String errorMessage, int minLength) {
-        super(errorMessage, minLength, EditTextFactory.MAX_LENGTH);
+    public MinLengthValidator(String errorMessage, int minLength, boolean isRequired) {
+        super(errorMessage, minLength, EditTextFactory.MAX_LENGTH, isRequired);
     }
 }
diff --git a/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/EditTextFactory.java b/android-json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/EditTextFactory.java
diff --git a/...json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactory.java b/...json-form-wizard/src/main/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactory.java
@@ -909,6 +909,16 @@ public Set<String> getCustomTranslatableWidgetFields() {
     }
 
 
+    public void cleanUp() {
+        this.context = null;
+        this.formFragment = null;
+        this.radioButton = null;
+        this.extraInfoTextView = null;
+        this.specifyTextView = null;
+        this.reasonsTextView = null;
+
+    }
+
     private class CustomTextViewClickListener implements View.OnClickListener {
         @Override
         public void onClick(View view) {
@@ -917,13 +927,4 @@ public void onClick(View view) {
             radioButton.performClick();
         }
     }
-
-        public void cleanUp() {
-            this.context = null;
-            this.formFragment = null;
-            this.radioButton = null;
-            this.extraInfoTextView = null;
-            this.specifyTextView = null;
-            this.reasonsTextView = null;
-        }
-    }
+}
diff --git a/...rm-wizard/src/test/java/com/vijay/jsonwizard/validators/edittext/LengthValidatorTest.java b/...rm-wizard/src/test/java/com/vijay/jsonwizard/validators/edittext/LengthValidatorTest.java
@@ -8,18 +8,32 @@
 public class LengthValidatorTest extends BaseTest {
 
     @Test
-    public void isValidShouldReturnFalseWhenIsEmptyTrue() {
+    public void isValidShouldReturnTrueWhenEditTextValueIsEmptyAndMinimumLengthIsZeroAndIsNotRequired() {
+        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, CONSTANT_INT_50, false);
+        Assert.assertEquals(true, validator.isValid("", true));
+    }
 
-        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, CONSTANT_INT_50);
-        Assert.assertEquals(false, validator.isValid(DEFAULT_TEST_MESSAGE, true));
+    @Test
+    public void isValidShouldReturnFalseWhenEditTextValueIsEmptyAndIsRequired() {
+        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, CONSTANT_INT_50, true);
+        Assert.assertEquals(false, validator.isValid("", true));
+    }
 
+    @Test
+    public void isValidShouldReturnTrueWhenEditTextValueIsNotEmptyAndIsLowerThanMaximumLength() {
+        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, CONSTANT_INT_50, false);
+        Assert.assertEquals(true, validator.isValid(DEFAULT_TEST_MESSAGE, false));
     }
 
     @Test
-    public void isValidShouldReturnTrueWhenIsEmptyFalse() {
+    public void isValidShouldReturnFalseWhenEditTextValueIsLongerThanMaximumLength() {
+        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, 20, false);
+        Assert.assertEquals(false, validator.isValid("This message is longer", false));
+    }
 
-        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, CONSTANT_INT_50);
+    @Test
+    public void isValidShouldReturnTrueWhenEditTextValueIsLongerThanMinimumLengthAndShorterThanMaximumLength() {
+        LengthValidator validator = new LengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_0, CONSTANT_INT_50, false);
         Assert.assertEquals(true, validator.isValid(DEFAULT_TEST_MESSAGE, false));
     }
-}
-
+}
diff --git a/...wizard/src/test/java/com/vijay/jsonwizard/validators/edittext/MaxLengthValidatorTest.java b/...wizard/src/test/java/com/vijay/jsonwizard/validators/edittext/MaxLengthValidatorTest.java
@@ -6,34 +6,28 @@
 import org.junit.Test;
 
 public class MaxLengthValidatorTest extends BaseTest {
+
     @Test
     public void isValidShouldReturnFalseWhenStringLengthGreaterThanMaxSetValue() {
-
-        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1);
+        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1, false);
         Assert.assertEquals(false, validator.isValid(DEFAULT_TEST_MESSAGE, false));
-
     }
 
     @Test
     public void isValidShouldReturnTrueWhenStringLengthLessThanMaxSetValue() {
-
-        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_50);
+        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_50, false);
         Assert.assertEquals(true, validator.isValid(DEFAULT_TEST_MESSAGE, false));
-
     }
 
     @Test
     public void isValidShouldReturnTrueWhenStringLengthEqualToMaxSetValue() {
-        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_16);
+        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_16, false);
         Assert.assertEquals(true, validator.isValid(DEFAULT_TEST_MESSAGE, false));
-
     }
 
     @Test
     public void isValidShouldReturnTrueWhenTheStringIsNull() {
-        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1);
+        MaxLengthValidator validator = new MaxLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1, false);
         Assert.assertEquals(false, (validator.isValid(null, false)));
     }
-
 }
-
diff --git a/...wizard/src/test/java/com/vijay/jsonwizard/validators/edittext/MinLengthValidatorTest.java b/...wizard/src/test/java/com/vijay/jsonwizard/validators/edittext/MinLengthValidatorTest.java
@@ -6,34 +6,28 @@
 import org.junit.Test;
 
 public class MinLengthValidatorTest extends BaseTest {
+
     @Test
     public void isValidShouldReturnTrueWhenStringLengthIsGreaterThanMinSetValue() {
-
-        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1);
+        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1, false);
         Assert.assertEquals(true, validator.isValid(DEFAULT_TEST_MESSAGE, false));
-
     }
 
     @Test
     public void isValidShouldReturnFalseWhenStringLengthIsLessThanMinSetValue() {
-
-        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_50);
+        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_50, false);
         Assert.assertEquals(false, validator.isValid(DEFAULT_TEST_MESSAGE, false));
-
     }
 
     @Test
     public void isValidShouldReturnTrueWhenStringLengthIsEqualToMinSetValue() {
-
-        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_16);
+        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_16, false);
         Assert.assertEquals(true, validator.isValid(DEFAULT_TEST_MESSAGE, false));
-
     }
 
     @Test
     public void isValidShouldReturnTrueWhenTheStringIsNull() {
-        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1);
+        MinLengthValidator validator = new MinLengthValidator(DEFAULT_ERROR_MSG, CONSTANT_INT_1, false);
         Assert.assertEquals(false, (validator.isValid(null, false)));
     }
-
 }
diff --git a/...-form-wizard/src/test/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactoryTest.java b/...-form-wizard/src/test/java/com/vijay/jsonwizard/widgets/NativeRadioButtonFactoryTest.java
@@ -136,6 +136,7 @@ public void testSelectedButton() throws Exception {
         radioButton = Mockito.mock(RadioButton.class);
         Whitebox.invokeMethod(factory, "checkSelectedRadioButton", listener, radioButton, value, jsonObject);
         ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+        Thread.sleep(TIMEOUT);
         Mockito.verify(radioButton).setChecked(ArgumentMatchers.anyBoolean());
     }
 
@@ -148,6 +149,7 @@ public void testSelectedTranslatedButton() throws Exception {
         radioButton = Mockito.mock(RadioButton.class);
         Whitebox.invokeMethod(factory, "checkSelectedRadioButton", listener, radioButton, value, jsonObject);
         ShadowLooper.runUiThreadTasksIncludingDelayedTasks();
+        Thread.sleep(TIMEOUT);
         Mockito.verify(radioButton).setChecked(ArgumentMatchers.anyBoolean());
     }
 }