From 24fdec669463a116757f4925cf3dffca210f3615 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Fri, 2 Apr 2021 21:32:06 +0300 Subject: [PATCH] Move testlib to internal --- cli/access_test.go | 2 +- cli/generate_secret_test.go | 2 +- cli/init_test.go | 2 +- {testlib => internal/testlib}/capture_output.go | 0 {testlib => internal/testlib}/events_observer_mock.go | 0 {testlib => internal/testlib}/mtglib_antireplay_cache_mock.go | 0 {testlib => internal/testlib}/mtglib_network_mock.go | 0 {testlib => internal/testlib}/net_conn_mock.go | 0 ipblocklist/firehol_test.go | 2 +- logger/noop_test.go | 2 +- mtglib/conns_internal_test.go | 2 +- mtglib/internal/faketls/conn_test.go | 2 +- mtglib/internal/obfuscated2/client_handshake_test.go | 2 +- mtglib/internal/obfuscated2/server_handshake_test.go | 2 +- mtglib/internal/relay/conn_internal_test.go | 2 +- mtglib/internal/relay/relay_test.go | 2 +- mtglib/internal/telegram/telegram_internal_test.go | 2 +- mtglib/stream_context_internal_test.go | 2 +- network/circuit_breaker_internal_test.go | 2 +- 19 files changed, 14 insertions(+), 14 deletions(-) rename {testlib => internal/testlib}/capture_output.go (100%) rename {testlib => internal/testlib}/events_observer_mock.go (100%) rename {testlib => internal/testlib}/mtglib_antireplay_cache_mock.go (100%) rename {testlib => internal/testlib}/mtglib_network_mock.go (100%) rename {testlib => internal/testlib}/net_conn_mock.go (100%) diff --git a/cli/access_test.go b/cli/access_test.go index 0cf0579..1a82e54 100644 --- a/cli/access_test.go +++ b/cli/access_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/9seconds/mtg/v2/config" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib" - "github.com/9seconds/mtg/v2/testlib" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/suite" "github.com/xeipuuv/gojsonschema" diff --git a/cli/generate_secret_test.go b/cli/generate_secret_test.go index 5cbe18d..64c6002 100644 --- a/cli/generate_secret_test.go +++ b/cli/generate_secret_test.go @@ -4,8 +4,8 @@ import ( "strings" "testing" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib" - "github.com/9seconds/mtg/v2/testlib" "github.com/stretchr/testify/suite" ) diff --git a/cli/init_test.go b/cli/init_test.go index 77304e9..29d3c74 100644 --- a/cli/init_test.go +++ b/cli/init_test.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/9seconds/mtg/v2/cli" - "github.com/9seconds/mtg/v2/testlib" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/testlib/capture_output.go b/internal/testlib/capture_output.go similarity index 100% rename from testlib/capture_output.go rename to internal/testlib/capture_output.go diff --git a/testlib/events_observer_mock.go b/internal/testlib/events_observer_mock.go similarity index 100% rename from testlib/events_observer_mock.go rename to internal/testlib/events_observer_mock.go diff --git a/testlib/mtglib_antireplay_cache_mock.go b/internal/testlib/mtglib_antireplay_cache_mock.go similarity index 100% rename from testlib/mtglib_antireplay_cache_mock.go rename to internal/testlib/mtglib_antireplay_cache_mock.go diff --git a/testlib/mtglib_network_mock.go b/internal/testlib/mtglib_network_mock.go similarity index 100% rename from testlib/mtglib_network_mock.go rename to internal/testlib/mtglib_network_mock.go diff --git a/testlib/net_conn_mock.go b/internal/testlib/net_conn_mock.go similarity index 100% rename from testlib/net_conn_mock.go rename to internal/testlib/net_conn_mock.go diff --git a/ipblocklist/firehol_test.go b/ipblocklist/firehol_test.go index 9879afd..9d26c6d 100644 --- a/ipblocklist/firehol_test.go +++ b/ipblocklist/firehol_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/ipblocklist" "github.com/9seconds/mtg/v2/logger" "github.com/9seconds/mtg/v2/network" - "github.com/9seconds/mtg/v2/testlib" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/logger/noop_test.go b/logger/noop_test.go index ca05901..dca71a8 100644 --- a/logger/noop_test.go +++ b/logger/noop_test.go @@ -4,8 +4,8 @@ import ( "io" "testing" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/logger" - "github.com/9seconds/mtg/v2/testlib" "github.com/stretchr/testify/suite" ) diff --git a/mtglib/conns_internal_test.go b/mtglib/conns_internal_test.go index 6bd778e..de31f60 100644 --- a/mtglib/conns_internal_test.go +++ b/mtglib/conns_internal_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/9seconds/mtg/v2/testlib" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/mtglib/internal/faketls/conn_test.go b/mtglib/internal/faketls/conn_test.go index 41bff3d..73c0e65 100644 --- a/mtglib/internal/faketls/conn_test.go +++ b/mtglib/internal/faketls/conn_test.go @@ -7,9 +7,9 @@ import ( "math/rand" "testing" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib/internal/faketls" "github.com/9seconds/mtg/v2/mtglib/internal/faketls/record" - "github.com/9seconds/mtg/v2/testlib" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/mtglib/internal/obfuscated2/client_handshake_test.go b/mtglib/internal/obfuscated2/client_handshake_test.go index ef7402a..6d4b95a 100644 --- a/mtglib/internal/obfuscated2/client_handshake_test.go +++ b/mtglib/internal/obfuscated2/client_handshake_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib/internal/obfuscated2" - "github.com/9seconds/mtg/v2/testlib" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/mtglib/internal/obfuscated2/server_handshake_test.go b/mtglib/internal/obfuscated2/server_handshake_test.go index 9279295..418af0c 100644 --- a/mtglib/internal/obfuscated2/server_handshake_test.go +++ b/mtglib/internal/obfuscated2/server_handshake_test.go @@ -7,8 +7,8 @@ import ( "encoding/base64" "testing" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib/internal/obfuscated2" - "github.com/9seconds/mtg/v2/testlib" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/mtglib/internal/relay/conn_internal_test.go b/mtglib/internal/relay/conn_internal_test.go index 26ed696..86bd81b 100644 --- a/mtglib/internal/relay/conn_internal_test.go +++ b/mtglib/internal/relay/conn_internal_test.go @@ -6,7 +6,7 @@ import ( "io" "testing" - "github.com/9seconds/mtg/v2/testlib" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/mtglib/internal/relay/relay_test.go b/mtglib/internal/relay/relay_test.go index 55b7732..9e3f19c 100644 --- a/mtglib/internal/relay/relay_test.go +++ b/mtglib/internal/relay/relay_test.go @@ -6,8 +6,8 @@ import ( "testing" "time" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/9seconds/mtg/v2/mtglib/internal/relay" - "github.com/9seconds/mtg/v2/testlib" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/mtglib/internal/telegram/telegram_internal_test.go b/mtglib/internal/telegram/telegram_internal_test.go index 64f1d6b..fe21ce2 100644 --- a/mtglib/internal/telegram/telegram_internal_test.go +++ b/mtglib/internal/telegram/telegram_internal_test.go @@ -8,7 +8,7 @@ import ( "strconv" "testing" - "github.com/9seconds/mtg/v2/testlib" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" diff --git a/mtglib/stream_context_internal_test.go b/mtglib/stream_context_internal_test.go index 6d447cc..17f90ea 100644 --- a/mtglib/stream_context_internal_test.go +++ b/mtglib/stream_context_internal_test.go @@ -5,7 +5,7 @@ import ( "net" "testing" - "github.com/9seconds/mtg/v2/testlib" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/stretchr/testify/suite" ) diff --git a/network/circuit_breaker_internal_test.go b/network/circuit_breaker_internal_test.go index a29eec3..a26f594 100644 --- a/network/circuit_breaker_internal_test.go +++ b/network/circuit_breaker_internal_test.go @@ -9,7 +9,7 @@ import ( "testing" "time" - "github.com/9seconds/mtg/v2/testlib" + "github.com/9seconds/mtg/v2/internal/testlib" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" )