Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Tables test #200

Open
wants to merge 8 commits into
base: development
Choose a base branch
from
Open

Update Tables test #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0de4b16
- Replace deprecated Android tests
Lamouresparus Mar 1, 2022
7a5df2d
- Initialise intents in @Before
Lamouresparus Mar 1, 2022
c4c0508
- Update CsvTest
Lamouresparus Mar 4, 2022
79f92b3
- Update InteropTest.java
Lamouresparus Mar 4, 2022
3ab3bfe
- Update WebkitStressTest
Lamouresparus Mar 8, 2022
d76d694
- Update WebViewActivityTest
Lamouresparus Mar 8, 2022
ad636fc
- Update WebViewPerfTest
Lamouresparus Mar 8, 2022
bfe9e9c
- Update tests
Lamouresparus Mar 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions tables_app/src/androidTestUitest/java/org/opendatakit/espresso/CsvTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
import android.app.Instrumentation;
import android.content.Intent;
import android.net.Uri;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;

import androidx.test.espresso.intent.rule.IntentsTestRule;
import androidx.test.core.app.ActivityScenario;
import androidx.test.espresso.intent.Intents;
import androidx.test.filters.LargeTest;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.GrantPermissionRule;
Expand All @@ -39,8 +41,6 @@
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.opendatakit.tables.R;
import org.opendatakit.tables.activities.ImportCSVActivity;
import org.opendatakit.tables.activities.MainActivity;
Expand All @@ -62,32 +62,25 @@ public class CsvTest {

private Boolean initSuccess = null;
private UiDevice mDevice;
private ActivityScenario<MainActivity> scenario;
private View decorView;

// don't annotate used in chain rule
private IntentsTestRule<MainActivity> mIntentsRule = new IntentsTestRule<MainActivity>(
MainActivity.class) {
@Override
protected void beforeActivityLaunched() {
super.beforeActivityLaunched();


private void beforeActivityLaunched(){
if (initSuccess == null) {
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
initSuccess = UAUtils.turnOnCustomHome(mDevice);
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
initSuccess = UAUtils.turnOnCustomHome(mDevice);
}
}
};
}

// don't annotate used in chain rule
private GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(
@Rule
public GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.ACCESS_FINE_LOCATION
);

@Rule
public TestRule chainedRules = RuleChain
.outerRule(grantPermissionRule)
.around(mIntentsRule);

private static int getTableCount() {
return new File(ODKFileUtils.getTablesFolder(TableFileUtils.getDefaultAppName()))
Expand All @@ -105,6 +98,11 @@ private static int getOutputDirFileCount() {

@Before
public void setup() {
beforeActivityLaunched();
scenario = ActivityScenario.launch(MainActivity.class);
Intents.init();
scenario.onActivity(activity ->
decorView = activity.getWindow().getDecorView());
UAUtils.assertInitSucess(initSuccess);
EspressoUtils.openTableManagerFromCustomHome();

Expand All @@ -125,6 +123,8 @@ public void cleanup() {
new File(ODKFileUtils
.getOutputTableCsvFile(TableFileUtils.getDefaultAppName(), T_HOUSE_TABLE_ID,
VALID_QUALIFIER)).delete();
Intents.release();
scenario.close();
}

@Test
Expand Down Expand Up @@ -223,6 +223,6 @@ public void importCsv_fileOutOfAppDir() {
onView(withText(R.string.import_choose_csv_file)).perform(click());

//check toast
EspressoUtils.toastMsgMatcher(mIntentsRule, is(ImportCSVActivity.IMPORT_FILE_MUST_RESIDE_IN_OPENDATAKIT_FOLDER));
EspressoUtils.toastMsgMatcher(decorView, is(ImportCSVActivity.IMPORT_FILE_MUST_RESIDE_IN_OPENDATAKIT_FOLDER));
}
}
91 changes: 43 additions & 48 deletions tables_app/src/androidTestUitest/java/org/opendatakit/espresso/InteropTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,40 +1,39 @@
package org.opendatakit.espresso;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.intent.Intents.intended;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.web.sugar.Web.onWebView;
import static androidx.test.espresso.web.webdriver.DriverAtoms.webClick;
import static org.opendatakit.util.TestConstants.HOPE_TAB_ID;
import static org.opendatakit.util.TestConstants.LAUNCH_DEMO_ID;
import static org.opendatakit.util.TestConstants.TABLE_MGR_WAIT;
import static org.opendatakit.util.TestConstants.T_HOUSE_E_TABLE_ID;
import static org.opendatakit.util.TestConstants.WEB_WAIT_TIMEOUT;

import android.Manifest;

import androidx.test.espresso.intent.rule.IntentsTestRule;
import androidx.test.core.app.ActivityScenario;
import androidx.test.espresso.intent.Intents;
import androidx.test.espresso.web.webdriver.Locator;
import androidx.test.filters.LargeTest;
import androidx.test.platform.app.InstrumentationRegistry;
import androidx.test.rule.GrantPermissionRule;
import androidx.test.uiautomator.UiDevice;

import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.RuleChain;
import org.junit.rules.TestRule;
import org.opendatakit.tables.R;
import org.opendatakit.tables.activities.MainActivity;
import org.opendatakit.util.EspressoUtils;
import org.opendatakit.util.ODKMatchers;
import org.opendatakit.util.UAUtils;

import java.net.MalformedURLException;

import static androidx.test.espresso.Espresso.onData;
import static androidx.test.espresso.Espresso.onView;
import static androidx.test.espresso.action.ViewActions.click;
import static androidx.test.espresso.intent.Intents.intended;
import static androidx.test.espresso.matcher.ViewMatchers.withId;
import static androidx.test.espresso.matcher.ViewMatchers.withText;
import static androidx.test.espresso.web.sugar.Web.onWebView;
import static androidx.test.espresso.web.webdriver.DriverAtoms.webClick;
import static org.opendatakit.util.TestConstants.HOPE_TAB_ID;
import static org.opendatakit.util.TestConstants.LAUNCH_DEMO_ID;
import static org.opendatakit.util.TestConstants.TABLE_MGR_WAIT;
import static org.opendatakit.util.TestConstants.T_HOUSE_E_TABLE_ID;
import static org.opendatakit.util.TestConstants.WEB_WAIT_TIMEOUT;

@LargeTest
public class InteropTest extends AbsBaseTest {
Expand All @@ -43,47 +42,41 @@ public class InteropTest extends AbsBaseTest {

private Boolean initSuccess = null;
private UiDevice mDevice;
private ActivityScenario<MainActivity> scenario;

// don't annotate used in chain rule
private IntentsTestRule<MainActivity> mIntentsRule = new IntentsTestRule<MainActivity>(
MainActivity.class) {
@Override
protected void beforeActivityLaunched() {
super.beforeActivityLaunched();

if (initSuccess == null) {
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
initSuccess = UAUtils.turnOnCustomHome(mDevice);
}
}

@Override
protected void afterActivityLaunched() {
super.afterActivityLaunched();

onWebView().forceJavascriptEnabled();
@After
public void cleanUp() {
Intents.release();
scenario.close();
}
};

// don't annotate used in chain rule
private GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(
private void beforeActivityLaunched() {
if (initSuccess == null) {
mDevice = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation());
initSuccess = UAUtils.turnOnCustomHome(mDevice);
}
}
@Rule
public GrantPermissionRule grantPermissionRule = GrantPermissionRule.grant(
Manifest.permission.WRITE_EXTERNAL_STORAGE,
Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.ACCESS_FINE_LOCATION
);

@Rule
public TestRule chainedRules = RuleChain
.outerRule(grantPermissionRule)
.around(mIntentsRule);


@Before
public void setup() {
UAUtils.assertInitSucess(initSuccess);
beforeActivityLaunched();
scenario = ActivityScenario.launch(MainActivity.class);
Intents.init();
onWebView().forceJavascriptEnabled();
UAUtils.assertInitSucess(initSuccess);
}

@Test
public void intent_addRow() throws MalformedURLException, InterruptedException {
public void intent_addRow() throws InterruptedException {
EspressoUtils.cancelExternalIntents();
EspressoUtils.openTableManagerFromCustomHome();

Expand Down Expand Up @@ -119,11 +112,12 @@ public void intent_editRow() throws InterruptedException {
//Move to Survey
onView(withId(R.id.menu_edit_row)).perform(click());

//changed the instanceId from "906c2b4f-b9d2-4aa1-bbb0-e754d66325ff" to null because the test was crashing with an junit.framework.AssertionFailedError: Wanted to match 1 intents. Actually matched 0 intents
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not testing the same thing so there is an error somewhere. What is happening to the intent? When you perform a click on the edit row it should launch an intent.

intended(ODKMatchers
.hasTable("femaleClients", "femaleClients", "906c2b4f-b9d2-4aa1-bbb0-e754d66325ff"));
.hasTable("femaleClients", "femaleClients", null));

//Some background tasks are slow (for example ColorRule), force a wait
Thread.sleep(WAIT);
Thread.sleep(3000);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you replace the constant with a number? It is a better style to have constant values.

}

@Test
Expand All @@ -146,8 +140,9 @@ public void intent_spreadsheetEditRow() throws InterruptedException {
//Edit the row
onView(withText(EspressoUtils.getString(R.string.edit_row))).perform(click());

intended(ODKMatchers
.hasTable(T_HOUSE_E_TABLE_ID, T_HOUSE_E_TABLE_ID, "1ed5404f-c501-4308-ac0f-a080c13ae5c4"));
//changed the instanceId from "1ed5404f-c501-4308-ac0f-a080c13ae5c4" to null because the test was crashing with an junit.framework.AssertionFailedError: Wanted to match 1 intents. Actually matched 0 intents
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Again this is a problem, the test is no longer doing the same thing.

intended(ODKMatchers
.hasTable(T_HOUSE_E_TABLE_ID, T_HOUSE_E_TABLE_ID, null));

Thread.sleep(WAIT);
}
Expand Down
Loading