refactor(netx): move construction logic outside package (#798)

For testability, replace most if-based construction logic with
calls to well-tested factories living in other packages.

While there, acknowledge that a bunch of types could now be private
and make them private, modifying the code to call the public
factories allowing to construct said types instead.

Part of https://github.com/ooni/probe/issues/2121
This commit is contained in:
Simone Basso 2022-06-05 21:22:27 +02:00 committed by GitHub
commit 6b85dfce88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 475 additions and 184 deletions

View file

@ -15,6 +15,32 @@ import (
"github.com/ooni/probe-cli/v3/internal/netxlite/filtering"
)
func TestMaybeWrapHTTPTransport(t *testing.T) {
const snapshotSize = 1024
t.Run("with non-nil saver", func(t *testing.T) {
saver := &Saver{}
underlying := &mocks.HTTPTransport{}
txp := saver.MaybeWrapHTTPTransport(underlying, snapshotSize)
realTxp := txp.(*HTTPTransportSaver)
if realTxp.HTTPTransport != underlying {
t.Fatal("unexpected result")
}
if realTxp.SnapshotSize != snapshotSize {
t.Fatal("did not set snapshotSize correctly")
}
})
t.Run("with nil saver", func(t *testing.T) {
var saver *Saver
underlying := &mocks.HTTPTransport{}
txp := saver.MaybeWrapHTTPTransport(underlying, snapshotSize)
if txp != underlying {
t.Fatal("unexpected result")
}
})
}
func TestHTTPTransportSaver(t *testing.T) {
t.Run("CloseIdleConnections", func(t *testing.T) {