c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

31
internal/bytecounter/http_test.go
View file

@ -12,11 +12,32 @@ import (
"github.com/ooni/probe-cli/v3/internal/netxlite"
)
func TestMaybeWrapHTTPTransport(t *testing.T) {
t.Run("when counter is not nil", func(t *testing.T) {
underlying := &mocks.HTTPTransport{}
counter := &Counter{}
txp := counter.MaybeWrapHTTPTransport(underlying)
realTxp := txp.(*httpTransport)
if realTxp.HTTPTransport != underlying {
t.Fatal("did not wrap correctly")
}
})
t.Run("when counter is nil", func(t *testing.T) {
underlying := &mocks.HTTPTransport{}
var counter *Counter
txp := counter.MaybeWrapHTTPTransport(underlying)
if txp != underlying {
t.Fatal("unexpected result")
}
})
}
func TestHTTPTransport(t *testing.T) {
t.Run("RoundTrip", func(t *testing.T) {
t.Run("failure", func(t *testing.T) {
counter := New()
txp := &HTTPTransport{
txp := &httpTransport{
Counter: counter,
HTTPTransport: &mocks.HTTPTransport{
MockRoundTrip: func(req *http.Request) (*http.Response, error) {
@ -47,7 +68,7 @@ func TestHTTPTransport(t *testing.T) {
t.Run("success", func(t *testing.T) {
counter := New()
txp := &HTTPTransport{
txp := &httpTransport{
Counter: counter,
HTTPTransport: &mocks.HTTPTransport{
MockRoundTrip: func(req *http.Request) (*http.Response, error) {
@ -91,7 +112,7 @@ func TestHTTPTransport(t *testing.T) {
t.Run("success with EOF", func(t *testing.T) {
counter := New()
txp := &HTTPTransport{
txp := &httpTransport{
Counter: counter,
HTTPTransport: &mocks.HTTPTransport{
MockRoundTrip: func(req *http.Request) (*http.Response, error) {
@ -139,7 +160,7 @@ func TestHTTPTransport(t *testing.T) {
},
}
counter := New()
txp := NewHTTPTransport(child, counter)
txp := WrapHTTPTransport(child, counter)
txp.CloseIdleConnections()
if !called {
t.Fatal("not called")
@ -154,7 +175,7 @@ func TestHTTPTransport(t *testing.T) {
},
}
counter := New()
txp := NewHTTPTransport(child, counter)
txp := WrapHTTPTransport(child, counter)
if network := txp.Network(); network != expected {
t.Fatal("unexpected network", network)
}