From ccdff3ba247de2ac4b6178fe21aec20e0581d2af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arturo=20Filast=C3=B2?= <arturo@filasto.net>
Date: Mon, 2 Dec 2019 17:59:37 +0200
Subject: [PATCH] Move IM tests into top level tree too

---
 nettests/{im => }/facebook_messenger.go |  8 ++------
 nettests/nettests_test.go               | 10 ++--------
 nettests/{im => }/telegram.go           |  8 ++------
 nettests/{im => }/whatsapp.go           |  8 ++------
 4 files changed, 8 insertions(+), 26 deletions(-)
 rename nettests/{im => }/facebook_messenger.go (90%)
 rename nettests/{im => }/telegram.go (92%)
 rename nettests/{im => }/whatsapp.go (93%)

diff --git a/nettests/im/facebook_messenger.go b/nettests/facebook_messenger.go
similarity index 90%
rename from nettests/im/facebook_messenger.go
rename to nettests/facebook_messenger.go
index 02c8b84..7e8067c 100644
--- a/nettests/im/facebook_messenger.go
+++ b/nettests/facebook_messenger.go
@@ -1,15 +1,11 @@
-package im
-
-import (
-	"github.com/ooni/probe-cli/nettests"
-)
+package nettests
 
 // FacebookMessenger test implementation
 type FacebookMessenger struct {
 }
 
 // Run starts the test
-func (h FacebookMessenger) Run(ctl *nettests.Controller) error {
+func (h FacebookMessenger) Run(ctl *Controller) error {
 	builder, err := ctl.Ctx.Session.NewExperimentBuilder(
 		"facebook_messenger",
 	)
diff --git a/nettests/nettests_test.go b/nettests/nettests_test.go
index df10cb6..364bf6b 100644
--- a/nettests/nettests_test.go
+++ b/nettests/nettests_test.go
@@ -36,17 +36,11 @@ func TestRun(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	res, err := database.CreateResult(ctx.DB, ctx.Home, tg, network.ID)
-	if err != nil {
-		t.Fatal(err)
-	}
-	builder, err := ctl.Ctx.Session.NewExperimentBuilder(
-		"telegram",
-	)
+	res, err := database.CreateResult(ctx.DB, ctx.Home, "im", network.ID)
 	if err != nil {
 		t.Fatal(err)
 	}
+	nt := Telegram{}
 	ctl := NewController(nt, ctx, res)
-	ctl.Run(builder, []string{""})
 	nt.Run(ctl)
 }
diff --git a/nettests/im/telegram.go b/nettests/telegram.go
similarity index 92%
rename from nettests/im/telegram.go
rename to nettests/telegram.go
index ed91e00..3601066 100644
--- a/nettests/im/telegram.go
+++ b/nettests/telegram.go
@@ -1,15 +1,11 @@
-package im
-
-import (
-	"github.com/ooni/probe-cli/nettests"
-)
+package nettests
 
 // Telegram test implementation
 type Telegram struct {
 }
 
 // Run starts the test
-func (h Telegram) Run(ctl *nettests.Controller) error {
+func (h Telegram) Run(ctl *Controller) error {
 	builder, err := ctl.Ctx.Session.NewExperimentBuilder(
 		"telegram",
 	)
diff --git a/nettests/im/whatsapp.go b/nettests/whatsapp.go
similarity index 93%
rename from nettests/im/whatsapp.go
rename to nettests/whatsapp.go
index c5ee86f..57a1aca 100644
--- a/nettests/im/whatsapp.go
+++ b/nettests/whatsapp.go
@@ -1,15 +1,11 @@
-package im
-
-import (
-	"github.com/ooni/probe-cli/nettests"
-)
+package nettests
 
 // WhatsApp test implementation
 type WhatsApp struct {
 }
 
 // Run starts the test
-func (h WhatsApp) Run(ctl *nettests.Controller) error {
+func (h WhatsApp) Run(ctl *Controller) error {
 	builder, err := ctl.Ctx.Session.NewExperimentBuilder(
 		"whatsapp",
 	)