chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

Add tests for search functionality in SFragment (#617)

Browse source 
* Add tests for search functionality in SFragment

* Parameterize url matching tests

* Clean up / compartmentalize search tests

* Make SFragmentTest filesystem location match package name
This commit is contained in:
Levi Bard 2018-05-02 22:43:12 +02:00 • committed by Ivan Kupalov
commit 0aeab2a983
2 changed files with 327 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

27
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View file

@ -266,7 +266,7 @@ public abstract class SFragment extends BaseFragment implements AdapterItemRemov
// https://pleroma.foo.bar/users/43456787654678
// https://pleroma.foo.bar/notice/43456787654678
// https://pleroma.foo.bar/objects/d4643c42-3ae0-4b73-b8b0-c725f5819207
private static boolean looksLikeMastodonUrl(String urlString) {
static boolean looksLikeMastodonUrl(String urlString) {
URI uri;
try {
uri = new URI(urlString);
@ -281,26 +281,27 @@ public abstract class SFragment extends BaseFragment implements AdapterItemRemov
}
String path = uri.getPath();
return path.matches("^/@[^/]*$") ||
return path.matches("^/@[^/]+$") ||
path.matches("^/users/[^/]+$") ||
path.matches("^/(@|notice)[^/]*/\\d+$") ||
path.matches("^/@[^/]+/\\d+$") ||
path.matches("^/notice/\\d+$") ||
path.matches("^/objects/[-a-f0-9]+$");
}
private void onBeginSearch(@NonNull String url) {
void onBeginSearch(@NonNull String url) {
searchUrl = url;
showQuerySheet();
}
private boolean getCancelSearchRequested(@NonNull String url) {
boolean getCancelSearchRequested(@NonNull String url) {
return !url.equals(searchUrl);
}
private boolean isSearching() {
boolean isSearching() {
return searchUrl != null;
}
private void onEndSearch(@NonNull String url) {
void onEndSearch(@NonNull String url) {
if (url.equals(searchUrl)) {
// Don't clear query if there's no match,
// since we might just now be getting the response for a canceled search
@ -309,16 +310,20 @@ public abstract class SFragment extends BaseFragment implements AdapterItemRemov
}
}
private void cancelActiveSearch()
void cancelActiveSearch()
{
if (isSearching()) {
onEndSearch(searchUrl);
}
}
void openLink(@NonNull String url) {
LinkHelper.openLink(url, getContext());
}
public void onViewURL(String url) {
if (!looksLikeMastodonUrl(url)) {
LinkHelper.openLink(url, getContext());
openLink(url);
return;
}
@ -346,14 +351,14 @@ public abstract class SFragment extends BaseFragment implements AdapterItemRemov
return;
}
}
LinkHelper.openLink(url, getContext());
openLink(url);
}
@Override
public void onFailure(@NonNull Call<SearchResults> call, @NonNull Throwable t) {
if (!getCancelSearchRequested(url)) {
onEndSearch(url);
LinkHelper.openLink(url, getContext());
openLink(url);
}
}
});