adblockplussbrowser/src/test/java/org/adblockplus/sbrowser/contentblocker/engine/UtilsTest.kt - Issue 29757571: Issue 6591 - Bundle ABP for Samsung Internet China with Easylist for China

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Unified Diff: adblockplussbrowser/src/test/java/org/adblockplus/sbrowser/contentblocker/engine/UtilsTest.kt

Issue 29757571: Issue 6591 - Bundle ABP for Samsung Internet China with Easylist for China (Closed)

Patch Set: Adjustments regarding Anton's comments Created April 20, 2018, 3:13 p.m.

Use n/p to move between diff chunks; N/P to move between comments.

Jump to:

Index: adblockplussbrowser/src/test/java/org/adblockplus/sbrowser/contentblocker/engine/UtilsTest.kt

===================================================================

--- a/adblockplussbrowser/src/test/java/org/adblockplus/sbrowser/contentblocker/engine/UtilsTest.kt

+++ b/adblockplussbrowser/src/test/java/org/adblockplus/sbrowser/contentblocker/engine/UtilsTest.kt

@@ -54,7 +54,7 @@

fun subscriptionUtilsChooseDefaultSubscriptionForEmptyList()

{

assertEquals(SubscriptionUtils.chooseDefaultSubscriptionUrl(

- emptyList<DefaultSubscriptionInfo>()), Engine.EASYLIST_URL)

+ emptyList<DefaultSubscriptionInfo>()), SubscriptionUtils.EASYLIST_URL)

}

@Test

@@ -62,7 +62,7 @@

{

Resources.getSystem().configuration.setLocale(Locale.CHINA)

assertNotEquals(SubscriptionUtils.chooseDefaultSubscriptionUrl(

- mockedDefaultSubs?.adsSubscriptions), Engine.EASYLIST_URL)

+ mockedDefaultSubs?.adsSubscriptions), SubscriptionUtils.EASYLIST_URL)

}

@Test

@@ -78,7 +78,7 @@

{

Resources.getSystem().configuration.setLocale(Locale.forLanguageTag("ab-xy"))

assertEquals(SubscriptionUtils.chooseDefaultSubscriptionUrl(

- mockedDefaultSubs?.adsSubscriptions), Engine.EASYLIST_URL)

+ mockedDefaultSubs?.adsSubscriptions), SubscriptionUtils.EASYLIST_URL)

}

@Test