Merge pull request #295 from dhis2/develop

Develop 0.9.7
dhis2 · Jul 4, 2018 · 5f33f97 · 5f33f97
2 parents 214d461 + 14b5bba
commit 5f33f97
Show file tree

Hide file tree

Showing 132 changed files with 2,595 additions and 739 deletions.
diff --git a/build.gradle b/build.gradle
@@ -55,8 +55,8 @@ ext {
             buildToolsVersion: "25.0.2",
             minSdkVersion    : 15,
             targetSdkVersion : 25,
-            versionCode      : 96,
-            versionName      : "0.9.6-SNAPSHOT"
+            versionCode      : 97,
+            versionName      : "0.9.7-SNAPSHOT"
     ]
 
     libraries = [

diff --git a/...ules-android/src/androidTest/java/org/hisp/dhis/rules/android/DuktapeEvaluatorShould.java b/...ules-android/src/androidTest/java/org/hisp/dhis/rules/android/DuktapeEvaluatorShould.java
@@ -33,4 +33,9 @@ public void return_expected_values() throws Exception {
         assertThat(duktapeEvaluator.evaluate("true")).isEqualTo("true");
         assertThat(duktapeEvaluator.evaluate("\'test_string\'")).isEqualTo("test_string");
     }
+
+    @Test
+    public void catch_duktape_exception_on_unquoted_string() {
+        assertThat(duktapeEvaluator.evaluate("test_string")).isEqualTo("test_string");
+    }
 }
diff --git a/core-rules-android/src/main/java/org/hisp/dhis/rules/android/DuktapeEvaluator.java b/core-rules-android/src/main/java/org/hisp/dhis/rules/android/DuktapeEvaluator.java
@@ -3,6 +3,7 @@
 import android.support.annotation.NonNull;
 
 import com.squareup.duktape.Duktape;
+import com.squareup.duktape.DuktapeException;
 
 import org.hisp.dhis.rules.RuleExpressionEvaluator;
 
@@ -28,6 +29,10 @@ public String evaluate(@Nonnull String expression) {
             throw new NullPointerException("expression == null");
         }
 
-        return duktape.evaluate(expression).toString();
+        try {
+            return duktape.evaluate(expression).toString();
+        } catch (DuktapeException e) {
+            return expression;
+        }
     }
 }
diff --git a/core-rules/src/main/java/org/hisp/dhis/rules/RuleEngineExecution.java b/core-rules/src/main/java/org/hisp/dhis/rules/RuleEngineExecution.java
@@ -8,6 +8,8 @@
 import org.hisp.dhis.rules.models.RuleActionDisplayKeyValuePair;
 import org.hisp.dhis.rules.models.RuleActionDisplayText;
 import org.hisp.dhis.rules.models.RuleActionErrorOnCompletion;
+import org.hisp.dhis.rules.models.RuleActionScheduleMessage;
+import org.hisp.dhis.rules.models.RuleActionSendMessage;
 import org.hisp.dhis.rules.models.RuleActionShowError;
 import org.hisp.dhis.rules.models.RuleActionShowWarning;
 import org.hisp.dhis.rules.models.RuleActionWarningOnCompletion;
@@ -20,6 +22,11 @@
 
 import javax.annotation.Nonnull;
 
+@SuppressWarnings({
+        "PMD.CyclomaticComplexity",
+        "PMD.ModifiedCyclomaticComplexity",
+        "PMD.StdCyclomaticComplexity"
+})
 class RuleEngineExecution implements Callable<List<RuleEffect>> {
     private static final String D2_FUNCTION_PREFIX = "d2:";
 
@@ -87,6 +94,12 @@ private RuleEffect create(@Nonnull RuleAction ruleAction) {
         } else if (ruleAction instanceof RuleActionWarningOnCompletion) {
             return RuleEffect.create(ruleAction,
                     process(((RuleActionWarningOnCompletion) ruleAction).data()));
+        } else if (ruleAction instanceof RuleActionSendMessage) {
+            return RuleEffect.create(ruleAction,
+                    process(((RuleActionSendMessage) ruleAction).data()));
+        } else if (ruleAction instanceof RuleActionScheduleMessage) {
+            return RuleEffect.create(ruleAction,
+                    process(((RuleActionScheduleMessage) ruleAction).data()));
         }
 
         return RuleEffect.create(ruleAction);

diff --git a/core-rules/src/main/java/org/hisp/dhis/rules/models/RuleActionScheduleMessage.java b/core-rules/src/main/java/org/hisp/dhis/rules/models/RuleActionScheduleMessage.java
@@ -0,0 +1,22 @@
+package org.hisp.dhis.rules.models;
+
+import com.google.auto.value.AutoValue;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@AutoValue
+public abstract class RuleActionScheduleMessage extends RuleAction {
+
+    @Nonnull
+    public abstract String notification();
+
+    @Nonnull
+    public abstract String data();
+
+    @Nonnull
+    public static RuleActionScheduleMessage create(@Nullable String notification, @Nullable String data) {
+        return new AutoValue_RuleActionScheduleMessage(notification == null ? "" : notification,
+                data == null ? "" : data);
+    }
+}
diff --git a/core-rules/src/main/java/org/hisp/dhis/rules/models/RuleActionSendMessage.java b/core-rules/src/main/java/org/hisp/dhis/rules/models/RuleActionSendMessage.java
@@ -0,0 +1,21 @@
+package org.hisp.dhis.rules.models;
+
+import com.google.auto.value.AutoValue;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+@AutoValue
+public abstract class RuleActionSendMessage extends RuleAction {
+
+    @Nonnull
+    public abstract String notification();
+
+    @Nonnull
+    public abstract String data();
+
+    @Nonnull
+    public static RuleActionSendMessage create(@Nullable String notification, @Nullable String data) {
+        return new AutoValue_RuleActionSendMessage(notification == null ? "": notification, data == null ? "" : data);
+    }
+}
diff --git a/core-rules/src/test/java/org/hisp/dhis/rules/models/RuleActionScheduleMessageShould.java b/core-rules/src/test/java/org/hisp/dhis/rules/models/RuleActionScheduleMessageShould.java
@@ -0,0 +1,31 @@
+package org.hisp.dhis.rules.models;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+@RunWith(JUnit4.class)
+public class RuleActionScheduleMessageShould {
+
+    @Test
+    public void substitute_empty_strings_when_create_with_null_arguments() {
+        RuleActionScheduleMessage ruleActionScheduleMessage = RuleActionScheduleMessage
+                .create("notification", "data");
+        RuleActionScheduleMessage ruleActionScheduleMessageNoData = RuleActionScheduleMessage
+                .create("notification", null);
+        RuleActionScheduleMessage ruleActionScheduleMessageNoNotification = RuleActionScheduleMessage
+                .create(null, "data");
+
+        assertThat(ruleActionScheduleMessage.notification()).isEqualTo("notification");
+        assertThat(ruleActionScheduleMessage.data()).isEqualTo("data");
+
+        assertThat(ruleActionScheduleMessageNoData.notification()).isEqualTo("notification");
+        assertThat(ruleActionScheduleMessageNoData.data()).isEqualTo("");
+
+        assertThat(ruleActionScheduleMessageNoNotification.notification()).isEqualTo("");
+        assertThat(ruleActionScheduleMessageNoNotification.data()).isEqualTo("data");
+    }
+
+}
diff --git a/core-rules/src/test/java/org/hisp/dhis/rules/models/RuleActionSendMessageShould.java b/core-rules/src/test/java/org/hisp/dhis/rules/models/RuleActionSendMessageShould.java
@@ -0,0 +1,28 @@
+package org.hisp.dhis.rules.models;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
+import static org.assertj.core.api.Java6Assertions.assertThat;
+
+@RunWith(JUnit4.class)
+public class RuleActionSendMessageShould {
+
+    @Test
+    public void substitute_empty_strings_when_create_with_null_arguments() {
+        RuleActionSendMessage ruleActionSendMessage = RuleActionSendMessage.create("notification", "data");
+        RuleActionSendMessage ruleActionSendMessageNoData = RuleActionSendMessage.create("notification", null);
+        RuleActionSendMessage ruleActionSendMessageNoNotification = RuleActionSendMessage.create(null, "data");
+
+        assertThat(ruleActionSendMessage.notification()).isEqualTo("notification");
+        assertThat(ruleActionSendMessage.data()).isEqualTo("data");
+
+        assertThat(ruleActionSendMessageNoData.notification()).isEqualTo("notification");
+        assertThat(ruleActionSendMessageNoData.data()).isEqualTo("");
+
+        assertThat(ruleActionSendMessageNoNotification.notification()).isEqualTo("");
+        assertThat(ruleActionSendMessageNoNotification.data()).isEqualTo("data");
+    }
+
+}
diff --git a/core/build.gradle b/core/build.gradle
@@ -144,6 +144,13 @@ dependencies {
     androidTestCompile("com.google.truth:truth:${libraries.truth}") {
         exclude group: 'junit' // Android has JUnit built in.
     }
+    androidTestCompile ('com.facebook.stetho:stetho:1.5.0') {
+        exclude module: 'jsr305'
+    }
+    androidTestCompile('com.facebook.stetho:stetho-okhttp3:1.5.0') {
+        exclude module: 'okhttp'
+        exclude module: 'jsr305'
+    }
     compile 'com.google.code.findbugs:annotations:3.0.0'
 }
 

diff --git a/core/src/androidTest/assets/data_elements.json b/core/src/androidTest/assets/data_elements.json
@@ -21,7 +21,10 @@
       "zeroIsSignificant": false,
       "url": "",
       "optionSetValue": true,
-      "dimensionItemType": "DATA_ELEMENT"
+      "dimensionItemType": "DATA_ELEMENT",
+      "access": {
+        "read": true
+      }
     }
   ]
 }
diff --git a/core/src/androidTest/assets/program_stages.json b/core/src/androidTest/assets/program_stages.json
@@ -64,6 +64,9 @@
             "valueType": "BOOLEAN",
             "optionSet": {
               "id": "VQ2lai3OfVG"
+            },
+            "access": {
+              "read": true
             }
           }
         },
@@ -94,7 +97,10 @@
             "displayFormName": "WHOMCH Smoking cessation counselling provided ",
             "zeroIsSignificant": false,
             "displayShortName": "Smoking cessation counselling provided ",
-            "valueType": "BOOLEAN"
+            "valueType": "BOOLEAN",
+            "access": {
+              "read": true
+            }
           }
         },
         {
@@ -124,7 +130,10 @@
             "displayFormName": "WHOMCH Hemoglobin value",
             "zeroIsSignificant": true,
             "displayShortName": "Hemoglobin value",
-            "valueType": "NUMBER"
+            "valueType": "NUMBER",
+            "access": {
+              "read": true
+            }
           }
         }
       ],

diff --git a/core/src/androidTest/assets/programs_complete.json b/core/src/androidTest/assets/programs_complete.json
@@ -107,6 +107,9 @@
                       "unique": false,
                       "valueType": "TEXT",
                       "orgunitScope": false,
+                      "access": {
+                          "read": true
+                      },
                       "renderType": {
                           "DESKTOP": {
                               "type": "SPINNER",
@@ -162,6 +165,9 @@
                       "inherit": false,
                       "unique": false,
                       "valueType": "TEXT",
+                      "access": {
+                          "read": true
+                      },
                       "orgunitScope": false
                   }
               },
@@ -201,6 +207,9 @@
                       "inherit": false,
                       "unique": false,
                       "valueType": "TEXT",
+                      "access": {
+                          "read": true
+                      },
                       "orgunitScope": false
                   }
               }

diff --git a/...t/java/org/hisp/dhis/android/core/category/CategoryEndpointCallRealIntegrationShould.java b/...t/java/org/hisp/dhis/android/core/category/CategoryEndpointCallRealIntegrationShould.java
@@ -8,7 +8,6 @@
 import org.hisp.dhis.android.core.data.database.AbsStoreTestCase;
 import org.hisp.dhis.android.core.data.server.RealServerMother;
 import org.junit.Before;
-import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Date;
@@ -27,7 +26,7 @@ public void setUp() throws IOException {
         d2 = D2Factory.create(RealServerMother.url, databaseAdapter());
     }
 
-    @Test
+    //@Test
     public void call_categories_endpoint() throws Exception {
         d2.logIn(RealServerMother.user, RealServerMother.password).call();
 

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/common/D2Factory.java b/core/src/androidTest/java/org/hisp/dhis/android/core/common/D2Factory.java
@@ -2,6 +2,8 @@
 
 import android.support.test.InstrumentationRegistry;
 
+import com.facebook.stetho.okhttp3.StethoInterceptor;
+
 import org.hisp.dhis.android.core.D2;
 import org.hisp.dhis.android.core.configuration.ConfigurationModel;
 import org.hisp.dhis.android.core.data.api.BasicAuthenticatorFactory;
@@ -27,6 +29,7 @@ public static D2 create(String url, DatabaseAdapter databaseAdapter) {
                         new OkHttpClient.Builder()
                                 .addInterceptor(BasicAuthenticatorFactory.create(databaseAdapter))
                                 .addInterceptor(loggingInterceptor)
+                                .addNetworkInterceptor(new StethoInterceptor())
                                 .build()
                 )
                 .context(InstrumentationRegistry.getTargetContext().getApplicationContext())

diff --git a/...Test/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java b/...Test/java/org/hisp/dhis/android/core/common/IdentifiableObjectStoreIntegrationShould.java
@@ -106,6 +106,12 @@ public void throw_exception_deleting_with_null_uid() {
         store.delete(null);
     }
 
+    @Test
+    public void do_not_throw_exception_safe_deleting_non_existing_model() {
+        store.deleteIfExists("new-id");
+        assertThatCursor(getCursor()).isExhausted();
+    }
+
     @Test
     public void update_model() {
         store.insert(model);

diff --git a/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/AbsStoreTestCase.java b/core/src/androidTest/java/org/hisp/dhis/android/core/data/database/AbsStoreTestCase.java
@@ -32,6 +32,8 @@
 import android.database.sqlite.SQLiteDatabase;
 import android.support.test.InstrumentationRegistry;
 
+import com.facebook.stetho.Stetho;
+
 import org.junit.After;
 import org.junit.Before;
 
@@ -50,6 +52,7 @@ public void setUp() throws IOException {
                 , dbName);
         sqLiteDatabase = dbOpenHelper.getWritableDatabase();
         databaseAdapter = new SqLiteDatabaseAdapter(dbOpenHelper);
+        Stetho.initializeWithDefaults(InstrumentationRegistry.getTargetContext().getApplicationContext());
     }
 
     @After