Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

convert android tests to junit tests

Browse source
This commit is contained in:
Christian Schabesberger 2017-02-16 00:17:43 +01:00
parent a5252bb765
commit 477f182b43
12 changed files with 128 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/src/main/AndroidManifest.xml
View file

@ -170,11 +170,7 @@
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths"/>
</provider><!-- ATTENTION: This was auto-generated to add Google Play services to your project for
App Indexing. See https://g.co/AppIndexing/AndroidStudio for more information. -->
<meta-data
android:name="com.google.android.gms.version"
android:value="@integer/google_play_services_version" />
</provider>
</application>
</manifest>

2
app/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java
View file

@ -29,7 +29,7 @@ import java.util.EnumSet;
public abstract class SearchEngine {
public enum Filter {
VIDEO, CHANNEL, PLAY_LIST
STREAM, CHANNEL, PLAY_LIST
}
public static class NothingFoundException extends ExtractionException {

4
app/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java
View file

@ -58,9 +58,9 @@ public class YoutubeSearchEngine extends SearchEngine {
String url = "https://www.youtube.com/results"
+ "?q=" + URLEncoder.encode(query, CHARSET_UTF_8)
+ "&page=" + Integer.toString(page + 1);
if(filter.contains(Filter.VIDEO) && !filter.contains(Filter.CHANNEL)) {
if(filter.contains(Filter.STREAM) && !filter.contains(Filter.CHANNEL)) {
url += "&sp=EgIQAQ%253D%253D";
} else if(!filter.contains(Filter.VIDEO) && filter.contains(Filter.CHANNEL)) {
} else if(!filter.contains(Filter.STREAM) && filter.contains(Filter.CHANNEL)) {
url += "&sp=EgIQAg%253D%253D";
}

6
app/src/main/java/org/schabi/newpipe/search_fragment/SearchInfoItemFragment.java
View file

@ -61,7 +61,7 @@ public class SearchInfoItemFragment extends Fragment {
private static final String TAG = SearchInfoItemFragment.class.toString();
private EnumSet<SearchEngine.Filter> filter =
EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.VIDEO);
EnumSet.of(SearchEngine.Filter.CHANNEL, SearchEngine.Filter.STREAM);
/**
* Listener for search queries
@ -300,10 +300,10 @@ public class SearchInfoItemFragment extends Fragment {
public boolean onOptionsItemSelected(MenuItem item) {
switch(item.getItemId()) {
case R.id.menu_filter_all:
changeFilter(item, EnumSet.of(SearchEngine.Filter.VIDEO, SearchEngine.Filter.CHANNEL));
changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM, SearchEngine.Filter.CHANNEL));
return true;
case R.id.menu_filter_video:
changeFilter(item, EnumSet.of(SearchEngine.Filter.VIDEO));
changeFilter(item, EnumSet.of(SearchEngine.Filter.STREAM));
return true;
case R.id.menu_filter_channel:
changeFilter(item, EnumSet.of(SearchEngine.Filter.CHANNEL));