Merge branch 'feature/connect' of https://github.com/dimagi/commcare-…

…android into dv/connect_initial
dimagi · Mar 19, 2024 · 02dbb9d · 02dbb9d
2 parents 5100556 + fa2508a
commit 02dbb9d
Showing 1 changed file with 22 additions and 23 deletions.
diff --git a/app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java b/app/unit-tests/src/org/commcare/android/tests/processing/FormStorageTest.java
@@ -342,33 +342,32 @@ public class FormStorageTest {
             // Added in 2.53
             "org.javarosa.xpath.expr.XPathDecryptStringFunc",
             "org.javarosa.xpath.expr.XPathJsonPropertyFunc",
-            "org.commcare.suite.model.AndroidPackageDependency",
+            "org.commcare.suite.model.AndroidPackageDependency"
 
             // Added in 2.54
-            "org.commcare.services.FCMMessageData",
-            "org.commcare.suite.model.DetailGroup",
-            "org.commcare.suite.model.EndpointArgument",
-            "org.commcare.suite.model.ListQueryData",
-            "org.commcare.suite.model.MultiSelectEntityDatum",
-            "org.commcare.suite.model.QueryPromptCondition",
-            "org.commcare.suite.model.ValueQueryData",
-            "org.javarosa.core.model.instance.ExternalDataInstanceSource",
-            "org.javarosa.core.util.externalizable.ExtWrapMultiMap",
-            "org.commcare.android.database.connect.models.ConnectLinkedAppRecord",
-            "org.commcare.android.database.connect.models.ConnectUserRecord",
-            "org.commcare.android.database.connect.models.ConnectAppRecord",
-            "org.commcare.android.database.connect.models.ConnectJobDeliveryRecordV2",
-            "org.commcare.android.database.connect.models.ConnectJobDeliveryRecord",
-            "org.commcare.android.database.connect.models.ConnectJobPaymentRecord",
-            "org.commcare.android.database.connect.models.ConnectJobRecordV2",
-            "org.commcare.android.database.connect.models.ConnectJobRecord",
-            "org.commcare.android.database.connect.models.ConnectLearnModuleSummaryRecord",
-            "org.commcare.android.database.connect.models.ConnectJobLearningRecord",
-            "org.commcare.android.database.connect.models.ConnectJobAssessmentRecord",
-            "org.commcare.android.database.global.models.ConnectKeyRecord"
-
+            , "org.commcare.suite.model.QueryPromptCondition"
+            , "org.commcare.suite.model.MultiSelectEntityDatum"
+            , "org.commcare.suite.model.ListQueryData"
+            , "org.commcare.suite.model.ValueQueryData"
+            , "org.javarosa.core.util.externalizable.ExtWrapMultiMap"
+            , "org.javarosa.core.model.instance.ExternalDataInstanceSource"
+            , "org.commcare.suite.model.DetailGroup"
+            , "org.commcare.services.FCMMessageData"
+            , "org.commcare.suite.model.EndpointArgument"
             , "org.commcare.suite.model.EndpointAction"
             , "org.commcare.suite.model.QueryGroup"
+            , "org.commcare.android.database.connect.models.ConnectLinkedAppRecord"
+            , "org.commcare.android.database.connect.models.ConnectUserRecord"
+            , "org.commcare.android.database.connect.models.ConnectAppRecord"
+            , "org.commcare.android.database.connect.models.ConnectJobDeliveryRecordV2"
+            , "org.commcare.android.database.connect.models.ConnectJobDeliveryRecord"
+            , "org.commcare.android.database.connect.models.ConnectJobPaymentRecord"
+            , "org.commcare.android.database.connect.models.ConnectJobRecordV2"
+            , "org.commcare.android.database.connect.models.ConnectJobRecord"
+            , "org.commcare.android.database.connect.models.ConnectLearnModuleSummaryRecord"
+            , "org.commcare.android.database.connect.models.ConnectJobLearningRecord"
+            , "org.commcare.android.database.connect.models.ConnectJobAssessmentRecord"
+            , "org.commcare.android.database.global.models.ConnectKeyRecord"
     );