diff --git a/src/test/java/at/rtr/rmbt/TestConstants.java b/src/test/java/at/rtr/rmbt/TestConstants.java index 9056881..343ec2b 100644 --- a/src/test/java/at/rtr/rmbt/TestConstants.java +++ b/src/test/java/at/rtr/rmbt/TestConstants.java @@ -409,8 +409,8 @@ public interface TestConstants { String DEFAULT_FORMATTED_PING = "58"; String DEFAULT_FORMATTED_PING_SHORTEST = "58"; String DEFAULT_HISTORY_RESPONSE_ITEM_LOOP_UUID = "L2458713e-9362-11eb-a8b3-0242ac130003"; - String DEFAULT_TEST_HISTORY_FINAL_QUERY = "SELECT DISTINCT t.uuid, time, timezone, speed_upload, speed_download, ping_median, lte_rsrp, signal_strength, dual_sim, sim_count, network_type, nt.group_name network_type_group_name, l.loop_uuid loop_uuid, COALESCE(adm.fullname, t.model) model FROM test t LEFT JOIN device_map adm ON adm.codename=t.model LEFT JOIN network_type nt ON t.network_type=nt.uid LEFT JOIN test_loopmode l ON (l.test_uuid = t.uuid) WHERE t.deleted = false AND t.implausible = false AND t.status = 'FINISHED' AND client_id = 2 AND (COALESCE(adm.fullname, t.model) IN ('DEFAULT_DEVICE')) AND nt.group_name IN ('2G (GSM)') ORDER BY time DESC LIMIT 1 OFFSET 2"; - String DEFAULT_TEST_HISTORY_FINAL_QUERY_CLIENT_SYNCED = "SELECT DISTINCT t.uuid, time, timezone, speed_upload, speed_download, ping_median, lte_rsrp, signal_strength, dual_sim, sim_count, network_type, nt.group_name network_type_group_name, l.loop_uuid loop_uuid, COALESCE(adm.fullname, t.model) model FROM test t LEFT JOIN device_map adm ON adm.codename=t.model LEFT JOIN network_type nt ON t.network_type=nt.uid LEFT JOIN test_loopmode l ON (l.test_uuid = t.uuid) WHERE t.deleted = false AND t.implausible = false AND t.status = 'FINISHED' AND (t.client_id IN (SELECT 2 UNION SELECT uid FROM client WHERE sync_group_id = 5 )) AND (COALESCE(adm.fullname, t.model) IN ('DEFAULT_DEVICE')) AND nt.group_name IN ('2G (GSM)') ORDER BY time DESC LIMIT 1 OFFSET 2"; + String DEFAULT_TEST_HISTORY_FINAL_QUERY = "SELECT DISTINCT t.uuid, t.open_test_uuid, time, timezone, speed_upload, speed_download, ping_median, lte_rsrp, signal_strength, dual_sim, sim_count, network_type, nt.group_name network_type_group_name, l.loop_uuid loop_uuid, COALESCE(adm.fullname, t.model) model FROM test t LEFT JOIN device_map adm ON adm.codename=t.model LEFT JOIN network_type nt ON t.network_type=nt.uid LEFT JOIN test_loopmode l ON (l.test_uuid = t.uuid) WHERE t.deleted = false AND t.implausible = false AND t.status = 'FINISHED' AND client_id = 2 AND (COALESCE(adm.fullname, t.model) IN ('DEFAULT_DEVICE')) AND nt.group_name IN ('2G (GSM)') ORDER BY time DESC LIMIT 1 OFFSET 2"; + String DEFAULT_TEST_HISTORY_FINAL_QUERY_CLIENT_SYNCED = "SELECT DISTINCT t.uuid, t.open_test_uuid, time, timezone, speed_upload, speed_download, ping_median, lte_rsrp, signal_strength, dual_sim, sim_count, network_type, nt.group_name network_type_group_name, l.loop_uuid loop_uuid, COALESCE(adm.fullname, t.model) model FROM test t LEFT JOIN device_map adm ON adm.codename=t.model LEFT JOIN network_type nt ON t.network_type=nt.uid LEFT JOIN test_loopmode l ON (l.test_uuid = t.uuid) WHERE t.deleted = false AND t.implausible = false AND t.status = 'FINISHED' AND (t.client_id IN (SELECT 2 UNION SELECT uid FROM client WHERE sync_group_id = 5 )) AND (COALESCE(adm.fullname, t.model) IN ('DEFAULT_DEVICE')) AND nt.group_name IN ('2G (GSM)') ORDER BY time DESC LIMIT 1 OFFSET 2"; Integer DEFAULT_CLIENT_SYNC_GROUP_ID = 5; MeasurementType DEFAULT_MEASUREMENT_TYPE_FLAG = MeasurementType.REGULAR; String DEFAULT_SYNC_CODE = "DEFAULT_SYNC_CODE";