Skip to content

Commit

Permalink
chore: add openvpn to experimental suite (#812)
Browse files Browse the repository at this point in the history
Fixes  ooni/probe#2795

## Proposed Changes

  - Add OpenVPN to experimental tests/
  - Update tests to reflect change in experimental test.

<img width="300"
src="https://github.com/user-attachments/assets/1ed11f20-f2f3-47e2-9d95-5e59a9581c7c"/>
aanorbel authored Aug 28, 2024
1 parent 460c2af commit f71f4df
Showing 11 changed files with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@
import androidx.test.espresso.matcher.ViewMatchers;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.Rule;
import org.junit.Test;
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@
import androidx.test.ext.junit.runners.AndroidJUnit4;
import androidx.test.rule.ServiceTestRule;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.After;
import org.junit.Rule;
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.Rule;
import org.junit.Test;
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.Rule;
import org.junit.Test;
Original file line number Diff line number Diff line change
@@ -15,8 +15,8 @@
import androidx.test.espresso.assertion.ViewAssertions;
import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.Rule;
import org.junit.Test;
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.Rule;
import org.junit.Test;
Original file line number Diff line number Diff line change
@@ -2,8 +2,8 @@

import androidx.test.ext.junit.runners.AndroidJUnit4;

import com.schibsted.spain.barista.rule.flaky.AllowFlaky;
import com.schibsted.spain.barista.rule.flaky.FlakyTestRule;
import com.adevinta.android.barista.rule.flaky.AllowFlaky;
import com.adevinta.android.barista.rule.flaky.FlakyTestRule;

import org.junit.Ignore;
import org.junit.Rule;
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ public static Intent newIntent(Context context, AbstractSuite testSuite) {
if (testSuite.getName().equals(ExperimentalSuite.NAME)) {
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* [OpenVPN](https://github.com/ooni/spec/blob/master/nettests/ts-040-openvpn.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))+
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ public AbstractTest[] getTestList(@Nullable PreferenceManager pm) {
ArrayList<AbstractTest> list = new ArrayList<>();
if (pm == null || pm.isExperimentalOn()){
list.add(new Experimental("stunreachability"));
list.add(new Experimental("dnscheck"));
list.add(new Experimental("openvpn"));
list.add(new Experimental("echcheck"));
if ((pm == null || pm.isLongRunningTestsInForeground()) || getAutoRun()){
list.add(new Experimental("torsf"));
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ public void getTestList_experimental_on() {
assertEquals(Experimental.class, tests.get(1).getClass());
assertEquals(Experimental.class, tests.get(2).getClass());
assertEquals("stunreachability", tests.get(0).getName());
assertEquals("dnscheck", tests.get(1).getName());
assertEquals("openvpn", tests.get(1).getName());
assertEquals("echcheck", tests.get(2).getName());
}

@@ -58,7 +58,7 @@ public void getTestList_experimental_on_autorun_on() {
assertEquals(Experimental.class, tests.get(4).getClass());

assertEquals("stunreachability", tests.get(0).getName());
assertEquals("dnscheck", tests.get(1).getName());
assertEquals("openvpn", tests.get(1).getName());
assertEquals("echcheck", tests.get(2).getName());
assertEquals("torsf", tests.get(3).getName());
assertEquals("vanilla_tor", tests.get(4).getName());
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[versions]
androidGradlePlugin = "8.5.1"
barista = "3.9.0"
barista = "4.0.0"
countlySdk = "24.7.0"
desugar_jdk_libs_nio = "2.0.4"
faker = "2.0.4"
@@ -54,7 +54,7 @@ gms-googleServices = "4.4.1"
[libraries]
# Dependencies of the included build-logic
android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
barista = { module = "com.schibsted.spain:barista", version.ref = "barista" }
barista = { module = "com.adevinta.android:barista", version.ref = "barista" }
countly-sdk = { module = "ly.count.android:sdk", version.ref = "countlySdk" }
desugar_jdk_libs_nio = { module = "com.android.tools:desugar_jdk_libs_nio", version.ref = "desugar_jdk_libs_nio" }
faker = { module = "com.github.blocoio:faker", version.ref = "faker" }

0 comments on commit f71f4df

Please sign in to comment.