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

Chore: Moved riseup vpn to experimental suite and correct tests #625

Merged
merged 16 commits into from
Dec 5, 2023
Merged

Chore: Moved riseup vpn to experimental suite and correct tests #625

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
f0567b8
chore: use probe-cli v3.20.0-alpha
aanorbel Oct 11, 2023
4978665
Updated dependency
aanorbel Oct 12, 2023
5876adf
Merge branch 'master' of github.com:ooni/probe-android into issues/2524
aanorbel Oct 13, 2023
e8c97c7
Updated experimental tests and added `echeck` https://github.com/ooni…
aanorbel Oct 13, 2023
207e77d
Updates test runner to append error messages if morethan one is recie…
aanorbel Oct 16, 2023
4d4f686
Updates `Overviewactivity` copy for experimental tests.
aanorbel Oct 16, 2023
2295890
Updates experimental test suite
aanorbel Oct 17, 2023
5336624
Updated circumventiont suite test
aanorbel Oct 17, 2023
ef361e4
Feat: Add support for `http` and `https` proxies (#623)
aanorbel Oct 18, 2023
b8b5dd3
Updated engine version
aanorbel Oct 18, 2023
69cc503
Merge branch 'master' of github.com:ooni/probe-android into issues/2524
aanorbel Oct 18, 2023
0d4037d
Moved riseup vpn to experimental suite and correct tests
aanorbel Oct 20, 2023
2e55e0a
Merge branch 'master' of github.com:ooni/probe-android into chore/mov…
aanorbel Oct 20, 2023
11bad2b
updated riseupvpn test
aanorbel Nov 24, 2023
1a751d4
Updated overview activity copy for experimental
aanorbel Nov 24, 2023
8155de5
Updated comments on `riseupvpn` test
aanorbel Nov 29, 2023
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
1 change: 1 addition & 0 deletions app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public static Intent newIntent(Context context, AbstractSuite testSuite) {
String experimentalLinks =
"\n\n* [STUN Reachability](https://github.com/ooni/spec/blob/master/nettests/ts-025-stun-reachability.md)" +
"\n\n* [DNS Check](https://github.com/ooni/spec/blob/master/nettests/ts-028-dnscheck.md)" +
"\n\n* [RiseupVPN](https://ooni.org/nettest/riseupvpn/)" +
"\n\n* [ECH Check](https://github.com/ooni/spec/blob/master/nettests/ts-039-echcheck.md)" +
"\n\n* [Tor Snowflake](https://ooni.org/nettest/tor-snowflake/) "+ String.format(" ( %s )",getString(R.string.Settings_TestOptions_LongRunningTest))+
"\n\n* [Vanilla Tor](https://github.com/ooni/spec/blob/master/nettests/ts-016-vanilla-tor.md) " + String.format(" ( %s )",getString(R.string.Settings_TestOptions_LongRunningTest));
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/org/openobservatory/ooniprobe/test/suite/ExperimentalSuite.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ public AbstractTest[] getTestList(@Nullable PreferenceManager pm) {
if (pm == null || pm.isExperimentalOn()){
list.add(new Experimental("stunreachability"));
list.add(new Experimental("dnscheck"));
list.add(new Experimental("riseupvpn"));
list.add(new Experimental("echcheck"));
if ((pm == null || pm.isLongRunningTestsInForeground()) || getAutoRun()){
list.add(new Experimental("torsf"));
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/org/openobservatory/ooniprobe/test/test/RiseupVPN.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,13 @@
import org.openobservatory.ooniprobe.model.jsonresult.JsonResult;
import org.openobservatory.ooniprobe.model.settings.Settings;

@Deprecated
public class RiseupVPN extends AbstractTest {
public static final String NAME = "riseupvpn";

public RiseupVPN() {
super(NAME, R.string.Test_RiseupVPN_Fullname, R.drawable.test_riseupvpn, R.string.urlTestRvpn, 15);
// NOTE: this test has been demoted to experimental and such the icon resource `R.drawable.test_riseupvpn` is not displayed anymore.
aanorbel marked this conversation as resolved.
Show resolved Hide resolved
super(NAME, R.string.Test_Experimental_Fullname, 0, R.string.urlTestRvpn, 15);
}

@Override public void run(Context c, PreferenceManager pm, AppLogger logger, Gson gson, Result result, int index, AbstractTest.TestCallback testCallback) {
Expand Down
16 changes: 10 additions & 6 deletions app/src/test/java/org/openobservatory/ooniprobe/test/suite/ExperimentalSuiteTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,15 @@ public void getTestList_experimental_on() {

List<AbstractTest> tests = Arrays.asList(suite.getTestList(pm));

assertEquals(3, tests.size());
assertEquals(4, tests.size());
assertEquals(Experimental.class, tests.get(0).getClass());
assertEquals(Experimental.class, tests.get(1).getClass());
assertEquals(Experimental.class, tests.get(2).getClass());
assertEquals(Experimental.class, tests.get(3).getClass());
assertEquals("stunreachability", tests.get(0).getName());
assertEquals("dnscheck", tests.get(1).getName());
assertEquals("echcheck", tests.get(2).getName());
assertEquals("riseupvpn", tests.get(2).getName());
assertEquals("echcheck", tests.get(3).getName());
}

@Test
Expand All @@ -50,17 +52,19 @@ public void getTestList_experimental_on_autorun_on() {

List<AbstractTest> tests = Arrays.asList(autoRunSuite.getTestList(pm));

assertEquals(5, tests.size());
assertEquals(6, tests.size());
assertEquals(Experimental.class, tests.get(0).getClass());
assertEquals(Experimental.class, tests.get(1).getClass());
assertEquals(Experimental.class, tests.get(2).getClass());
assertEquals(Experimental.class, tests.get(3).getClass());
assertEquals(Experimental.class, tests.get(4).getClass());
assertEquals(Experimental.class, tests.get(5).getClass());

assertEquals("stunreachability", tests.get(0).getName());
assertEquals("dnscheck", tests.get(1).getName());
assertEquals("echcheck", tests.get(2).getName());
assertEquals("torsf", tests.get(3).getName());
assertEquals("vanilla_tor", tests.get(4).getName());
assertEquals("riseupvpn", tests.get(2).getName());
assertEquals("echcheck", tests.get(3).getName());
assertEquals("torsf", tests.get(4).getName());
assertEquals("vanilla_tor", tests.get(5).getName());
}
}
Loading