From 108b886f43feeb861807deddfcb1ab241330e242 Mon Sep 17 00:00:00 2001 From: cyberta Date: Thu, 19 Jan 2023 18:47:14 +0100 Subject: improve screenshot tests, run in different languages, test more Fragments/Activities --- .../testutils/TestSetupHelper.java | 108 --------------------- 1 file changed, 108 deletions(-) delete mode 100644 app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java (limited to 'app/src/sharedTest/java/se.leap.bitmaskclient') diff --git a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java b/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java deleted file mode 100644 index 72791ba6..00000000 --- a/app/src/sharedTest/java/se.leap.bitmaskclient/testutils/TestSetupHelper.java +++ /dev/null @@ -1,108 +0,0 @@ -/** - * Copyright (c) 2018 LEAP Encryption Access Project and contributers - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package se.leap.bitmaskclient.testutils; - -import org.json.JSONException; -import org.json.JSONObject; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; - -import se.leap.bitmaskclient.base.models.Provider; - -/** - * Created by cyberta on 08.10.17. - */ - -public class TestSetupHelper { - - public static String getInputAsString(InputStream fileAsInputStream) throws IOException { - BufferedReader br = new BufferedReader(new InputStreamReader(fileAsInputStream)); - StringBuilder sb = new StringBuilder(); - String line = br.readLine(); - while (line != null) { - sb.append(line); - line = br.readLine(); - if (line != null) { - sb.append("\n"); - } - } - - return sb.toString(); - } - - - public static Provider getConfiguredProvider() throws IOException, JSONException { - return getProvider(null, null, null, null, null, null, null, null); - } - - public static Provider getConfiguredProviderAPIv4() { - return getProvider(null, null, null, null, null, "v4/riseup.net.json", "v4/riseup.service.json", null); - } - - - public static Provider getProvider(String domain, String geoipUrl, String providerIp, String providerApiIp, String caCertFile, String providerJson, String eipServiceJson, String geoIpJson) { - if (domain == null) - domain = "https://riseup.net"; - if (geoipUrl == null) - geoipUrl = "https://api.black.riseup.net:9001/json"; - if (providerIp == null) { - providerIp = ""; - } - if (providerApiIp == null) { - providerApiIp = ""; - } - if (caCertFile == null) - caCertFile = "riseup.net.pem"; - if (providerJson == null) - providerJson = "riseup.net.json"; - if (eipServiceJson == null) { - eipServiceJson = "riseup.service.json"; - } - if (geoIpJson == null) { - geoIpJson = "riseup.geoip.json"; - } - - try { - Provider p = new Provider( - domain, - geoipUrl, - null, - providerIp, - providerApiIp, - getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(caCertFile)), - getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(providerJson)) - - ); - JSONObject eipServiceJsonObject = new JSONObject( - getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(eipServiceJson))); - p.setEipServiceJson(eipServiceJsonObject); - - JSONObject geoIpJsonObject = new JSONObject( - getInputAsString(TestSetupHelper.class.getClassLoader().getResourceAsStream(geoIpJson))); - p.setGeoIpJson(geoIpJsonObject); - return p; - } catch (IOException | JSONException e) { - e.printStackTrace(); - } - return null; - } - -} -- cgit v1.2.3