chore: add openvpn to experimental suite (#812)

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"/>
ooni · Aug 28, 2024 · f71f4df · f71f4df
1 parent 460c2af
commit f71f4df
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/MainActivityWebsitesTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/MainActivityWebsitesTest.java
@@ -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;

diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/RunningActivityTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/RunningActivityTest.java
@@ -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;

diff --git a/...rc/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/CircumventionTest.java b/...rc/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/CircumventionTest.java
@@ -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;

diff --git a/...androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/InstantMessagingTest.java b/...androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/InstantMessagingTest.java
@@ -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;

diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/PerformanceTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/PerformanceTest.java
@@ -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;

diff --git a/...idTest/java/org/openobservatory/ooniprobe/ui/resultdetails/TestResultsMainScreenTest.java b/...idTest/java/org/openobservatory/ooniprobe/ui/resultdetails/TestResultsMainScreenTest.java
@@ -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;

diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/WebsitesTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/WebsitesTest.java
@@ -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;

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java b/app/src/main/java/org/openobservatory/ooniprobe/activity/OverviewActivity.java
@@ -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))+

diff --git a/app/src/main/java/org/openobservatory/ooniprobe/test/suite/ExperimentalSuite.java b/app/src/main/java/org/openobservatory/ooniprobe/test/suite/ExperimentalSuite.java
@@ -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"));

diff --git a/app/src/test/java/org/openobservatory/ooniprobe/test/suite/ExperimentalSuiteTest.java b/app/src/test/java/org/openobservatory/ooniprobe/test/suite/ExperimentalSuiteTest.java
@@ -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());

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -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" }