Fixed Unit Tests

quemb · Mar 2, 2017 · 60df69f · 60df69f
1 parent dcadc34
commit 60df69f
Show file tree

Hide file tree

Showing 16 changed files with 35 additions and 89 deletions.
diff --git a/lib/QMBForm/build.gradle b/lib/QMBForm/build.gradle
@@ -39,12 +39,9 @@ android {
     lintOptions {
         abortOnError false
     }
+
     sourceSets {
-        androidTest {
-            setRoot('src/test')
-            res.srcDirs = [ 'src/test/resources' ]
-        }
-
+
         test {
             setRoot('src/test')
             res.srcDirs = [ 'src/test/resources' ]
@@ -57,6 +54,9 @@ android {
         abortOnError false
     }
 
+    testOptions {
+        unitTests.returnDefaultValues = true
+    }
 }
 
 dependencies {
@@ -65,7 +65,8 @@ dependencies {
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.hamcrest:hamcrest-core:1.2.1'
-    testCompile 'org.robolectric:robolectric:3.0'
+    testCompile "org.robolectric:robolectric:3.2.2"
+
 }
 
 apply plugin: 'idea'

diff --git a/lib/QMBForm/src/main/java/com/quemb/qmbform/view/FormDateFieldCell.java b/lib/QMBForm/src/main/java/com/quemb/qmbform/view/FormDateFieldCell.java
@@ -45,6 +45,7 @@ protected void update() {
         String title = getFormItemDescriptor().getTitle();
         mTextView.setText(title);
         mTextView.setVisibility(title == null ? GONE : VISIBLE);
+        mTextView.setEnabled(!getRowDescriptor().getDisabled());
 
         @SuppressWarnings("unchecked") Value<Date> value = (Value<Date>) getRowDescriptor().getValue();
         if (value == null || value.getValue() == null) {
@@ -79,7 +80,7 @@ public void onDateChanged(Date date) {
 //        calendar.set(year, monthOfYear, dayOfMonth);
 //        Date date = new Date(calendar.getTimeInMillis());
 
-        updateDateLabel(date, false);
+        updateDateLabel(date, getRowDescriptor().getDisabled());
 
         onValueChanged(new Value<Date>(date));
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/AnnotationFormTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/AnnotationFormTest.java
@@ -11,7 +11,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -27,7 +27,7 @@
  * Created by pmaccamp on 9/14/2015.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class AnnotationFormTest {
     private Activity activity;
     private TestUserClass testUserClass;

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormBooleanFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormBooleanFieldCellTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -20,7 +20,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormBooleanFieldCellTest {
 
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormButtonFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormButtonFieldCellTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -20,7 +20,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormButtonFieldCellTest {
     private Activity activity;
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormCheckFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormCheckFieldCellTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -20,7 +20,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormCheckFieldCellTest {
 
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormDateFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormDateFieldCellTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -23,7 +23,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormDateFieldCellTest {
 
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormEditFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormEditFieldCellTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -20,7 +20,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormEditFieldCellTest {
 
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormIntegerSliderCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormIntegerSliderCellTest.java
@@ -9,7 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -21,7 +21,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormIntegerSliderCellTest {
 
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormManagerTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormManagerTest.java
@@ -7,7 +7,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -21,7 +21,7 @@
  * Created by tonimoeckel on 12.08.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormManagerTest {
 
     private FormManager formManager;

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormPickerFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormPickerFieldCellTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -20,7 +20,7 @@
  * Created by tonimoeckel on 02.09.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormPickerFieldCellTest {
 
 

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/FormSelectorSegmentedControlFieldCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/FormSelectorSegmentedControlFieldCellTest.java
diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/ValidationTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/ValidationTest.java
@@ -18,7 +18,7 @@
  */
 
 // @Config(constants = BuildConfig.class)
-// @RunWith(RobolectricGradleTestRunner.class)
+// @RunWith(RobolectricTestRunner.class)
 public class ValidationTest {
     @Before
     public void setUp() {

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/ValueTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/ValueTest.java
@@ -7,7 +7,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -17,7 +17,7 @@
  * Created by tonimoeckel on 28.08.14.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class ValueTest {
 
     private Value<Integer> value;

diff --git a/lib/QMBForm/src/test/java/com/quemb/qmbform/view/FormBaseCellTest.java b/lib/QMBForm/src/test/java/com/quemb/qmbform/view/FormBaseCellTest.java
@@ -8,7 +8,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.Robolectric;
-import org.robolectric.RobolectricGradleTestRunner;
+import org.robolectric.RobolectricTestRunner;
 import org.robolectric.annotation.Config;
 
 import android.app.Activity;
@@ -20,7 +20,7 @@
  * Created by Toni on 25.10.15.
  */
 @Config(constants = BuildConfig.class)
-@RunWith(RobolectricGradleTestRunner.class)
+@RunWith(RobolectricTestRunner.class)
 public class FormBaseCellTest {
 
     FormBaseCell cell;

diff --git a/lib/QMBForm/src/test/resources/com/quemb/qmbform/robolectric.properties b/lib/QMBForm/src/test/resources/com/quemb/qmbform/robolectric.properties
@@ -0,0 +1,3 @@
+sdk=18
+manifest=lib/QMBForm/src/main/AndroidManifest.xml
+constants=com.quemb.qmbform.BuildConfig