Satisfied constructor dependency for testsuites in test package

ooni · Aug 5, 2023 · e4989af · e4989af
1 parent 8c13a21
commit e4989af
Show file tree

Hide file tree

Showing 13 changed files with 131 additions and 74 deletions.
diff --git a/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/RunningActivityTest.java b/app/src/androidTest/java/org/openobservatory/ooniprobe/ui/RunningActivityTest.java
@@ -1,6 +1,7 @@
 package org.openobservatory.ooniprobe.ui;
 
 import android.content.Intent;
+import android.content.res.Resources;
 
 import androidx.test.core.app.ActivityScenario;
 import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -15,6 +16,7 @@
 import org.junit.rules.RuleChain;
 import org.junit.runner.RunWith;
 import org.openobservatory.ooniprobe.AbstractTest;
+import org.openobservatory.ooniprobe.TestApplicationProvider;
 import org.openobservatory.ooniprobe.activity.MainActivity;
 import org.openobservatory.ooniprobe.activity.RunningActivity;
 import org.openobservatory.ooniprobe.common.service.RunTestService;
@@ -45,6 +47,8 @@ public class RunningActivityTest extends AbstractTest {
     public RuleChain chain = RuleChain.outerRule(flakyRule)
             .around(serviceRule);
 
+    Resources resources = TestApplicationProvider.app().getResources();
+
     @Override
     public void before() {
         super.before();
@@ -87,7 +91,7 @@ private void startRunTestService() {
             serviceRule.startService(
                     new Intent(c, RunTestService.class)
                             .putExtra("testSuites", new ArrayList<AbstractSuite>() {{
-                                add(new InstantMessagingSuite());
+                                add(new InstantMessagingSuite(resources));
                             }})
             );
         } catch (TimeoutException e) {

diff --git a/...rc/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/CircumventionTest.java b/...rc/androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/CircumventionTest.java
@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openobservatory.ooniprobe.R;
+import org.openobservatory.ooniprobe.TestApplicationProvider;
 import org.openobservatory.ooniprobe.factory.ResultFactory;
 import org.openobservatory.ooniprobe.model.database.Measurement;
 import org.openobservatory.ooniprobe.model.database.Result;
@@ -22,17 +23,20 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
+import android.content.res.Resources;
+
 @RunWith(AndroidJUnit4.class)
 public class CircumventionTest extends MeasurementAbstractTest {
 
     @Rule
     public FlakyTestRule flakyRule = new FlakyTestRule();
+    Resources resources = TestApplicationProvider.app().getResources();
 
     @Test
     @AllowFlaky(attempts = 3)
     public void testHeaderData() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 3, 0);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 3, 0);
 
         // Act
         launchDetails(testResult.id);
@@ -44,7 +48,7 @@ public void testHeaderData() {
     @Test
     public void testSuccessPsiphon() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 3, 0);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 3, 0);
         Measurement measurement = testResult.getMeasurement("psiphon");
         String formattedBootstrap = FormattingUtils.formatBootstrap(measurement.getTestKeys().bootstrap_time);
 
@@ -61,7 +65,7 @@ public void testSuccessPsiphon() {
     @Test
     public void testBlockedPsiphon() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 0, 3);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 0, 3);
         Measurement measurement = testResult.getMeasurement("psiphon");
 
         // Act
@@ -77,7 +81,7 @@ public void testBlockedPsiphon() {
     @Test
     public void testSuccessTor() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 3, 0);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 3, 0);
         Measurement measurement = testResult.getMeasurement("tor");
 
         String formattedBridges = FormattingUtils.getFormattedBridges(measurement);
@@ -97,7 +101,7 @@ public void testSuccessTor() {
     @Test
     public void testBlockedTor() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 0, 3);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 0, 3);
         Measurement measurement = testResult.getMeasurement("tor");
 
         String formattedBridges = FormattingUtils.getFormattedBridges(measurement);
@@ -117,7 +121,7 @@ public void testBlockedTor() {
     @Test
     public void testSuccessfulRiseUpVPN() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 3, 0);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 3, 0);
         Measurement measurement = testResult.getMeasurement("riseupvpn");
 
         // Act
@@ -135,7 +139,7 @@ public void testSuccessfulRiseUpVPN() {
     @Test
     public void testBlockedRiseUpVPN() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(), 0, 3);
+        Result testResult = ResultFactory.createAndSave(new CircumventionSuite(resources), 0, 3);
         Measurement measurement = testResult.getMeasurement("riseupvpn");
 
         // Act

diff --git a/...androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/InstantMessagingTest.java b/...androidTest/java/org/openobservatory/ooniprobe/ui/resultdetails/InstantMessagingTest.java
@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openobservatory.ooniprobe.R;
+import org.openobservatory.ooniprobe.TestApplicationProvider;
 import org.openobservatory.ooniprobe.factory.ResultFactory;
 import org.openobservatory.ooniprobe.model.database.Result;
 import org.openobservatory.ooniprobe.test.suite.InstantMessagingSuite;
@@ -20,17 +21,20 @@
 import static androidx.test.espresso.matcher.ViewMatchers.withId;
 import static androidx.test.espresso.matcher.ViewMatchers.withText;
 
+import android.content.res.Resources;
+
 @RunWith(AndroidJUnit4.class)
 public class InstantMessagingTest extends MeasurementAbstractTest {
 
     @Rule
     public FlakyTestRule flakyRule = new FlakyTestRule();
+    Resources resources = TestApplicationProvider.app().getResources();
 
     @Test
     @AllowFlaky(attempts = 3)
     public void testHeaderData() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite());
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources));
 
         // Act
         launchDetails(testResult.id);
@@ -43,7 +47,7 @@ public void testHeaderData() {
     @AllowFlaky(attempts = 2)
     public void testSuccessWhatsApp() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite());
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources));
 
         // Act
         launchDetails(testResult.id);
@@ -57,7 +61,7 @@ public void testSuccessWhatsApp() {
     @Test
     public void testBlockedWhatsApp() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(), 0, 4);
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources), 0, 4);
 
         // Act
         launchDetails(testResult.id);
@@ -72,7 +76,7 @@ public void testBlockedWhatsApp() {
     @Test
     public void testSuccessTelegram() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite());
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources));
 
         // Act
         launchDetails(testResult.id);
@@ -87,7 +91,7 @@ public void testSuccessTelegram() {
     @Test
     public void testBlockedTelegram() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(), 0, 4);
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources), 0, 4);
 
         // Act
         launchDetails(testResult.id);
@@ -102,7 +106,7 @@ public void testBlockedTelegram() {
     @Test
     public void testSuccessFacebookMessenger() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite());
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources));
 
         // Act
         launchDetails(testResult.id);
@@ -117,7 +121,7 @@ public void testSuccessFacebookMessenger() {
     @Test
     public void testBlockedFacebookMessenger() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(), 0, 4);
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources), 0, 4);
 
         // Act
         launchDetails(testResult.id);
@@ -132,7 +136,7 @@ public void testBlockedFacebookMessenger() {
     @Test
     public void testSuccessSignal() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite());
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources));
 
         // Act
         launchDetails(testResult.id);
@@ -146,7 +150,7 @@ public void testSuccessSignal() {
     @Test
     public void testBlockedSignal() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(), 0, 4);
+        Result testResult = ResultFactory.createAndSave(new InstantMessagingSuite(resources), 0, 4);
 
         // Act
         launchDetails(testResult.id);

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
@@ -9,6 +9,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.openobservatory.ooniprobe.R;
+import org.openobservatory.ooniprobe.TestApplicationProvider;
 import org.openobservatory.ooniprobe.factory.ResultFactory;
 import org.openobservatory.ooniprobe.model.database.Measurement;
 import org.openobservatory.ooniprobe.model.database.Result;
@@ -33,17 +34,20 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.openobservatory.ooniprobe.ui.utils.RecyclerViewMatcher.withRecyclerView;
 
+import android.content.res.Resources;
+
 @RunWith(AndroidJUnit4.class)
 public class PerformanceTest extends MeasurementAbstractTest {
 
     @Rule
     public FlakyTestRule flakyRule = new FlakyTestRule();
+    Resources resources = TestApplicationProvider.app().getResources();
 
     @Test
     @AllowFlaky(attempts = 3)
     public void testHeaderData() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite());
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources));
         Measurement dashMeasurement = testResult.getMeasurement(Dash.NAME);
         String videoQuality = getResourceString(dashMeasurement.getTestKeys().getVideoQuality(false));
 
@@ -90,7 +94,7 @@ public void testHeaderData() {
     @Test
     public void testListOfMeasurements() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite());
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources));
         Measurement dashMeasurement = testResult.getMeasurement(Dash.NAME);
         String videoQuality = getResourceString(dashMeasurement.getTestKeys().getVideoQuality(true));
         String notDetected = getResourceString(R.string.TestResults_Overview_MiddleBoxes_NotFound);
@@ -147,7 +151,7 @@ public void testListOfMeasurements() {
     @Test
     public void testNDT() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite());
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources));
         Measurement ndtMeasurement = testResult.getMeasurement(Ndt.NAME);
         Integer ndtProtocol = ndtMeasurement.getTestKeys().protocol;
         TestKeys.Summary ndtSummary = ndtMeasurement.getTestKeys().summary;
@@ -193,7 +197,7 @@ public void testNDT() {
     @Test
     public void testStreaming() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite());
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources));
         Measurement dashMeasurement = testResult.getMeasurement(Dash.NAME);
         String videoQuality = getResourceString(dashMeasurement.getTestKeys().getVideoQuality(true));
         String bitrateUnit = getResourceString(dashMeasurement.getTestKeys().getMedianBitrateUnit());
@@ -214,7 +218,7 @@ public void testStreaming() {
     @Test
     public void testRequestLine() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite());
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources));
         Measurement invalidRequest = testResult.getMeasurement(HttpInvalidRequestLine.NAME);
 
         // Act
@@ -229,7 +233,7 @@ public void testRequestLine() {
     @Test
     public void testRequestLineDetection() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(), 2, 2);
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources), 2, 2);
         Measurement invalidRequest = testResult.getMeasurement(HttpInvalidRequestLine.NAME);
 
         // Act
@@ -244,7 +248,7 @@ public void testRequestLineDetection() {
     @Test
     public void testFieldManipulation() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite());
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources));
         Measurement fieldManipulation = testResult.getMeasurement(HttpHeaderFieldManipulation.NAME);
 
         // Act
@@ -259,7 +263,7 @@ public void testFieldManipulation() {
     @Test
     public void testFieldManipulationDetection() {
         // Arrange
-        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(), 2, 2);
+        Result testResult = ResultFactory.createAndSave(new PerformanceSuite(resources), 2, 2);
         Measurement fieldManipulation = testResult.getMeasurement(HttpHeaderFieldManipulation.NAME);
 
         // Act