refactor(dnsx): group tests together (#516)

Part of https://github.com/ooni/probe/issues/1591
2021-09-28 11:26:16 +02:00 · 2021-09-28 11:26:16 +02:00 · de130d249c
commit de130d249c
parent 12cf4b9990
7 changed files with 963 additions and 941 deletions
--- a/internal/netxlite/dnsx/dnsoverudp_test.go
+++ b/internal/netxlite/dnsx/dnsoverudp_test.go
@ -11,147 +11,151 @@ import (
 	"github.com/ooni/probe-cli/v3/internal/netxlite/mocks"
 )

-func TestDNSOverUDPDialFailure(t *testing.T) {
-	mocked := errors.New("mocked error")
-	const address = "9.9.9.9:53"
-	txp := NewDNSOverUDP(&mocks.Dialer{
-		MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-			return nil, mocked
-		},
-	}, address)
-	data, err := txp.RoundTrip(context.Background(), nil)
-	if !errors.Is(err, mocked) {
-		t.Fatal("not the error we expected")
-	}
-	if data != nil {
-		t.Fatal("expected no response here")
-	}
-}
+func TestDNSOverUDP(t *testing.T) {
+	t.Run("RoundTrip", func(t *testing.T) {
+		t.Run("dial failure", func(t *testing.T) {
+			mocked := errors.New("mocked error")
+			const address = "9.9.9.9:53"
+			txp := NewDNSOverUDP(&mocks.Dialer{
+				MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+					return nil, mocked
+				},
+			}, address)
+			data, err := txp.RoundTrip(context.Background(), nil)
+			if !errors.Is(err, mocked) {
+				t.Fatal("not the error we expected")
+			}
+			if data != nil {
+				t.Fatal("expected no response here")
+			}
+		})

-func TestDNSOverUDPSetDeadlineError(t *testing.T) {
-	mocked := errors.New("mocked error")
-	txp := NewDNSOverUDP(
-		&mocks.Dialer{
-			MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-				return &mocks.Conn{
-					MockSetDeadline: func(t time.Time) error {
-						return mocked
+		t.Run("SetDeadline failure", func(t *testing.T) {
+			mocked := errors.New("mocked error")
+			txp := NewDNSOverUDP(
+				&mocks.Dialer{
+					MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+						return &mocks.Conn{
+							MockSetDeadline: func(t time.Time) error {
+								return mocked
+							},
+							MockClose: func() error {
+								return nil
+							},
+						}, nil
 					},
-					MockClose: func() error {
-						return nil
-					},
-				}, nil
-			},
-		}, "9.9.9.9:53",
-	)
-	data, err := txp.RoundTrip(context.Background(), nil)
-	if !errors.Is(err, mocked) {
-		t.Fatal("not the error we expected")
-	}
-	if data != nil {
-		t.Fatal("expected no response here")
-	}
-}
+				}, "9.9.9.9:53",
+			)
+			data, err := txp.RoundTrip(context.Background(), nil)
+			if !errors.Is(err, mocked) {
+				t.Fatal("not the error we expected")
+			}
+			if data != nil {
+				t.Fatal("expected no response here")
+			}
+		})

-func TestDNSOverUDPWriteFailure(t *testing.T) {
-	mocked := errors.New("mocked error")
-	txp := NewDNSOverUDP(
-		&mocks.Dialer{
-			MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-				return &mocks.Conn{
-					MockSetDeadline: func(t time.Time) error {
-						return nil
+		t.Run("Write failure", func(t *testing.T) {
+			mocked := errors.New("mocked error")
+			txp := NewDNSOverUDP(
+				&mocks.Dialer{
+					MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+						return &mocks.Conn{
+							MockSetDeadline: func(t time.Time) error {
+								return nil
+							},
+							MockWrite: func(b []byte) (int, error) {
+								return 0, mocked
+							},
+							MockClose: func() error {
+								return nil
+							},
+						}, nil
 					},
-					MockWrite: func(b []byte) (int, error) {
-						return 0, mocked
-					},
-					MockClose: func() error {
-						return nil
-					},
-				}, nil
-			},
-		}, "9.9.9.9:53",
-	)
-	data, err := txp.RoundTrip(context.Background(), nil)
-	if !errors.Is(err, mocked) {
-		t.Fatal("not the error we expected")
-	}
-	if data != nil {
-		t.Fatal("expected no response here")
-	}
-}
+				}, "9.9.9.9:53",
+			)
+			data, err := txp.RoundTrip(context.Background(), nil)
+			if !errors.Is(err, mocked) {
+				t.Fatal("not the error we expected")
+			}
+			if data != nil {
+				t.Fatal("expected no response here")
+			}
+		})

-func TestDNSOverUDPReadFailure(t *testing.T) {
-	mocked := errors.New("mocked error")
-	txp := NewDNSOverUDP(
-		&mocks.Dialer{
-			MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-				return &mocks.Conn{
-					MockSetDeadline: func(t time.Time) error {
-						return nil
+		t.Run("Read failure", func(t *testing.T) {
+			mocked := errors.New("mocked error")
+			txp := NewDNSOverUDP(
+				&mocks.Dialer{
+					MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+						return &mocks.Conn{
+							MockSetDeadline: func(t time.Time) error {
+								return nil
+							},
+							MockWrite: func(b []byte) (int, error) {
+								return len(b), nil
+							},
+							MockRead: func(b []byte) (int, error) {
+								return 0, mocked
+							},
+							MockClose: func() error {
+								return nil
+							},
+						}, nil
 					},
-					MockWrite: func(b []byte) (int, error) {
-						return len(b), nil
-					},
-					MockRead: func(b []byte) (int, error) {
-						return 0, mocked
-					},
-					MockClose: func() error {
-						return nil
-					},
-				}, nil
-			},
-		}, "9.9.9.9:53",
-	)
-	data, err := txp.RoundTrip(context.Background(), nil)
-	if !errors.Is(err, mocked) {
-		t.Fatal("not the error we expected")
-	}
-	if data != nil {
-		t.Fatal("expected no response here")
-	}
-}
+				}, "9.9.9.9:53",
+			)
+			data, err := txp.RoundTrip(context.Background(), nil)
+			if !errors.Is(err, mocked) {
+				t.Fatal("not the error we expected")
+			}
+			if data != nil {
+				t.Fatal("expected no response here")
+			}
+		})

-func TestDNSOverUDPReadSuccess(t *testing.T) {
-	const expected = 17
-	input := bytes.NewReader(make([]byte, expected))
-	txp := NewDNSOverUDP(
-		&mocks.Dialer{
-			MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
-				return &mocks.Conn{
-					MockSetDeadline: func(t time.Time) error {
-						return nil
+		t.Run("read success", func(t *testing.T) {
+			const expected = 17
+			input := bytes.NewReader(make([]byte, expected))
+			txp := NewDNSOverUDP(
+				&mocks.Dialer{
+					MockDialContext: func(ctx context.Context, network, address string) (net.Conn, error) {
+						return &mocks.Conn{
+							MockSetDeadline: func(t time.Time) error {
+								return nil
+							},
+							MockWrite: func(b []byte) (int, error) {
+								return len(b), nil
+							},
+							MockRead: input.Read,
+							MockClose: func() error {
+								return nil
+							},
+						}, nil
 					},
-					MockWrite: func(b []byte) (int, error) {
-						return len(b), nil
-					},
-					MockRead: input.Read,
-					MockClose: func() error {
-						return nil
-					},
-				}, nil
-			},
-		}, "9.9.9.9:53",
-	)
-	data, err := txp.RoundTrip(context.Background(), nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(data) != expected {
-		t.Fatal("expected non nil data")
-	}
-}
+				}, "9.9.9.9:53",
+			)
+			data, err := txp.RoundTrip(context.Background(), nil)
+			if err != nil {
+				t.Fatal(err)
+			}
+			if len(data) != expected {
+				t.Fatal("expected non nil data")
+			}
+		})
+	})

-func TestDNSOverUDPTransportOK(t *testing.T) {
-	const address = "9.9.9.9:53"
-	txp := NewDNSOverUDP(&net.Dialer{}, address)
-	if txp.RequiresPadding() != false {
-		t.Fatal("invalid RequiresPadding")
-	}
-	if txp.Network() != "udp" {
-		t.Fatal("invalid Network")
-	}
-	if txp.Address() != address {
-		t.Fatal("invalid Address")
-	}
+	t.Run("other functions okay", func(t *testing.T) {
+		const address = "9.9.9.9:53"
+		txp := NewDNSOverUDP(&net.Dialer{}, address)
+		if txp.RequiresPadding() != false {
+			t.Fatal("invalid RequiresPadding")
+		}
+		if txp.Network() != "udp" {
+			t.Fatal("invalid Network")
+		}
+		if txp.Address() != address {
+			t.Fatal("invalid Address")
+		}
+	})
 }