x

ooni · Feb 7, 2024 · 33e163c · 33e163c
1 parent 92609ce
commit 33e163c
Show file tree

Hide file tree

Showing 34 changed files with 68 additions and 691 deletions.
diff --git a/internal/engine/experiment_integration_test.go b/internal/engine/experiment_integration_test.go
@@ -285,8 +285,9 @@ func runexperimentflow(t *testing.T, experiment model.Experiment, input string)
 	if experiment.KibiBytesReceived() <= 0 {
 		t.Fatal("no data received?!")
 	}
-	if _, err := experiment.GetSummaryKeys(measurement); err != nil {
-		t.Fatal(err)
+	sk := experiment.GetSummaryKeys(measurement)
+	if sk == nil {
+		t.Fatal("got nil summary keys")
 	}
 }
 

diff --git a/internal/experiment/dash/measurer_test.go b/internal/experiment/dash/measurer_test.go
@@ -105,22 +105,6 @@ func TestMeasureWithCancelledContext(t *testing.T) {
 	if !errors.Is(err, nil) {
 		t.Fatal("unexpected error value")
 	}
-	sk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, ok := sk.(SummaryKeys); !ok {
-		t.Fatal("invalid type for summary keys")
-	}
-}
-
-func TestSummaryKeysInvalidType(t *testing.T) {
-	measurement := new(model.Measurement)
-	m := &Measurer{}
-	_, err := m.GetSummaryKeys(measurement)
-	if err.Error() != "invalid test keys type" {
-		t.Fatal("not the error we expected")
-	}
 }
 
 func TestSummaryKeysGood(t *testing.T) {
@@ -129,12 +113,8 @@ func TestSummaryKeysGood(t *testing.T) {
 		MedianBitrate:   123,
 		MinPlayoutDelay: 12,
 	}}}
-	m := &Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(SummaryKeys)
+	osk := measurement.TestKeys.(*TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*SummaryKeys)
 	if sk.Latency != 1234 {
 		t.Fatal("invalid latency")
 	}
@@ -147,4 +127,7 @@ func TestSummaryKeysGood(t *testing.T) {
 	if sk.IsAnomaly {
 		t.Fatal("invalid isAnomaly")
 	}
+	if sk.Anomaly() != sk.IsAnomaly {
+		t.Fatal("sk.Anomaly() does not return sk.IsAnomaly's value")
+	}
 }
diff --git a/internal/experiment/dnscheck/dnscheck_test.go b/internal/experiment/dnscheck/dnscheck_test.go
@@ -109,13 +109,6 @@ func TestWithCancelledContext(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	sk, err := measurer.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, ok := sk.(SummaryKeys); !ok {
-		t.Fatal("invalid type for summary keys")
-	}
 }
 
 func TestMakeResolverURL(t *testing.T) {
@@ -179,19 +172,6 @@ func newsession() model.ExperimentSession {
 	return &mockable.Session{MockableLogger: log.Log}
 }
 
-func TestSummaryKeysGeneric(t *testing.T) {
-	measurement := &model.Measurement{TestKeys: &TestKeys{}}
-	m := &Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(SummaryKeys)
-	if sk.IsAnomaly {
-		t.Fatal("invalid isAnomaly")
-	}
-}
-
 func TestDNSCheckWait(t *testing.T) {
 	if testing.Short() {
 		t.Skip("skip test in short mode")

diff --git a/internal/experiment/dnsping/dnsping_test.go b/internal/experiment/dnsping/dnsping_test.go
@@ -112,7 +112,7 @@ func TestMeasurer_run(t *testing.T) {
 		)
 
 		env.Do(func() {
-			meas, m, err := runHelper("udp://8.8.8.8:53")
+			meas, _, err := runHelper("udp://8.8.8.8:53")
 			if err != nil {
 				t.Fatalf("Unexpected error: %s", err)
 			}
@@ -122,15 +122,6 @@ func TestMeasurer_run(t *testing.T) {
 				t.Fatal("unexpected number of pings", len(tk.Pings))
 			}
 
-			ask, err := m.GetSummaryKeys(meas)
-			if err != nil {
-				t.Fatal("cannot obtain summary")
-			}
-			summary := ask.(SummaryKeys)
-			if summary.IsAnomaly {
-				t.Fatal("expected no anomaly")
-			}
-
 			for _, p := range tk.Pings {
 				if p.Query == nil {
 					t.Fatal("QUery should not be nil")
@@ -170,7 +161,7 @@ func TestMeasurer_run(t *testing.T) {
 		})
 
 		env.Do(func() {
-			meas, m, err := runHelper("udp://8.8.8.8:53")
+			meas, _, err := runHelper("udp://8.8.8.8:53")
 			if err != nil {
 				t.Fatalf("Unexpected error: %s", err)
 			}
@@ -180,17 +171,6 @@ func TestMeasurer_run(t *testing.T) {
 				t.Fatal("unexpected number of pings", len(tk.Pings))
 			}
 
-			// note: this experiment does not set anomaly but we still want
-			// to have a test here for when we possibly will
-			ask, err := m.GetSummaryKeys(meas)
-			if err != nil {
-				t.Fatal("cannot obtain summary")
-			}
-			summary := ask.(SummaryKeys)
-			if summary.IsAnomaly {
-				t.Fatal("expected no anomaly")
-			}
-
 			for _, p := range tk.Pings {
 				if p.Query == nil {
 					t.Fatal("QUery should not be nil")

diff --git a/internal/experiment/echcheck/measure_test.go b/internal/experiment/echcheck/measure_test.go
@@ -113,13 +113,6 @@ func TestMeasurementSuccessRealWorld(t *testing.T) {
 	}
 
 	// check results
-	summary, err := measurer.GetSummaryKeys(&model.Measurement{})
-	if err != nil {
-		t.Fatal("unexpected error: ", err)
-	}
-	if summary.(SummaryKeys).IsAnomaly != false {
-		t.Fatal("expected false")
-	}
 	tk := msrmnt.TestKeys.(TestKeys)
 	if tk.Control.Failure != nil {
 		t.Fatal("unexpected control failure:", *tk.Control.Failure)

diff --git a/internal/experiment/example/example_test.go b/internal/experiment/example/example_test.go
@@ -35,13 +35,6 @@ func TestSuccess(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	sk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, ok := sk.(example.SummaryKeys); !ok {
-		t.Fatal("invalid type for summary keys")
-	}
 }
 
 func TestFailure(t *testing.T) {
@@ -62,16 +55,3 @@ func TestFailure(t *testing.T) {
 		t.Fatal("expected an error here")
 	}
 }
-
-func TestSummaryKeysGeneric(t *testing.T) {
-	measurement := &model.Measurement{TestKeys: &example.TestKeys{}}
-	m := &example.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(example.SummaryKeys)
-	if sk.IsAnomaly {
-		t.Fatal("invalid isAnomaly")
-	}
-}
diff --git a/internal/experiment/fbmessenger/fbmessenger_test.go b/internal/experiment/fbmessenger/fbmessenger_test.go
@@ -180,13 +180,6 @@ func TestMeasurerRun(t *testing.T) {
 			if diff := cmp.Diff(expectAnalysis, tk.Analysis); diff != "" {
 				t.Fatal(diff)
 			}
-			sk, err := measurer.GetSummaryKeys(measurement)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if _, ok := sk.(fbmessenger.SummaryKeys); !ok {
-				t.Fatal("invalid type for summary keys")
-			}
 		})
 	})
 
@@ -393,23 +386,10 @@ func TestComputeEndpointStatsDNSIsLying(t *testing.T) {
 	}
 }
 
-func TestSummaryKeysInvalidType(t *testing.T) {
-	measurement := new(model.Measurement)
-	m := &fbmessenger.Measurer{}
-	_, err := m.GetSummaryKeys(measurement)
-	if err.Error() != "invalid test keys type" {
-		t.Fatal("not the error we expected")
-	}
-}
-
 func TestSummaryKeysWithNils(t *testing.T) {
 	measurement := &model.Measurement{TestKeys: &fbmessenger.TestKeys{}}
-	m := &fbmessenger.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(fbmessenger.SummaryKeys)
+	osk := measurement.TestKeys.(*fbmessenger.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*fbmessenger.SummaryKeys)
 	if sk.DNSBlocking {
 		t.Fatal("invalid dnsBlocking")
 	}
@@ -428,12 +408,8 @@ func TestSummaryKeysWithFalseFalse(t *testing.T) {
 			FacebookDNSBlocking: &falseValue,
 		},
 	}}
-	m := &fbmessenger.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(fbmessenger.SummaryKeys)
+	osk := measurement.TestKeys.(*fbmessenger.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*fbmessenger.SummaryKeys)
 	if sk.DNSBlocking {
 		t.Fatal("invalid dnsBlocking")
 	}
@@ -452,12 +428,8 @@ func TestSummaryKeysWithFalseTrue(t *testing.T) {
 			FacebookDNSBlocking: &trueValue,
 		},
 	}}
-	m := &fbmessenger.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(fbmessenger.SummaryKeys)
+	osk := measurement.TestKeys.(*fbmessenger.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*fbmessenger.SummaryKeys)
 	if sk.DNSBlocking == false {
 		t.Fatal("invalid dnsBlocking")
 	}
@@ -476,12 +448,8 @@ func TestSummaryKeysWithTrueFalse(t *testing.T) {
 			FacebookDNSBlocking: &falseValue,
 		},
 	}}
-	m := &fbmessenger.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(fbmessenger.SummaryKeys)
+	osk := measurement.TestKeys.(*fbmessenger.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*fbmessenger.SummaryKeys)
 	if sk.DNSBlocking {
 		t.Fatal("invalid dnsBlocking")
 	}
@@ -500,12 +468,8 @@ func TestSummaryKeysWithTrueTrue(t *testing.T) {
 			FacebookDNSBlocking: &trueValue,
 		},
 	}}
-	m := &fbmessenger.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(fbmessenger.SummaryKeys)
+	osk := measurement.TestKeys.(*fbmessenger.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*fbmessenger.SummaryKeys)
 	if sk.DNSBlocking == false {
 		t.Fatal("invalid dnsBlocking")
 	}

diff --git a/internal/experiment/hhfm/hhfm_test.go b/internal/experiment/hhfm/hhfm_test.go
@@ -258,13 +258,6 @@ func TestCancelledContext(t *testing.T) {
 	if tk.Tampering.Total != true {
 		t.Fatal("invalid Tampering.Total")
 	}
-	sk, err := measurer.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, ok := sk.(hhfm.SummaryKeys); !ok {
-		t.Fatal("invalid type for summary keys")
-	}
 }
 
 func TestNoHelpers(t *testing.T) {
@@ -863,15 +856,6 @@ func TestDialerDialContext(t *testing.T) {
 	}
 }
 
-func TestSummaryKeysInvalidType(t *testing.T) {
-	measurement := new(model.Measurement)
-	m := &hhfm.Measurer{}
-	_, err := m.GetSummaryKeys(measurement)
-	if err.Error() != "invalid test keys type" {
-		t.Fatal("not the error we expected")
-	}
-}
-
 func TestSummaryKeysWorksAsIntended(t *testing.T) {
 	tests := []struct {
 		tampering hhfm.Tampering
@@ -900,16 +884,11 @@ func TestSummaryKeysWorksAsIntended(t *testing.T) {
 	}}
 	for idx, tt := range tests {
 		t.Run(fmt.Sprintf("%d", idx), func(t *testing.T) {
-			m := &hhfm.Measurer{}
 			measurement := &model.Measurement{TestKeys: &hhfm.TestKeys{
 				Tampering: tt.tampering,
 			}}
-			got, err := m.GetSummaryKeys(measurement)
-			if err != nil {
-				t.Fatal(err)
-				return
-			}
-			sk := got.(hhfm.SummaryKeys)
+			got := measurement.TestKeys.(*hhfm.TestKeys).MeasurementSummaryKeys()
+			sk := got.(*hhfm.SummaryKeys)
 			if sk.IsAnomaly != tt.isAnomaly {
 				t.Fatal("unexpected isAnomaly value")
 			}

diff --git a/internal/experiment/hirl/hirl_test.go b/internal/experiment/hirl/hirl_test.go
@@ -141,13 +141,6 @@ func TestCancelledContext(t *testing.T) {
 	if tk.Tampering != false {
 		t.Fatal("overall there is tampering?!")
 	}
-	sk, err := measurer.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, ok := sk.(hirl.SummaryKeys); !ok {
-		t.Fatal("invalid type for summary keys")
-	}
 }
 
 type FakeMethodSuccessful struct{}
@@ -602,25 +595,12 @@ func TestRunMethodReadEOFWithWrongData(t *testing.T) {
 	}
 }
 
-func TestSummaryKeysInvalidType(t *testing.T) {
-	measurement := new(model.Measurement)
-	m := &hirl.Measurer{}
-	_, err := m.GetSummaryKeys(measurement)
-	if err.Error() != "invalid test keys type" {
-		t.Fatal("not the error we expected")
-	}
-}
-
 func TestSummaryKeysFalse(t *testing.T) {
 	measurement := &model.Measurement{TestKeys: &hirl.TestKeys{
 		Tampering: false,
 	}}
-	m := &hirl.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(hirl.SummaryKeys)
+	osk := measurement.TestKeys.(*hirl.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*hirl.SummaryKeys)
 	if sk.IsAnomaly {
 		t.Fatal("invalid isAnomaly")
 	}
@@ -630,12 +610,8 @@ func TestSummaryKeysTrue(t *testing.T) {
 	measurement := &model.Measurement{TestKeys: &hirl.TestKeys{
 		Tampering: true,
 	}}
-	m := &hirl.Measurer{}
-	osk, err := m.GetSummaryKeys(measurement)
-	if err != nil {
-		t.Fatal(err)
-	}
-	sk := osk.(hirl.SummaryKeys)
+	osk := measurement.TestKeys.(*hirl.TestKeys).MeasurementSummaryKeys()
+	sk := osk.(*hirl.SummaryKeys)
 	if sk.IsAnomaly == false {
 		t.Fatal("invalid isAnomaly")
 	}