Store shared entities for follow up forms #6108
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| package org.odk.collect.android.feature.entitymanagement | ||
|
|
||
| import org.junit.Rule | ||
| import org.junit.Test | ||
| import org.junit.rules.RuleChain | ||
| import org.odk.collect.android.support.TestDependencies | ||
| import org.odk.collect.android.support.pages.FormEntryPage | ||
| import org.odk.collect.android.support.rules.CollectTestRule | ||
| import org.odk.collect.android.support.rules.TestRuleChain | ||
|
|
||
| class ViewEntitiesTest { | ||
|
|
||
| private val rule = CollectTestRule(useDemoProject = false) | ||
| private val testDependencies = TestDependencies() | ||
|
|
||
| @get:Rule | ||
| val ruleChain: RuleChain = TestRuleChain.chain(testDependencies) | ||
| .around(rule) | ||
|
|
||
| @Test | ||
| fun canViewLocallyCreatedEntitiesInBrowser() { | ||
| testDependencies.server.addForm("one-question-entity-registration.xml") | ||
|
|
||
| rule.withMatchExactlyProject(testDependencies.server.url) | ||
| .addEntityListInBrowser("people") | ||
| .startBlankForm("One Question Entity Registration") | ||
| .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy")) | ||
| .openEntityBrowser() | ||
| .clickOnDataset("people") | ||
| .assertEntity("Logan Roy", "full_name: Logan Roy") | ||
| } | ||
|
|
||
| @Test | ||
| fun canViewListEntitiesInBrowser() { | ||
| testDependencies.server.addForm("one-question-entity-follow-up.xml", listOf("people.csv")) | ||
|
|
||
| rule.withMatchExactlyProject(testDependencies.server.url) | ||
| .addEntityListInBrowser("people") | ||
| .refreshForms() | ||
| .openEntityBrowser() | ||
| .clickOnDataset("people") | ||
| .assertEntity("Roman Roy", "full_name: Roman Roy") | ||
| } | ||
| } | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ import org.junit.rules.RuleChain | |
| import org.junit.runner.RunWith | ||
| import org.odk.collect.android.support.TestDependencies | ||
| import org.odk.collect.android.support.pages.FormEntryPage | ||
| import org.odk.collect.android.support.pages.MainMenuPage | ||
| import org.odk.collect.android.support.rules.CollectTestRule | ||
| import org.odk.collect.android.support.rules.TestRuleChain | ||
|
|
||
|
|
@@ -21,15 +22,20 @@ class EntityFormTest { | |
| .around(rule) | ||
|
|
||
| @Test | ||
| fun fillingEntityRegistrationForm_beforeCreatingEntityList_doesNotCreateEntityForFollowUpForms() { | ||
|
There was a problem hiding this comment. This title sounds confusing to me similar to #6108 (comment) There was a problem hiding this comment. You "create an entity list" in the browser using the "Add entity list" flow. Does that make sense or do you think it needs updated? There was a problem hiding this comment.
But you don't do that here? There was a problem hiding this comment.
Right. That's the "beforeCreatingEntityList" part. I'm testing that we don't create entities if we haven't manually created an entity list yet. |
||
| testDependencies.server.addForm("one-question-entity-registration.xml") | ||
| testDependencies.server.addForm("one-question-entity-update.xml", listOf("people.csv")) | ||
|
|
||
| rule.withMatchExactlyProject(testDependencies.server.url) | ||
| .enableLocalEntitiesInForms() | ||
|
|
||
| .startBlankForm("One Question Entity Registration") | ||
| .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy")) | ||
|
|
||
| .startBlankForm("One Question Entity Update") | ||
| .assertQuestion("Select person") | ||
| .assertText("Roman Roy") | ||
| .assertTextDoesNotExist("Logan Roy") | ||
| } | ||
|
|
||
| @Test | ||
|
|
@@ -38,7 +44,7 @@ class EntityFormTest { | |
| testDependencies.server.addForm("one-question-entity-update.xml", listOf("people.csv")) | ||
|
|
||
| rule.withMatchExactlyProject(testDependencies.server.url) | ||
| .setupEntities("people") | ||
|
|
||
| .startBlankForm("One Question Entity Registration") | ||
| .fillOutAndFinalize(FormEntryPage.QuestionAndAnswer("Name", "Logan Roy")) | ||
|
|
@@ -55,7 +61,7 @@ class EntityFormTest { | |
| testDependencies.server.addForm("one-question-entity-update.xml", listOf("people.csv")) | ||
|
|
||
| rule.withMatchExactlyProject(testDependencies.server.url) | ||
| .setupEntities("people") | ||
|
|
||
| .startBlankForm("One Question Entity Update") // Open to create cached form def | ||
| .pressBackAndDiscardForm() | ||
|
|
@@ -74,7 +80,7 @@ class EntityFormTest { | |
| testDependencies.server.addForm("one-question-entity-update.xml", listOf("people.csv")) | ||
|
|
||
| rule.withMatchExactlyProject(testDependencies.server.url) | ||
| .setupEntities("people") | ||
|
|
||
| .startBlankForm("One Question Entity Update") | ||
| .assertQuestion("Select person") | ||
|
|
@@ -90,54 +96,39 @@ class EntityFormTest { | |
| } | ||
|
|
||
| @Test | ||
| fun entityListsAreConsistentBetweenFollowUpForms() { | ||
seadowg marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| testDependencies.server.apply { | ||
| addForm( | ||
| "one-question-entity-update.xml", | ||
| listOf("people.csv") | ||
| ) | ||
|
|
||
| addForm( | ||
| "one-question-entity-follow-up.xml", | ||
| mapOf("people.csv" to "updated-people.csv") | ||
| ) | ||
| } | ||
|
|
||
| rule.withProject(testDependencies.server) | ||
| .enableLocalEntitiesInForms() | ||
| .addEntityListInBrowser("people") | ||
|
|
||
| .clickGetBlankForm() | ||
| .clickClearAll() | ||
| .clickForm("one-question-entity-update.xml") | ||
| .clickGetSelected() | ||
| .clickOK(MainMenuPage()) | ||
| .startBlankForm("One Question Entity Update") | ||
| .assertText("Roman Roy") | ||
| .pressBackAndDiscardForm() | ||
|
|
||
| .clickGetBlankForm() | ||
| .clickClearAll() | ||
|
There was a problem hiding this comment. Why those forms are both selected here? There was a problem hiding this comment. I want to specifically download 'one-question-entity-follow-up.xml There was a problem hiding this comment. Yes, it makes sense but my question was about something else. Once you download the first form and open the list of forms to download again the one you already have should be unselected by default. It seems like both are selected as if the first one was removed or not downloaded at all yet. You shouldn't need to click the clear button and then select that form because the form you want to download should be the only one selected. There was a problem hiding this comment. Ah got you! I think I'd still prefer the "clear all" to make it explicit I'm selecting that form. There was a problem hiding this comment.
No, I think you don't. Please run that test There was a problem hiding this comment. Sorry! That'll be the brain fog last week. I see what you mean: it's weird that both forms are selected. I'm guessing this is a problem with There was a problem hiding this comment. Yeah it's because |
||
| .clickForm("one-question-entity-follow-up.xml") | ||
| .clickGetSelected() | ||
| .clickOK(MainMenuPage()) | ||
| .startBlankForm("One Question Entity Update") | ||
| .assertText("Ro-Ro Roy") | ||
| .assertTextDoesNotExist("Roman Roy") | ||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we started using different names... online and offline entities are I think the clearest options but here we have
local entities. The test title below is also not clear it's about online entities.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The reason I ended up using local is because we know store both the "offline" and "online" entities in one place ("local"), but can create or update them locally (rather than those creates/updates coming from the server). It's definitely got me a little twisted up. Do you think we should use "offline" here?
I reckon this will become easier again with #6011, as we'll need to start tracking if local entities are "offline" or "online" so we know whether to delete them or not if they're not in the "online" lists any longer.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can be
localinstead ofoffline(maybe it's even better) but it would require reviewing the code and fixing other occurrences ofoffline.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we leave this for #6011? I think, it'll be best to consolidate the naming there.