From 2903d04202c033fe351bde7abfc1d485c8f80cae Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 3 Mar 2022 12:13:55 +0300 Subject: [PATCH] sync-mr --- e2e/cli.go | 3 ++- pkg/compiler/compiler_array_test.go | 3 ++- pkg/compiler/compiler_collect_aggregate_test.go | 3 ++- pkg/compiler/compiler_collect_count_test.go | 3 ++- pkg/compiler/compiler_collect_into_test.go | 3 ++- pkg/compiler/compiler_collect_test.go | 3 ++- pkg/compiler/compiler_collect_with_count_test.go | 3 ++- pkg/compiler/compiler_eq_test.go | 3 ++- pkg/compiler/compiler_filter_test.go | 3 ++- pkg/compiler/compiler_for_ternary_test.go | 3 ++- pkg/compiler/compiler_for_test.go | 5 +++-- pkg/compiler/compiler_for_while_ternary_test.go | 3 ++- pkg/compiler/compiler_for_while_test.go | 3 ++- pkg/compiler/compiler_func_ns_test.go | 3 ++- pkg/compiler/compiler_func_test.go | 3 ++- pkg/compiler/compiler_in_test.go | 3 ++- pkg/compiler/compiler_let_test.go | 3 ++- pkg/compiler/compiler_like_test.go | 3 ++- pkg/compiler/compiler_limit_test.go | 3 ++- pkg/compiler/compiler_logical_test.go | 3 ++- pkg/compiler/compiler_math_test.go | 3 ++- pkg/compiler/compiler_member_test.go | 3 ++- pkg/compiler/compiler_param_test.go | 3 ++- pkg/compiler/compiler_precedence_test.go | 3 ++- pkg/compiler/compiler_range_test.go | 3 ++- pkg/compiler/compiler_regexp_test.go | 3 ++- pkg/compiler/compiler_return_test.go | 3 ++- pkg/compiler/compiler_sort_test.go | 3 ++- pkg/compiler/compiler_str_test.go | 3 ++- pkg/compiler/compiler_ternary_test.go | 3 ++- pkg/compiler/compiler_unary_test.go | 3 ++- pkg/compiler/compiler_waitfor_event_ternary_test.go | 3 ++- pkg/compiler/compiler_waitfor_event_test.go | 5 +++-- pkg/compiler/namespace_test.go | 3 ++- pkg/compiler/visitor.go | 7 ++++--- pkg/drivers/cdp/dom/helpers.go | 3 ++- pkg/drivers/cdp/eval/function.go | 3 ++- pkg/drivers/cdp/eval/helpers_test.go | 3 ++- pkg/drivers/cdp/eval/runtime.go | 1 + pkg/drivers/cdp/events/loop.go | 3 ++- pkg/drivers/cdp/events/loop_test.go | 7 ++++--- pkg/drivers/cdp/input/manager.go | 3 ++- pkg/drivers/cdp/network/manager.go | 3 ++- pkg/drivers/cdp/templates/attributes.go | 1 + pkg/drivers/cdp/templates/blur.go | 1 + pkg/drivers/cdp/templates/helpers.go | 3 ++- pkg/drivers/cdp/templates/inner_html.go | 1 + pkg/drivers/cdp/templates/inner_text.go | 1 + pkg/drivers/cdp/templates/query.go | 1 + pkg/drivers/cdp/templates/scroll.go | 1 + pkg/drivers/cdp/templates/select.go | 1 + pkg/drivers/cdp/templates/wait.go | 1 + pkg/drivers/common/styles_test.go | 3 ++- pkg/drivers/http/driver.go | 7 ++++--- pkg/drivers/http/element_test.go | 3 ++- pkg/drivers/scroll.go | 3 ++- pkg/runtime/collections/indexed.go | 1 + pkg/runtime/collections/indexed_test.go | 3 ++- pkg/runtime/collections/iterator.go | 1 + pkg/runtime/collections/keyed.go | 1 + pkg/runtime/collections/keyed_test.go | 3 ++- pkg/runtime/collections/limit.go | 1 + pkg/runtime/collections/limit_test.go | 3 ++- pkg/runtime/collections/map.go | 1 + pkg/runtime/collections/map_test.go | 3 ++- pkg/runtime/collections/slice.go | 1 + pkg/runtime/collections/slice_test.go | 3 ++- pkg/runtime/collections/sort_test.go | 3 ++- pkg/runtime/collections/tap.go | 1 + pkg/runtime/collections/tap_test.go | 3 ++- pkg/runtime/collections/unique.go | 1 + pkg/runtime/collections/unique_test.go | 3 ++- pkg/runtime/collections/while_pre_test.go | 3 ++- pkg/runtime/collections/while_test.go | 3 ++- pkg/runtime/core/type_test.go | 3 ++- pkg/runtime/events/observable.go | 1 + pkg/runtime/expressions/block.go | 1 + pkg/runtime/expressions/block_test.go | 3 ++- pkg/runtime/expressions/body.go | 1 + pkg/runtime/expressions/clauses/filter.go | 1 + pkg/runtime/expressions/clauses/sort.go | 1 + pkg/runtime/expressions/condition.go | 1 + pkg/runtime/expressions/for.go | 1 + pkg/runtime/expressions/func_call.go | 1 + pkg/runtime/expressions/func_call_test.go | 3 ++- pkg/runtime/expressions/literals/array.go | 1 + pkg/runtime/expressions/literals/boolean.go | 1 + pkg/runtime/expressions/literals/float.go | 1 + pkg/runtime/expressions/literals/int.go | 1 + pkg/runtime/expressions/literals/none.go | 1 + pkg/runtime/expressions/literals/string.go | 1 + pkg/runtime/expressions/member.go | 1 + pkg/runtime/expressions/member_test.go | 3 ++- pkg/runtime/expressions/operators/math.go | 1 + pkg/runtime/expressions/operators/operator_test.go | 3 ++- pkg/runtime/expressions/operators/regexp.go | 3 ++- pkg/runtime/expressions/param.go | 1 + pkg/runtime/expressions/return.go | 1 + pkg/runtime/expressions/variable.go | 1 + pkg/runtime/expressions/waitfor_event.go | 3 ++- pkg/runtime/expressions/waitfor_event_test.go | 5 +++-- pkg/runtime/program_test.go | 3 ++- pkg/runtime/values/boolean_test.go | 3 ++- pkg/runtime/values/date_time_test.go | 5 +++-- pkg/runtime/values/float_test.go | 3 ++- pkg/runtime/values/helpers_test.go | 3 ++- pkg/runtime/values/int_test.go | 3 ++- pkg/runtime/values/string_test.go | 3 ++- pkg/runtime/values/types/helpers_test.go | 3 ++- pkg/runtime/values/types/types_test.go | 3 ++- pkg/stdlib/arrays/append_test.go | 3 ++- pkg/stdlib/arrays/first_test.go | 3 ++- pkg/stdlib/arrays/flatten_test.go | 3 ++- pkg/stdlib/arrays/intersection_test.go | 3 ++- pkg/stdlib/arrays/last_test.go | 3 ++- pkg/stdlib/arrays/minus_test.go | 3 ++- pkg/stdlib/arrays/nth_test.go | 3 ++- pkg/stdlib/arrays/outersection_test.go | 3 ++- pkg/stdlib/arrays/pop_test.go | 3 ++- pkg/stdlib/arrays/position_test.go | 3 ++- pkg/stdlib/arrays/push_test.go | 3 ++- pkg/stdlib/arrays/remove_nth_test.go | 3 ++- pkg/stdlib/arrays/remove_value_test.go | 3 ++- pkg/stdlib/arrays/remove_values_test.go | 3 ++- pkg/stdlib/arrays/shift_test.go | 3 ++- pkg/stdlib/arrays/slice_test.go | 3 ++- pkg/stdlib/arrays/sorted_test.go | 3 ++- pkg/stdlib/arrays/sorted_unique_test.go | 3 ++- pkg/stdlib/arrays/union_distinct_test.go | 3 ++- pkg/stdlib/arrays/unique_test.go | 3 ++- pkg/stdlib/arrays/unshift_test.go | 3 ++- pkg/stdlib/collections/reverse.go | 1 + pkg/stdlib/html/attr_set.go | 1 + pkg/stdlib/html/blur.go | 1 + pkg/stdlib/html/document.go | 3 ++- pkg/stdlib/html/find_frames.go | 3 ++- pkg/stdlib/html/input.go | 1 + pkg/stdlib/html/pagination.go | 1 + pkg/stdlib/html/parse.go | 1 + pkg/stdlib/html/press.go | 1 + pkg/stdlib/html/press_selector.go | 1 + pkg/stdlib/html/wait_navigation.go | 1 + pkg/stdlib/io/net/http/get_test.go | 5 +++-- pkg/stdlib/math/abs_test.go | 3 ++- pkg/stdlib/math/acos_test.go | 3 ++- pkg/stdlib/math/asin_test.go | 3 ++- pkg/stdlib/math/atan2_test.go | 3 ++- pkg/stdlib/math/atan_test.go | 3 ++- pkg/stdlib/math/average_test.go | 3 ++- pkg/stdlib/math/ceil_test.go | 3 ++- pkg/stdlib/math/cos_test.go | 3 ++- pkg/stdlib/math/degrees_test.go | 3 ++- pkg/stdlib/math/exp2_test.go | 3 ++- pkg/stdlib/math/exp_test.go | 3 ++- pkg/stdlib/math/floor_test.go | 3 ++- pkg/stdlib/math/log10_test.go | 3 ++- pkg/stdlib/math/log2_test.go | 3 ++- pkg/stdlib/math/log_test.go | 3 ++- pkg/stdlib/math/max_test.go | 3 ++- pkg/stdlib/math/median_test.go | 3 ++- pkg/stdlib/math/min_test.go | 3 ++- pkg/stdlib/math/percentile_test.go | 3 ++- pkg/stdlib/math/pi_test.go | 5 +++-- pkg/stdlib/math/pow_test.go | 3 ++- pkg/stdlib/math/radians_test.go | 3 ++- pkg/stdlib/math/rand_test.go | 3 ++- pkg/stdlib/math/range_test.go | 3 ++- pkg/stdlib/math/round_test.go | 3 ++- pkg/stdlib/math/sin_test.go | 3 ++- pkg/stdlib/math/sqrt_test.go | 3 ++- pkg/stdlib/math/stddev_population_test.go | 3 ++- pkg/stdlib/math/stddev_sample_test.go | 3 ++- pkg/stdlib/math/sum_test.go | 3 ++- pkg/stdlib/math/tan_test.go | 3 ++- pkg/stdlib/math/variance_population_test.go | 3 ++- pkg/stdlib/math/variance_sample_test.go | 3 ++- pkg/stdlib/objects/keys_test.go | 3 ++- pkg/stdlib/strings/case_test.go | 3 ++- pkg/stdlib/strings/concat_test.go | 3 ++- pkg/stdlib/strings/contains_test.go | 3 ++- pkg/stdlib/strings/encode_test.go | 3 ++- pkg/stdlib/strings/escape_test.go | 3 ++- pkg/stdlib/strings/find_test.go | 3 ++- pkg/stdlib/strings/random_test.go | 3 ++- pkg/stdlib/strings/regex_test.go | 3 ++- pkg/stdlib/strings/split_test.go | 3 ++- pkg/stdlib/strings/substitute_test.go | 3 ++- pkg/stdlib/strings/trim_test.go | 3 ++- pkg/stdlib/strings/unescape_test.go | 3 ++- pkg/stdlib/testing/len_test.go | 3 ++- pkg/stdlib/testing/none_test.go | 3 ++- pkg/stdlib/types/to_array.go | 1 + pkg/stdlib/types/to_boolean_test.go | 3 ++- 193 files changed, 352 insertions(+), 159 deletions(-) diff --git a/e2e/cli.go b/e2e/cli.go index 798c01ee..1dc2bbe8 100644 --- a/e2e/cli.go +++ b/e2e/cli.go @@ -6,13 +6,14 @@ import ( "encoding/json" "flag" "fmt" - "github.com/rs/zerolog" "io/ioutil" "os" "os/signal" "path/filepath" "strings" + "github.com/rs/zerolog" + "github.com/MontFerret/ferret" "github.com/MontFerret/ferret/pkg/drivers/cdp" "github.com/MontFerret/ferret/pkg/drivers/http" diff --git a/pkg/compiler/compiler_array_test.go b/pkg/compiler/compiler_array_test.go index 216cc7c3..4dd11dbd 100644 --- a/pkg/compiler/compiler_array_test.go +++ b/pkg/compiler/compiler_array_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestArrayOperator(t *testing.T) { diff --git a/pkg/compiler/compiler_collect_aggregate_test.go b/pkg/compiler/compiler_collect_aggregate_test.go index 28571a17..47bcfd6d 100644 --- a/pkg/compiler/compiler_collect_aggregate_test.go +++ b/pkg/compiler/compiler_collect_aggregate_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestAggregate(t *testing.T) { diff --git a/pkg/compiler/compiler_collect_count_test.go b/pkg/compiler/compiler_collect_count_test.go index c85cb3eb..5598be6a 100644 --- a/pkg/compiler/compiler_collect_count_test.go +++ b/pkg/compiler/compiler_collect_count_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestCollectCount(t *testing.T) { diff --git a/pkg/compiler/compiler_collect_into_test.go b/pkg/compiler/compiler_collect_into_test.go index 2ab6ccc1..3cdea574 100644 --- a/pkg/compiler/compiler_collect_into_test.go +++ b/pkg/compiler/compiler_collect_into_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestCollectInto(t *testing.T) { diff --git a/pkg/compiler/compiler_collect_test.go b/pkg/compiler/compiler_collect_test.go index 9fa2dd1b..6b4abfa5 100644 --- a/pkg/compiler/compiler_collect_test.go +++ b/pkg/compiler/compiler_collect_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestCollect(t *testing.T) { diff --git a/pkg/compiler/compiler_collect_with_count_test.go b/pkg/compiler/compiler_collect_with_count_test.go index f088d668..1067a320 100644 --- a/pkg/compiler/compiler_collect_with_count_test.go +++ b/pkg/compiler/compiler_collect_with_count_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestCollectWithCount(t *testing.T) { diff --git a/pkg/compiler/compiler_eq_test.go b/pkg/compiler/compiler_eq_test.go index 59ba60e3..157acc28 100644 --- a/pkg/compiler/compiler_eq_test.go +++ b/pkg/compiler/compiler_eq_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestEqualityOperators(t *testing.T) { diff --git a/pkg/compiler/compiler_filter_test.go b/pkg/compiler/compiler_filter_test.go index 96c3ca8b..3206a0db 100644 --- a/pkg/compiler/compiler_filter_test.go +++ b/pkg/compiler/compiler_filter_test.go @@ -2,11 +2,12 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestForFilter(t *testing.T) { diff --git a/pkg/compiler/compiler_for_ternary_test.go b/pkg/compiler/compiler_for_ternary_test.go index f4de25eb..2d25e9ee 100644 --- a/pkg/compiler/compiler_for_ternary_test.go +++ b/pkg/compiler/compiler_for_ternary_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestForTernaryExpression(t *testing.T) { diff --git a/pkg/compiler/compiler_for_test.go b/pkg/compiler/compiler_for_test.go index 21a0a354..d5d9a094 100644 --- a/pkg/compiler/compiler_for_test.go +++ b/pkg/compiler/compiler_for_test.go @@ -3,11 +3,12 @@ package compiler_test import ( "context" "encoding/json" + "sort" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "sort" - "testing" ) func TestFor(t *testing.T) { diff --git a/pkg/compiler/compiler_for_while_ternary_test.go b/pkg/compiler/compiler_for_while_ternary_test.go index c3ba0c81..fb71e8af 100644 --- a/pkg/compiler/compiler_for_while_ternary_test.go +++ b/pkg/compiler/compiler_for_while_ternary_test.go @@ -2,11 +2,12 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestForTernaryWhileExpression(t *testing.T) { diff --git a/pkg/compiler/compiler_for_while_test.go b/pkg/compiler/compiler_for_while_test.go index fe39809c..8d41af35 100644 --- a/pkg/compiler/compiler_for_while_test.go +++ b/pkg/compiler/compiler_for_while_test.go @@ -2,12 +2,13 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestForWhile(t *testing.T) { diff --git a/pkg/compiler/compiler_func_ns_test.go b/pkg/compiler/compiler_func_ns_test.go index 67d54d01..32eb730b 100644 --- a/pkg/compiler/compiler_func_ns_test.go +++ b/pkg/compiler/compiler_func_ns_test.go @@ -3,11 +3,12 @@ package compiler_test import ( "context" "fmt" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestFunctionNSCall(t *testing.T) { diff --git a/pkg/compiler/compiler_func_test.go b/pkg/compiler/compiler_func_test.go index 0b303f18..cf739bba 100644 --- a/pkg/compiler/compiler_func_test.go +++ b/pkg/compiler/compiler_func_test.go @@ -2,12 +2,13 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/pkg/errors" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestFunctionCall(t *testing.T) { diff --git a/pkg/compiler/compiler_in_test.go b/pkg/compiler/compiler_in_test.go index d1f6da60..55c69c85 100644 --- a/pkg/compiler/compiler_in_test.go +++ b/pkg/compiler/compiler_in_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestInOperator(t *testing.T) { diff --git a/pkg/compiler/compiler_let_test.go b/pkg/compiler/compiler_let_test.go index c9390a0c..24120e50 100644 --- a/pkg/compiler/compiler_let_test.go +++ b/pkg/compiler/compiler_let_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLet(t *testing.T) { diff --git a/pkg/compiler/compiler_like_test.go b/pkg/compiler/compiler_like_test.go index 14542a7a..68ae8265 100644 --- a/pkg/compiler/compiler_like_test.go +++ b/pkg/compiler/compiler_like_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLikeOperator(t *testing.T) { diff --git a/pkg/compiler/compiler_limit_test.go b/pkg/compiler/compiler_limit_test.go index 5c8859e9..eec81636 100644 --- a/pkg/compiler/compiler_limit_test.go +++ b/pkg/compiler/compiler_limit_test.go @@ -2,11 +2,12 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestForLimit(t *testing.T) { diff --git a/pkg/compiler/compiler_logical_test.go b/pkg/compiler/compiler_logical_test.go index a777854d..f0a849bc 100644 --- a/pkg/compiler/compiler_logical_test.go +++ b/pkg/compiler/compiler_logical_test.go @@ -3,11 +3,12 @@ package compiler_test import ( "context" "errors" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" "github.com/MontFerret/ferret/pkg/runtime/core" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLogicalOperators(t *testing.T) { diff --git a/pkg/compiler/compiler_math_test.go b/pkg/compiler/compiler_math_test.go index 0fc07f52..2a9cafbd 100644 --- a/pkg/compiler/compiler_math_test.go +++ b/pkg/compiler/compiler_math_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestMathOperators(t *testing.T) { diff --git a/pkg/compiler/compiler_member_test.go b/pkg/compiler/compiler_member_test.go index 79d488ea..d9afd828 100644 --- a/pkg/compiler/compiler_member_test.go +++ b/pkg/compiler/compiler_member_test.go @@ -3,9 +3,10 @@ package compiler_test import ( "context" "fmt" - "github.com/MontFerret/ferret/pkg/runtime/core" "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/compiler/compiler_param_test.go b/pkg/compiler/compiler_param_test.go index 8939a515..443600ac 100644 --- a/pkg/compiler/compiler_param_test.go +++ b/pkg/compiler/compiler_param_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestParam(t *testing.T) { diff --git a/pkg/compiler/compiler_precedence_test.go b/pkg/compiler/compiler_precedence_test.go index 5306be3f..21fc8640 100644 --- a/pkg/compiler/compiler_precedence_test.go +++ b/pkg/compiler/compiler_precedence_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" - "github.com/MontFerret/ferret/pkg/compiler" "testing" + "github.com/MontFerret/ferret/pkg/compiler" + . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/compiler/compiler_range_test.go b/pkg/compiler/compiler_range_test.go index 70779d85..25a9b93a 100644 --- a/pkg/compiler/compiler_range_test.go +++ b/pkg/compiler/compiler_range_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRangeOperator(t *testing.T) { diff --git a/pkg/compiler/compiler_regexp_test.go b/pkg/compiler/compiler_regexp_test.go index 7f85253a..b99d7608 100644 --- a/pkg/compiler/compiler_regexp_test.go +++ b/pkg/compiler/compiler_regexp_test.go @@ -3,9 +3,10 @@ package compiler_test import ( "context" "fmt" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" - "testing" "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" diff --git a/pkg/compiler/compiler_return_test.go b/pkg/compiler/compiler_return_test.go index 74444574..cd261dd6 100644 --- a/pkg/compiler/compiler_return_test.go +++ b/pkg/compiler/compiler_return_test.go @@ -2,10 +2,11 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestReturn(t *testing.T) { diff --git a/pkg/compiler/compiler_sort_test.go b/pkg/compiler/compiler_sort_test.go index eeb45caa..b4c97e20 100644 --- a/pkg/compiler/compiler_sort_test.go +++ b/pkg/compiler/compiler_sort_test.go @@ -2,11 +2,12 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestForSort(t *testing.T) { diff --git a/pkg/compiler/compiler_str_test.go b/pkg/compiler/compiler_str_test.go index 54a72df6..f2ba2fdd 100644 --- a/pkg/compiler/compiler_str_test.go +++ b/pkg/compiler/compiler_str_test.go @@ -4,9 +4,10 @@ import ( "context" "encoding/json" "fmt" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestString(t *testing.T) { diff --git a/pkg/compiler/compiler_ternary_test.go b/pkg/compiler/compiler_ternary_test.go index 1f4c94d7..ec3fef67 100644 --- a/pkg/compiler/compiler_ternary_test.go +++ b/pkg/compiler/compiler_ternary_test.go @@ -3,9 +3,10 @@ package compiler_test import ( "context" "fmt" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestTernaryOperator(t *testing.T) { diff --git a/pkg/compiler/compiler_unary_test.go b/pkg/compiler/compiler_unary_test.go index 25a29102..35611308 100644 --- a/pkg/compiler/compiler_unary_test.go +++ b/pkg/compiler/compiler_unary_test.go @@ -2,9 +2,10 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestUnaryOperator(t *testing.T) { diff --git a/pkg/compiler/compiler_waitfor_event_ternary_test.go b/pkg/compiler/compiler_waitfor_event_ternary_test.go index 2c37595a..8fbd1fbb 100644 --- a/pkg/compiler/compiler_waitfor_event_ternary_test.go +++ b/pkg/compiler/compiler_waitfor_event_ternary_test.go @@ -2,8 +2,9 @@ package compiler_test import ( "context" - . "github.com/smartystreets/goconvey/convey" "testing" + + . "github.com/smartystreets/goconvey/convey" ) func TestWaitforEventWithinTernaryExpression(t *testing.T) { diff --git a/pkg/compiler/compiler_waitfor_event_test.go b/pkg/compiler/compiler_waitfor_event_test.go index 2e84f800..79066bd1 100644 --- a/pkg/compiler/compiler_waitfor_event_test.go +++ b/pkg/compiler/compiler_waitfor_event_test.go @@ -2,14 +2,15 @@ package compiler_test import ( "context" + "testing" + "time" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/events" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" - "time" ) type MockedObservable struct { diff --git a/pkg/compiler/namespace_test.go b/pkg/compiler/namespace_test.go index e1375089..557c02db 100644 --- a/pkg/compiler/namespace_test.go +++ b/pkg/compiler/namespace_test.go @@ -2,11 +2,12 @@ package compiler_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestNamespaceBuilder(t *testing.T) { diff --git a/pkg/compiler/visitor.go b/pkg/compiler/visitor.go index f307fcea..527f7e49 100644 --- a/pkg/compiler/visitor.go +++ b/pkg/compiler/visitor.go @@ -2,6 +2,10 @@ package compiler import ( "fmt" + "regexp" + "strconv" + "strings" + "github.com/MontFerret/ferret/pkg/parser/fql" "github.com/MontFerret/ferret/pkg/runtime" "github.com/MontFerret/ferret/pkg/runtime/collections" @@ -13,9 +17,6 @@ import ( "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/antlr/antlr4/runtime/Go/antlr" "github.com/pkg/errors" - "regexp" - "strconv" - "strings" ) type ( diff --git a/pkg/drivers/cdp/dom/helpers.go b/pkg/drivers/cdp/dom/helpers.go index 6d210756..defd398d 100644 --- a/pkg/drivers/cdp/dom/helpers.go +++ b/pkg/drivers/cdp/dom/helpers.go @@ -3,10 +3,11 @@ package dom import ( "bytes" "context" - "github.com/rs/zerolog" "regexp" "strings" + "github.com/rs/zerolog" + "github.com/mafredri/cdp" "github.com/mafredri/cdp/protocol/dom" "github.com/mafredri/cdp/protocol/page" diff --git a/pkg/drivers/cdp/eval/function.go b/pkg/drivers/cdp/eval/function.go index 2f6dc88f..e5218dab 100644 --- a/pkg/drivers/cdp/eval/function.go +++ b/pkg/drivers/cdp/eval/function.go @@ -1,11 +1,12 @@ package eval import ( + "strings" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/mafredri/cdp/protocol/runtime" "github.com/rs/zerolog" "github.com/wI2L/jettison" - "strings" ) type ( diff --git a/pkg/drivers/cdp/eval/helpers_test.go b/pkg/drivers/cdp/eval/helpers_test.go index 65a3461a..7868d427 100644 --- a/pkg/drivers/cdp/eval/helpers_test.go +++ b/pkg/drivers/cdp/eval/helpers_test.go @@ -1,8 +1,9 @@ package eval import ( - . "github.com/smartystreets/goconvey/convey" "testing" + + . "github.com/smartystreets/goconvey/convey" ) func TestWrapExp(t *testing.T) { diff --git a/pkg/drivers/cdp/eval/runtime.go b/pkg/drivers/cdp/eval/runtime.go index 9b3f1492..e77daa20 100644 --- a/pkg/drivers/cdp/eval/runtime.go +++ b/pkg/drivers/cdp/eval/runtime.go @@ -2,6 +2,7 @@ package eval import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/logging" "github.com/rs/zerolog" diff --git a/pkg/drivers/cdp/events/loop.go b/pkg/drivers/cdp/events/loop.go index d2872bc3..cbccd313 100644 --- a/pkg/drivers/cdp/events/loop.go +++ b/pkg/drivers/cdp/events/loop.go @@ -2,9 +2,10 @@ package events import ( "context" - "github.com/MontFerret/ferret/pkg/runtime/core" "math/rand" "sync" + + "github.com/MontFerret/ferret/pkg/runtime/core" ) type Loop struct { diff --git a/pkg/drivers/cdp/events/loop_test.go b/pkg/drivers/cdp/events/loop_test.go index 0b8184cc..5c621f85 100644 --- a/pkg/drivers/cdp/events/loop_test.go +++ b/pkg/drivers/cdp/events/loop_test.go @@ -2,14 +2,15 @@ package events_test import ( "context" + "sync" + "testing" + "time" + "github.com/MontFerret/ferret/pkg/drivers/cdp/events" "github.com/mafredri/cdp/protocol/dom" "github.com/mafredri/cdp/protocol/page" "github.com/mafredri/cdp/rpcc" . "github.com/smartystreets/goconvey/convey" - "sync" - "testing" - "time" ) type ( diff --git a/pkg/drivers/cdp/input/manager.go b/pkg/drivers/cdp/input/manager.go index 2d744850..16f5df6c 100644 --- a/pkg/drivers/cdp/input/manager.go +++ b/pkg/drivers/cdp/input/manager.go @@ -2,9 +2,10 @@ package input import ( "context" + "time" + "github.com/MontFerret/ferret/pkg/runtime/logging" "github.com/rs/zerolog" - "time" "github.com/mafredri/cdp" "github.com/mafredri/cdp/protocol/dom" diff --git a/pkg/drivers/cdp/network/manager.go b/pkg/drivers/cdp/network/manager.go index cd02fcc8..03370e95 100644 --- a/pkg/drivers/cdp/network/manager.go +++ b/pkg/drivers/cdp/network/manager.go @@ -3,10 +3,11 @@ package network import ( "context" "encoding/json" - "github.com/MontFerret/ferret/pkg/runtime/logging" "regexp" "sync" + "github.com/MontFerret/ferret/pkg/runtime/logging" + "github.com/mafredri/cdp" "github.com/mafredri/cdp/protocol/fetch" "github.com/mafredri/cdp/protocol/network" diff --git a/pkg/drivers/cdp/templates/attributes.go b/pkg/drivers/cdp/templates/attributes.go index 6bb8eee3..b43be7a2 100644 --- a/pkg/drivers/cdp/templates/attributes.go +++ b/pkg/drivers/cdp/templates/attributes.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/mafredri/cdp/protocol/runtime" diff --git a/pkg/drivers/cdp/templates/blur.go b/pkg/drivers/cdp/templates/blur.go index 670eb6f7..27fb7c64 100644 --- a/pkg/drivers/cdp/templates/blur.go +++ b/pkg/drivers/cdp/templates/blur.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/drivers/cdp/templates/helpers.go b/pkg/drivers/cdp/templates/helpers.go index e1193f0e..b3277b1c 100644 --- a/pkg/drivers/cdp/templates/helpers.go +++ b/pkg/drivers/cdp/templates/helpers.go @@ -2,9 +2,10 @@ package templates import ( "bytes" - "github.com/MontFerret/ferret/pkg/drivers" "strconv" + "github.com/MontFerret/ferret/pkg/drivers" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/drivers/cdp/templates/inner_html.go b/pkg/drivers/cdp/templates/inner_html.go index 702bfd55..3bb0588e 100644 --- a/pkg/drivers/cdp/templates/inner_html.go +++ b/pkg/drivers/cdp/templates/inner_html.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/drivers/cdp/templates/inner_text.go b/pkg/drivers/cdp/templates/inner_text.go index b591720f..f0ad5136 100644 --- a/pkg/drivers/cdp/templates/inner_text.go +++ b/pkg/drivers/cdp/templates/inner_text.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/drivers/cdp/templates/query.go b/pkg/drivers/cdp/templates/query.go index 533d7072..a456cce5 100644 --- a/pkg/drivers/cdp/templates/query.go +++ b/pkg/drivers/cdp/templates/query.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/drivers/cdp/templates/scroll.go b/pkg/drivers/cdp/templates/scroll.go index d3be7582..52c5cb86 100644 --- a/pkg/drivers/cdp/templates/scroll.go +++ b/pkg/drivers/cdp/templates/scroll.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/core" diff --git a/pkg/drivers/cdp/templates/select.go b/pkg/drivers/cdp/templates/select.go index 2403db66..0cc8780a 100644 --- a/pkg/drivers/cdp/templates/select.go +++ b/pkg/drivers/cdp/templates/select.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/drivers/cdp/templates/wait.go b/pkg/drivers/cdp/templates/wait.go index 97b813ec..d17061c6 100644 --- a/pkg/drivers/cdp/templates/wait.go +++ b/pkg/drivers/cdp/templates/wait.go @@ -2,6 +2,7 @@ package templates import ( "fmt" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp/eval" "github.com/MontFerret/ferret/pkg/runtime/core" diff --git a/pkg/drivers/common/styles_test.go b/pkg/drivers/common/styles_test.go index a994ce0a..df95c67d 100644 --- a/pkg/drivers/common/styles_test.go +++ b/pkg/drivers/common/styles_test.go @@ -2,10 +2,11 @@ package common_test import ( "bytes" + "testing" + "github.com/MontFerret/ferret/pkg/drivers/common" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/drivers/http/driver.go b/pkg/drivers/http/driver.go index e9fd343d..f1010827 100644 --- a/pkg/drivers/http/driver.go +++ b/pkg/drivers/http/driver.go @@ -3,13 +3,14 @@ package http import ( "bytes" "context" - "github.com/MontFerret/ferret/pkg/runtime/logging" - "github.com/MontFerret/ferret/pkg/runtime/values" - "github.com/gobwas/glob" "io" "net/http" "net/url" + "github.com/MontFerret/ferret/pkg/runtime/logging" + "github.com/MontFerret/ferret/pkg/runtime/values" + "github.com/gobwas/glob" + "golang.org/x/net/html/charset" "github.com/PuerkitoBio/goquery" diff --git a/pkg/drivers/http/element_test.go b/pkg/drivers/http/element_test.go index ba8a658d..a8f603a7 100644 --- a/pkg/drivers/http/element_test.go +++ b/pkg/drivers/http/element_test.go @@ -3,12 +3,13 @@ package http_test import ( "bytes" "context" + "testing" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/http" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/PuerkitoBio/goquery" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestElement(t *testing.T) { diff --git a/pkg/drivers/scroll.go b/pkg/drivers/scroll.go index d22fc6f3..207f247d 100644 --- a/pkg/drivers/scroll.go +++ b/pkg/drivers/scroll.go @@ -1,9 +1,10 @@ package drivers import ( + "strings" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/wI2L/jettison" - "strings" ) // ScrollBehavior defines the transition animation. diff --git a/pkg/runtime/collections/indexed.go b/pkg/runtime/collections/indexed.go index 491180b8..dc8ca1b1 100644 --- a/pkg/runtime/collections/indexed.go +++ b/pkg/runtime/collections/indexed.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/collections/indexed_test.go b/pkg/runtime/collections/indexed_test.go index 4acdb542..6a5ee0ad 100644 --- a/pkg/runtime/collections/indexed_test.go +++ b/pkg/runtime/collections/indexed_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func arrayIterator(arr *values.Array) collections.Iterator { diff --git a/pkg/runtime/collections/iterator.go b/pkg/runtime/collections/iterator.go index 1f069838..a9265231 100644 --- a/pkg/runtime/collections/iterator.go +++ b/pkg/runtime/collections/iterator.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" ) diff --git a/pkg/runtime/collections/keyed.go b/pkg/runtime/collections/keyed.go index c07d143b..f3a24dd6 100644 --- a/pkg/runtime/collections/keyed.go +++ b/pkg/runtime/collections/keyed.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/collections/keyed_test.go b/pkg/runtime/collections/keyed_test.go index 7b0aa585..95681f26 100644 --- a/pkg/runtime/collections/keyed_test.go +++ b/pkg/runtime/collections/keyed_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func objectIterator(obj *values.Object) collections.Iterator { diff --git a/pkg/runtime/collections/limit.go b/pkg/runtime/collections/limit.go index 0ce8870d..9243bb7f 100644 --- a/pkg/runtime/collections/limit.go +++ b/pkg/runtime/collections/limit.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" ) diff --git a/pkg/runtime/collections/limit_test.go b/pkg/runtime/collections/limit_test.go index 87598a8b..80c1c06f 100644 --- a/pkg/runtime/collections/limit_test.go +++ b/pkg/runtime/collections/limit_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLimit(t *testing.T) { diff --git a/pkg/runtime/collections/map.go b/pkg/runtime/collections/map.go index 7e3ef9e3..ae07934b 100644 --- a/pkg/runtime/collections/map.go +++ b/pkg/runtime/collections/map.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/collections/map_test.go b/pkg/runtime/collections/map_test.go index 3e8fa563..e5fc2787 100644 --- a/pkg/runtime/collections/map_test.go +++ b/pkg/runtime/collections/map_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func mapIterator(m map[string]core.Value) collections.Iterator { diff --git a/pkg/runtime/collections/slice.go b/pkg/runtime/collections/slice.go index 18b194cc..81002d0e 100644 --- a/pkg/runtime/collections/slice.go +++ b/pkg/runtime/collections/slice.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/collections/slice_test.go b/pkg/runtime/collections/slice_test.go index fcf02778..d56d992a 100644 --- a/pkg/runtime/collections/slice_test.go +++ b/pkg/runtime/collections/slice_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func sliceIterator(value []core.Value) collections.Iterator { diff --git a/pkg/runtime/collections/sort_test.go b/pkg/runtime/collections/sort_test.go index 644688b0..80769443 100644 --- a/pkg/runtime/collections/sort_test.go +++ b/pkg/runtime/collections/sort_test.go @@ -3,11 +3,12 @@ package collections_test import ( "context" "encoding/json" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func toValues(scopes []*core.Scope) []core.Value { diff --git a/pkg/runtime/collections/tap.go b/pkg/runtime/collections/tap.go index 0c79c510..28ace051 100644 --- a/pkg/runtime/collections/tap.go +++ b/pkg/runtime/collections/tap.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" ) diff --git a/pkg/runtime/collections/tap_test.go b/pkg/runtime/collections/tap_test.go index 38ea3733..7b4acd0b 100644 --- a/pkg/runtime/collections/tap_test.go +++ b/pkg/runtime/collections/tap_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func tapIterator(values collections.Iterator, predicate core.Expression) collections.Iterator { diff --git a/pkg/runtime/collections/unique.go b/pkg/runtime/collections/unique.go index 5eb8b83a..d507248f 100644 --- a/pkg/runtime/collections/unique.go +++ b/pkg/runtime/collections/unique.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" ) diff --git a/pkg/runtime/collections/unique_test.go b/pkg/runtime/collections/unique_test.go index d250e19d..ec56b85c 100644 --- a/pkg/runtime/collections/unique_test.go +++ b/pkg/runtime/collections/unique_test.go @@ -2,11 +2,12 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestUniqueIterator(t *testing.T) { diff --git a/pkg/runtime/collections/while_pre_test.go b/pkg/runtime/collections/while_pre_test.go index e62e75f7..4c936004 100644 --- a/pkg/runtime/collections/while_pre_test.go +++ b/pkg/runtime/collections/while_pre_test.go @@ -2,9 +2,10 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/runtime/collections/while_test.go b/pkg/runtime/collections/while_test.go index 9e5b63a6..97295b60 100644 --- a/pkg/runtime/collections/while_test.go +++ b/pkg/runtime/collections/while_test.go @@ -2,9 +2,10 @@ package collections_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/runtime/core/type_test.go b/pkg/runtime/core/type_test.go index 6f6619a4..801bc145 100644 --- a/pkg/runtime/core/type_test.go +++ b/pkg/runtime/core/type_test.go @@ -1,9 +1,10 @@ package core_test import ( + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" . "github.com/smartystreets/goconvey/convey" - "testing" ) type ( diff --git a/pkg/runtime/events/observable.go b/pkg/runtime/events/observable.go index c8eb18e1..329fb87b 100644 --- a/pkg/runtime/events/observable.go +++ b/pkg/runtime/events/observable.go @@ -2,6 +2,7 @@ package events import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/block.go b/pkg/runtime/expressions/block.go index 4a74cf48..46e09fea 100644 --- a/pkg/runtime/expressions/block.go +++ b/pkg/runtime/expressions/block.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/runtime/expressions/block_test.go b/pkg/runtime/expressions/block_test.go index b3a02fd1..928348c2 100644 --- a/pkg/runtime/expressions/block_test.go +++ b/pkg/runtime/expressions/block_test.go @@ -2,9 +2,10 @@ package expressions_test import ( "context" - "github.com/MontFerret/ferret/pkg/runtime/collections" "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/expressions" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/runtime/expressions/body.go b/pkg/runtime/expressions/body.go index b9a2cdfa..c70fca27 100644 --- a/pkg/runtime/expressions/body.go +++ b/pkg/runtime/expressions/body.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/clauses/filter.go b/pkg/runtime/expressions/clauses/filter.go index a1e5e736..0d15a2a8 100644 --- a/pkg/runtime/expressions/clauses/filter.go +++ b/pkg/runtime/expressions/clauses/filter.go @@ -2,6 +2,7 @@ package clauses import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/runtime/expressions/clauses/sort.go b/pkg/runtime/expressions/clauses/sort.go index dd9c2233..a66242f8 100644 --- a/pkg/runtime/expressions/clauses/sort.go +++ b/pkg/runtime/expressions/clauses/sort.go @@ -2,6 +2,7 @@ package clauses import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" ) diff --git a/pkg/runtime/expressions/condition.go b/pkg/runtime/expressions/condition.go index ea09ab8c..10e0f08f 100644 --- a/pkg/runtime/expressions/condition.go +++ b/pkg/runtime/expressions/condition.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/for.go b/pkg/runtime/expressions/for.go index a1751dd3..7e4c364b 100644 --- a/pkg/runtime/expressions/for.go +++ b/pkg/runtime/expressions/for.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/expressions/clauses" diff --git a/pkg/runtime/expressions/func_call.go b/pkg/runtime/expressions/func_call.go index 39b88cd6..87517f3e 100644 --- a/pkg/runtime/expressions/func_call.go +++ b/pkg/runtime/expressions/func_call.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/func_call_test.go b/pkg/runtime/expressions/func_call_test.go index fc8b4ecf..fb46a111 100644 --- a/pkg/runtime/expressions/func_call_test.go +++ b/pkg/runtime/expressions/func_call_test.go @@ -2,12 +2,13 @@ package expressions_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/expressions" "github.com/MontFerret/ferret/pkg/runtime/expressions/literals" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/runtime/values/types" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/runtime/expressions/literals/array.go b/pkg/runtime/expressions/literals/array.go index 5a75740c..5a8b4c5d 100644 --- a/pkg/runtime/expressions/literals/array.go +++ b/pkg/runtime/expressions/literals/array.go @@ -2,6 +2,7 @@ package literals import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/literals/boolean.go b/pkg/runtime/expressions/literals/boolean.go index 66b6a4c5..ad9c59ca 100644 --- a/pkg/runtime/expressions/literals/boolean.go +++ b/pkg/runtime/expressions/literals/boolean.go @@ -2,6 +2,7 @@ package literals import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/literals/float.go b/pkg/runtime/expressions/literals/float.go index aa22730c..619f8bda 100644 --- a/pkg/runtime/expressions/literals/float.go +++ b/pkg/runtime/expressions/literals/float.go @@ -2,6 +2,7 @@ package literals import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/literals/int.go b/pkg/runtime/expressions/literals/int.go index 6ef43712..81dcecf2 100644 --- a/pkg/runtime/expressions/literals/int.go +++ b/pkg/runtime/expressions/literals/int.go @@ -2,6 +2,7 @@ package literals import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/literals/none.go b/pkg/runtime/expressions/literals/none.go index b224d832..c56ec00f 100644 --- a/pkg/runtime/expressions/literals/none.go +++ b/pkg/runtime/expressions/literals/none.go @@ -2,6 +2,7 @@ package literals import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/literals/string.go b/pkg/runtime/expressions/literals/string.go index 7a5b4a28..e69d0775 100644 --- a/pkg/runtime/expressions/literals/string.go +++ b/pkg/runtime/expressions/literals/string.go @@ -2,6 +2,7 @@ package literals import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/member.go b/pkg/runtime/expressions/member.go index 5c7e6244..23f76c07 100644 --- a/pkg/runtime/expressions/member.go +++ b/pkg/runtime/expressions/member.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/pkg/errors" "github.com/MontFerret/ferret/pkg/runtime/core" diff --git a/pkg/runtime/expressions/member_test.go b/pkg/runtime/expressions/member_test.go index 1dbd5e08..38150720 100644 --- a/pkg/runtime/expressions/member_test.go +++ b/pkg/runtime/expressions/member_test.go @@ -2,12 +2,13 @@ package expressions_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/expressions" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/runtime/values/types" "github.com/stretchr/testify/mock" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/runtime/expressions/operators/math.go b/pkg/runtime/expressions/operators/math.go index 9b43e6b0..66877a8f 100644 --- a/pkg/runtime/expressions/operators/math.go +++ b/pkg/runtime/expressions/operators/math.go @@ -2,6 +2,7 @@ package operators import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/operators/operator_test.go b/pkg/runtime/expressions/operators/operator_test.go index 04624b38..dbf795ec 100644 --- a/pkg/runtime/expressions/operators/operator_test.go +++ b/pkg/runtime/expressions/operators/operator_test.go @@ -1,10 +1,11 @@ package operators_test import ( + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/expressions/operators" "github.com/MontFerret/ferret/pkg/runtime/values" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/runtime/expressions/operators/regexp.go b/pkg/runtime/expressions/operators/regexp.go index 1ecb6160..7de59d85 100644 --- a/pkg/runtime/expressions/operators/regexp.go +++ b/pkg/runtime/expressions/operators/regexp.go @@ -2,9 +2,10 @@ package operators import ( "context" + "regexp" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" - "regexp" ) type ( diff --git a/pkg/runtime/expressions/param.go b/pkg/runtime/expressions/param.go index bc1a7bd8..69d0d589 100644 --- a/pkg/runtime/expressions/param.go +++ b/pkg/runtime/expressions/param.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/return.go b/pkg/runtime/expressions/return.go index f079c69e..34d4c894 100644 --- a/pkg/runtime/expressions/return.go +++ b/pkg/runtime/expressions/return.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/variable.go b/pkg/runtime/expressions/variable.go index 098aeedc..825cb1a2 100644 --- a/pkg/runtime/expressions/variable.go +++ b/pkg/runtime/expressions/variable.go @@ -2,6 +2,7 @@ package expressions import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/runtime/expressions/waitfor_event.go b/pkg/runtime/expressions/waitfor_event.go index 30e3ab0b..ab2a23dc 100644 --- a/pkg/runtime/expressions/waitfor_event.go +++ b/pkg/runtime/expressions/waitfor_event.go @@ -2,9 +2,10 @@ package expressions import ( "context" + "time" + "github.com/MontFerret/ferret/pkg/runtime/events" "github.com/MontFerret/ferret/pkg/runtime/values/types" - "time" "github.com/pkg/errors" diff --git a/pkg/runtime/expressions/waitfor_event_test.go b/pkg/runtime/expressions/waitfor_event_test.go index fafc68eb..bea6f5e6 100644 --- a/pkg/runtime/expressions/waitfor_event_test.go +++ b/pkg/runtime/expressions/waitfor_event_test.go @@ -2,12 +2,13 @@ package expressions_test import ( "context" + "testing" + "time" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/events" "github.com/MontFerret/ferret/pkg/runtime/expressions" "github.com/MontFerret/ferret/pkg/runtime/expressions/literals" - "testing" - "time" . "github.com/smartystreets/goconvey/convey" diff --git a/pkg/runtime/program_test.go b/pkg/runtime/program_test.go index 00920e3a..5701812a 100644 --- a/pkg/runtime/program_test.go +++ b/pkg/runtime/program_test.go @@ -2,10 +2,11 @@ package runtime_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/compiler" "github.com/MontFerret/ferret/pkg/runtime/core" . "github.com/smartystreets/goconvey/convey" - "testing" ) type Result struct { diff --git a/pkg/runtime/values/boolean_test.go b/pkg/runtime/values/boolean_test.go index e2d3ef2e..201271b1 100644 --- a/pkg/runtime/values/boolean_test.go +++ b/pkg/runtime/values/boolean_test.go @@ -1,11 +1,12 @@ package values_test import ( + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/runtime/values/types" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestBoolean(t *testing.T) { diff --git a/pkg/runtime/values/date_time_test.go b/pkg/runtime/values/date_time_test.go index 095c4a33..8bad81c7 100644 --- a/pkg/runtime/values/date_time_test.go +++ b/pkg/runtime/values/date_time_test.go @@ -2,10 +2,11 @@ package values_test import ( "encoding/json" - "github.com/MontFerret/ferret/pkg/runtime/values" - . "github.com/smartystreets/goconvey/convey" "testing" "time" + + "github.com/MontFerret/ferret/pkg/runtime/values" + . "github.com/smartystreets/goconvey/convey" ) func TestDateTime(t *testing.T) { diff --git a/pkg/runtime/values/float_test.go b/pkg/runtime/values/float_test.go index 21fee9ad..231cf33f 100644 --- a/pkg/runtime/values/float_test.go +++ b/pkg/runtime/values/float_test.go @@ -2,9 +2,10 @@ package values_test import ( "encoding/json" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestFloat(t *testing.T) { diff --git a/pkg/runtime/values/helpers_test.go b/pkg/runtime/values/helpers_test.go index 5340efb8..d1b0b241 100644 --- a/pkg/runtime/values/helpers_test.go +++ b/pkg/runtime/values/helpers_test.go @@ -3,9 +3,10 @@ package values_test import ( "context" "encoding/json" - "github.com/MontFerret/ferret/pkg/runtime/values/types" "testing" + "github.com/MontFerret/ferret/pkg/runtime/values/types" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/runtime/values/int_test.go b/pkg/runtime/values/int_test.go index 16aa27dd..d214b37a 100644 --- a/pkg/runtime/values/int_test.go +++ b/pkg/runtime/values/int_test.go @@ -2,9 +2,10 @@ package values_test import ( "encoding/json" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestInt(t *testing.T) { diff --git a/pkg/runtime/values/string_test.go b/pkg/runtime/values/string_test.go index c33e0329..83979efd 100644 --- a/pkg/runtime/values/string_test.go +++ b/pkg/runtime/values/string_test.go @@ -3,9 +3,10 @@ package values_test import ( "encoding/json" "fmt" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestString(t *testing.T) { diff --git a/pkg/runtime/values/types/helpers_test.go b/pkg/runtime/values/types/helpers_test.go index a160f38a..22186456 100644 --- a/pkg/runtime/values/types/helpers_test.go +++ b/pkg/runtime/values/types/helpers_test.go @@ -1,10 +1,11 @@ package types_test import ( + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values/types" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestHelpers(t *testing.T) { diff --git a/pkg/runtime/values/types/types_test.go b/pkg/runtime/values/types/types_test.go index 72b571e6..f16d219e 100644 --- a/pkg/runtime/values/types/types_test.go +++ b/pkg/runtime/values/types/types_test.go @@ -1,10 +1,11 @@ package types_test import ( + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values/types" . "github.com/smartystreets/goconvey/convey" - "testing" ) type TestValue struct { diff --git a/pkg/stdlib/arrays/append_test.go b/pkg/stdlib/arrays/append_test.go index 8445be78..ea88d390 100644 --- a/pkg/stdlib/arrays/append_test.go +++ b/pkg/stdlib/arrays/append_test.go @@ -2,11 +2,12 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/collections" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestAppend(t *testing.T) { diff --git a/pkg/stdlib/arrays/first_test.go b/pkg/stdlib/arrays/first_test.go index 80e1ec94..fbab7b09 100644 --- a/pkg/stdlib/arrays/first_test.go +++ b/pkg/stdlib/arrays/first_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestFirst(t *testing.T) { diff --git a/pkg/stdlib/arrays/flatten_test.go b/pkg/stdlib/arrays/flatten_test.go index 176bb453..55658d34 100644 --- a/pkg/stdlib/arrays/flatten_test.go +++ b/pkg/stdlib/arrays/flatten_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestFlatten(t *testing.T) { diff --git a/pkg/stdlib/arrays/intersection_test.go b/pkg/stdlib/arrays/intersection_test.go index d370cd52..1f4b9160 100644 --- a/pkg/stdlib/arrays/intersection_test.go +++ b/pkg/stdlib/arrays/intersection_test.go @@ -2,11 +2,12 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestIntersection(t *testing.T) { diff --git a/pkg/stdlib/arrays/last_test.go b/pkg/stdlib/arrays/last_test.go index 2f8b6945..63653e45 100644 --- a/pkg/stdlib/arrays/last_test.go +++ b/pkg/stdlib/arrays/last_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLast(t *testing.T) { diff --git a/pkg/stdlib/arrays/minus_test.go b/pkg/stdlib/arrays/minus_test.go index d075c808..d63191ef 100644 --- a/pkg/stdlib/arrays/minus_test.go +++ b/pkg/stdlib/arrays/minus_test.go @@ -2,11 +2,12 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestMinus(t *testing.T) { diff --git a/pkg/stdlib/arrays/nth_test.go b/pkg/stdlib/arrays/nth_test.go index 396a4a16..bde96da1 100644 --- a/pkg/stdlib/arrays/nth_test.go +++ b/pkg/stdlib/arrays/nth_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestNth(t *testing.T) { diff --git a/pkg/stdlib/arrays/outersection_test.go b/pkg/stdlib/arrays/outersection_test.go index fc8382f6..a4b58aaf 100644 --- a/pkg/stdlib/arrays/outersection_test.go +++ b/pkg/stdlib/arrays/outersection_test.go @@ -2,11 +2,12 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestOutersection(t *testing.T) { diff --git a/pkg/stdlib/arrays/pop_test.go b/pkg/stdlib/arrays/pop_test.go index f3806a19..0bef66af 100644 --- a/pkg/stdlib/arrays/pop_test.go +++ b/pkg/stdlib/arrays/pop_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestPop(t *testing.T) { diff --git a/pkg/stdlib/arrays/position_test.go b/pkg/stdlib/arrays/position_test.go index c29fbe1c..924114e0 100644 --- a/pkg/stdlib/arrays/position_test.go +++ b/pkg/stdlib/arrays/position_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestPosition(t *testing.T) { diff --git a/pkg/stdlib/arrays/push_test.go b/pkg/stdlib/arrays/push_test.go index c5f246b9..745f5b8e 100644 --- a/pkg/stdlib/arrays/push_test.go +++ b/pkg/stdlib/arrays/push_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestPush(t *testing.T) { diff --git a/pkg/stdlib/arrays/remove_nth_test.go b/pkg/stdlib/arrays/remove_nth_test.go index 5f7eb983..ef5d5ab0 100644 --- a/pkg/stdlib/arrays/remove_nth_test.go +++ b/pkg/stdlib/arrays/remove_nth_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRemoveNth(t *testing.T) { diff --git a/pkg/stdlib/arrays/remove_value_test.go b/pkg/stdlib/arrays/remove_value_test.go index a841127e..c1434681 100644 --- a/pkg/stdlib/arrays/remove_value_test.go +++ b/pkg/stdlib/arrays/remove_value_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRemoveValue(t *testing.T) { diff --git a/pkg/stdlib/arrays/remove_values_test.go b/pkg/stdlib/arrays/remove_values_test.go index 854abd1d..b8d5ea99 100644 --- a/pkg/stdlib/arrays/remove_values_test.go +++ b/pkg/stdlib/arrays/remove_values_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRemoveValues(t *testing.T) { diff --git a/pkg/stdlib/arrays/shift_test.go b/pkg/stdlib/arrays/shift_test.go index 8ab5522a..a89448d7 100644 --- a/pkg/stdlib/arrays/shift_test.go +++ b/pkg/stdlib/arrays/shift_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestShift(t *testing.T) { diff --git a/pkg/stdlib/arrays/slice_test.go b/pkg/stdlib/arrays/slice_test.go index fa3e9cf4..e7deca40 100644 --- a/pkg/stdlib/arrays/slice_test.go +++ b/pkg/stdlib/arrays/slice_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestSlice(t *testing.T) { diff --git a/pkg/stdlib/arrays/sorted_test.go b/pkg/stdlib/arrays/sorted_test.go index 10510098..e8cab8a2 100644 --- a/pkg/stdlib/arrays/sorted_test.go +++ b/pkg/stdlib/arrays/sorted_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestSorted(t *testing.T) { diff --git a/pkg/stdlib/arrays/sorted_unique_test.go b/pkg/stdlib/arrays/sorted_unique_test.go index fa447cea..daf792d6 100644 --- a/pkg/stdlib/arrays/sorted_unique_test.go +++ b/pkg/stdlib/arrays/sorted_unique_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestSortedUnique(t *testing.T) { diff --git a/pkg/stdlib/arrays/union_distinct_test.go b/pkg/stdlib/arrays/union_distinct_test.go index ef7b88bb..3c95d58e 100644 --- a/pkg/stdlib/arrays/union_distinct_test.go +++ b/pkg/stdlib/arrays/union_distinct_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestUnionDistinct(t *testing.T) { diff --git a/pkg/stdlib/arrays/unique_test.go b/pkg/stdlib/arrays/unique_test.go index 3d6a960f..2952dac1 100644 --- a/pkg/stdlib/arrays/unique_test.go +++ b/pkg/stdlib/arrays/unique_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestUnique(t *testing.T) { diff --git a/pkg/stdlib/arrays/unshift_test.go b/pkg/stdlib/arrays/unshift_test.go index dedca0fd..037941bc 100644 --- a/pkg/stdlib/arrays/unshift_test.go +++ b/pkg/stdlib/arrays/unshift_test.go @@ -2,10 +2,11 @@ package arrays_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/arrays" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestUnshift(t *testing.T) { diff --git a/pkg/stdlib/collections/reverse.go b/pkg/stdlib/collections/reverse.go index cc1bdc3a..01b77197 100644 --- a/pkg/stdlib/collections/reverse.go +++ b/pkg/stdlib/collections/reverse.go @@ -2,6 +2,7 @@ package collections import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/values/types" "github.com/MontFerret/ferret/pkg/runtime/core" diff --git a/pkg/stdlib/html/attr_set.go b/pkg/stdlib/html/attr_set.go index 728d4a9e..138050ba 100644 --- a/pkg/stdlib/html/attr_set.go +++ b/pkg/stdlib/html/attr_set.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/drivers/common" "github.com/MontFerret/ferret/pkg/drivers" diff --git a/pkg/stdlib/html/blur.go b/pkg/stdlib/html/blur.go index 22c619b1..9fbda5f7 100644 --- a/pkg/stdlib/html/blur.go +++ b/pkg/stdlib/html/blur.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/stdlib/html/document.go b/pkg/stdlib/html/document.go index 524089ff..a2f772bc 100644 --- a/pkg/stdlib/html/document.go +++ b/pkg/stdlib/html/document.go @@ -2,10 +2,11 @@ package html import ( "context" - "github.com/pkg/errors" "strings" "time" + "github.com/pkg/errors" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/drivers/cdp" "github.com/MontFerret/ferret/pkg/runtime/core" diff --git a/pkg/stdlib/html/find_frames.go b/pkg/stdlib/html/find_frames.go index 14e9129d..77af5540 100644 --- a/pkg/stdlib/html/find_frames.go +++ b/pkg/stdlib/html/find_frames.go @@ -2,10 +2,11 @@ package html import ( "context" + "regexp" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" - "regexp" ) // FRAMES finds HTML frames by a given property selector. diff --git a/pkg/stdlib/html/input.go b/pkg/stdlib/html/input.go index 8d4a954d..3b1a50ce 100644 --- a/pkg/stdlib/html/input.go +++ b/pkg/stdlib/html/input.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/stdlib/html/pagination.go b/pkg/stdlib/html/pagination.go index 8e158190..2fd1711b 100644 --- a/pkg/stdlib/html/pagination.go +++ b/pkg/stdlib/html/pagination.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/logging" diff --git a/pkg/stdlib/html/parse.go b/pkg/stdlib/html/parse.go index 110999ef..578ac676 100644 --- a/pkg/stdlib/html/parse.go +++ b/pkg/stdlib/html/parse.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/runtime/values/types" "github.com/pkg/errors" diff --git a/pkg/stdlib/html/press.go b/pkg/stdlib/html/press.go index 500468ea..c4c438f1 100644 --- a/pkg/stdlib/html/press.go +++ b/pkg/stdlib/html/press.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/drivers" "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" diff --git a/pkg/stdlib/html/press_selector.go b/pkg/stdlib/html/press_selector.go index b917b6a1..74bc491b 100644 --- a/pkg/stdlib/html/press_selector.go +++ b/pkg/stdlib/html/press_selector.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/values/types" "github.com/MontFerret/ferret/pkg/drivers" diff --git a/pkg/stdlib/html/wait_navigation.go b/pkg/stdlib/html/wait_navigation.go index b0cbe9ca..d864d7b1 100644 --- a/pkg/stdlib/html/wait_navigation.go +++ b/pkg/stdlib/html/wait_navigation.go @@ -2,6 +2,7 @@ package html import ( "context" + "github.com/pkg/errors" "github.com/MontFerret/ferret/pkg/drivers" diff --git a/pkg/stdlib/io/net/http/get_test.go b/pkg/stdlib/io/net/http/get_test.go index df82d026..e1857663 100644 --- a/pkg/stdlib/io/net/http/get_test.go +++ b/pkg/stdlib/io/net/http/get_test.go @@ -2,11 +2,12 @@ package http_test import ( "context" + h "net/http" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/runtime/values/types" "github.com/pkg/errors" - h "net/http" - "testing" . "github.com/smartystreets/goconvey/convey" diff --git a/pkg/stdlib/math/abs_test.go b/pkg/stdlib/math/abs_test.go index 8b13a166..fe936a70 100644 --- a/pkg/stdlib/math/abs_test.go +++ b/pkg/stdlib/math/abs_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/acos_test.go b/pkg/stdlib/math/acos_test.go index 526ac719..c2592515 100644 --- a/pkg/stdlib/math/acos_test.go +++ b/pkg/stdlib/math/acos_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/asin_test.go b/pkg/stdlib/math/asin_test.go index dd84a310..e29b7c17 100644 --- a/pkg/stdlib/math/asin_test.go +++ b/pkg/stdlib/math/asin_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/atan2_test.go b/pkg/stdlib/math/atan2_test.go index 29e421e1..6f71cd24 100644 --- a/pkg/stdlib/math/atan2_test.go +++ b/pkg/stdlib/math/atan2_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/atan_test.go b/pkg/stdlib/math/atan_test.go index 54323fab..4109c727 100644 --- a/pkg/stdlib/math/atan_test.go +++ b/pkg/stdlib/math/atan_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/average_test.go b/pkg/stdlib/math/average_test.go index 49d4a592..66e250d7 100644 --- a/pkg/stdlib/math/average_test.go +++ b/pkg/stdlib/math/average_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/ceil_test.go b/pkg/stdlib/math/ceil_test.go index bea49413..2db37cca 100644 --- a/pkg/stdlib/math/ceil_test.go +++ b/pkg/stdlib/math/ceil_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/cos_test.go b/pkg/stdlib/math/cos_test.go index 9d577acd..1b19f179 100644 --- a/pkg/stdlib/math/cos_test.go +++ b/pkg/stdlib/math/cos_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/degrees_test.go b/pkg/stdlib/math/degrees_test.go index 37ede9e4..5a6ee956 100644 --- a/pkg/stdlib/math/degrees_test.go +++ b/pkg/stdlib/math/degrees_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/exp2_test.go b/pkg/stdlib/math/exp2_test.go index 67536b01..7da4307b 100644 --- a/pkg/stdlib/math/exp2_test.go +++ b/pkg/stdlib/math/exp2_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/exp_test.go b/pkg/stdlib/math/exp_test.go index 23a92140..7a744e4a 100644 --- a/pkg/stdlib/math/exp_test.go +++ b/pkg/stdlib/math/exp_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/floor_test.go b/pkg/stdlib/math/floor_test.go index a215642c..eeccdc4e 100644 --- a/pkg/stdlib/math/floor_test.go +++ b/pkg/stdlib/math/floor_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/log10_test.go b/pkg/stdlib/math/log10_test.go index 10c14762..b8ad45fe 100644 --- a/pkg/stdlib/math/log10_test.go +++ b/pkg/stdlib/math/log10_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/log2_test.go b/pkg/stdlib/math/log2_test.go index 61b674bd..051959e7 100644 --- a/pkg/stdlib/math/log2_test.go +++ b/pkg/stdlib/math/log2_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/log_test.go b/pkg/stdlib/math/log_test.go index a999e82c..74309fbd 100644 --- a/pkg/stdlib/math/log_test.go +++ b/pkg/stdlib/math/log_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/max_test.go b/pkg/stdlib/math/max_test.go index fc3b19a3..acc22e4c 100644 --- a/pkg/stdlib/math/max_test.go +++ b/pkg/stdlib/math/max_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/median_test.go b/pkg/stdlib/math/median_test.go index 6ba8c698..e0d9c3b4 100644 --- a/pkg/stdlib/math/median_test.go +++ b/pkg/stdlib/math/median_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/min_test.go b/pkg/stdlib/math/min_test.go index d5b7a732..351a612d 100644 --- a/pkg/stdlib/math/min_test.go +++ b/pkg/stdlib/math/min_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/percentile_test.go b/pkg/stdlib/math/percentile_test.go index 52641e42..30be990c 100644 --- a/pkg/stdlib/math/percentile_test.go +++ b/pkg/stdlib/math/percentile_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/pi_test.go b/pkg/stdlib/math/pi_test.go index 5acdcc10..e46103df 100644 --- a/pkg/stdlib/math/pi_test.go +++ b/pkg/stdlib/math/pi_test.go @@ -2,10 +2,11 @@ package math_test import ( "context" - "github.com/MontFerret/ferret/pkg/stdlib/math" - . "github.com/smartystreets/goconvey/convey" m "math" "testing" + + "github.com/MontFerret/ferret/pkg/stdlib/math" + . "github.com/smartystreets/goconvey/convey" ) func TestPi(t *testing.T) { diff --git a/pkg/stdlib/math/pow_test.go b/pkg/stdlib/math/pow_test.go index 3abee470..fa1ed64e 100644 --- a/pkg/stdlib/math/pow_test.go +++ b/pkg/stdlib/math/pow_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/radians_test.go b/pkg/stdlib/math/radians_test.go index 264f14cf..9f17b8eb 100644 --- a/pkg/stdlib/math/radians_test.go +++ b/pkg/stdlib/math/radians_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/rand_test.go b/pkg/stdlib/math/rand_test.go index 85ecf8a3..a0f1b7d3 100644 --- a/pkg/stdlib/math/rand_test.go +++ b/pkg/stdlib/math/rand_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/stdlib/math" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRand(t *testing.T) { diff --git a/pkg/stdlib/math/range_test.go b/pkg/stdlib/math/range_test.go index 539caef0..7f99ca39 100644 --- a/pkg/stdlib/math/range_test.go +++ b/pkg/stdlib/math/range_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/round_test.go b/pkg/stdlib/math/round_test.go index 8a6c068b..d225bee2 100644 --- a/pkg/stdlib/math/round_test.go +++ b/pkg/stdlib/math/round_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/sin_test.go b/pkg/stdlib/math/sin_test.go index d8298b19..d58a3a18 100644 --- a/pkg/stdlib/math/sin_test.go +++ b/pkg/stdlib/math/sin_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/sqrt_test.go b/pkg/stdlib/math/sqrt_test.go index 5bcfaa7c..cbbd4e24 100644 --- a/pkg/stdlib/math/sqrt_test.go +++ b/pkg/stdlib/math/sqrt_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/stddev_population_test.go b/pkg/stdlib/math/stddev_population_test.go index f3165bcf..326f4430 100644 --- a/pkg/stdlib/math/stddev_population_test.go +++ b/pkg/stdlib/math/stddev_population_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/stddev_sample_test.go b/pkg/stdlib/math/stddev_sample_test.go index c026c5cf..3d56b191 100644 --- a/pkg/stdlib/math/stddev_sample_test.go +++ b/pkg/stdlib/math/stddev_sample_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/sum_test.go b/pkg/stdlib/math/sum_test.go index 679ac933..f83af853 100644 --- a/pkg/stdlib/math/sum_test.go +++ b/pkg/stdlib/math/sum_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/tan_test.go b/pkg/stdlib/math/tan_test.go index 1e0a9fa6..88b9e8bc 100644 --- a/pkg/stdlib/math/tan_test.go +++ b/pkg/stdlib/math/tan_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/variance_population_test.go b/pkg/stdlib/math/variance_population_test.go index 86d0a7a6..1a25315a 100644 --- a/pkg/stdlib/math/variance_population_test.go +++ b/pkg/stdlib/math/variance_population_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/math/variance_sample_test.go b/pkg/stdlib/math/variance_sample_test.go index 0ac12996..409c7edd 100644 --- a/pkg/stdlib/math/variance_sample_test.go +++ b/pkg/stdlib/math/variance_sample_test.go @@ -2,9 +2,10 @@ package math_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/math" - "testing" . "github.com/smartystreets/goconvey/convey" ) diff --git a/pkg/stdlib/objects/keys_test.go b/pkg/stdlib/objects/keys_test.go index 266749ba..2f9353c6 100644 --- a/pkg/stdlib/objects/keys_test.go +++ b/pkg/stdlib/objects/keys_test.go @@ -2,9 +2,10 @@ package objects_test import ( "context" - "github.com/MontFerret/ferret/pkg/runtime/values/types" "testing" + "github.com/MontFerret/ferret/pkg/runtime/values/types" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/objects" diff --git a/pkg/stdlib/strings/case_test.go b/pkg/stdlib/strings/case_test.go index 390ce58a..2622a35d 100644 --- a/pkg/stdlib/strings/case_test.go +++ b/pkg/stdlib/strings/case_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLower(t *testing.T) { diff --git a/pkg/stdlib/strings/concat_test.go b/pkg/stdlib/strings/concat_test.go index b6a9547d..b8c99094 100644 --- a/pkg/stdlib/strings/concat_test.go +++ b/pkg/stdlib/strings/concat_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestConcat(t *testing.T) { diff --git a/pkg/stdlib/strings/contains_test.go b/pkg/stdlib/strings/contains_test.go index d8d545ae..5d27f9b7 100644 --- a/pkg/stdlib/strings/contains_test.go +++ b/pkg/stdlib/strings/contains_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestContains(t *testing.T) { diff --git a/pkg/stdlib/strings/encode_test.go b/pkg/stdlib/strings/encode_test.go index 16490310..a3dad554 100644 --- a/pkg/stdlib/strings/encode_test.go +++ b/pkg/stdlib/strings/encode_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestEncodedURIComponent(t *testing.T) { diff --git a/pkg/stdlib/strings/escape_test.go b/pkg/stdlib/strings/escape_test.go index 07824d6d..5dce98cf 100644 --- a/pkg/stdlib/strings/escape_test.go +++ b/pkg/stdlib/strings/escape_test.go @@ -2,9 +2,10 @@ package strings_test import ( "context" - "github.com/MontFerret/ferret/pkg/runtime/values" "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" + "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" diff --git a/pkg/stdlib/strings/find_test.go b/pkg/stdlib/strings/find_test.go index 483a383b..707363d1 100644 --- a/pkg/stdlib/strings/find_test.go +++ b/pkg/stdlib/strings/find_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestFindFirst(t *testing.T) { diff --git a/pkg/stdlib/strings/random_test.go b/pkg/stdlib/strings/random_test.go index c8418ec3..1b3cc6f5 100644 --- a/pkg/stdlib/strings/random_test.go +++ b/pkg/stdlib/strings/random_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRandomToken(t *testing.T) { diff --git a/pkg/stdlib/strings/regex_test.go b/pkg/stdlib/strings/regex_test.go index 2d82e346..b709cf92 100644 --- a/pkg/stdlib/strings/regex_test.go +++ b/pkg/stdlib/strings/regex_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestRegexMatch(t *testing.T) { diff --git a/pkg/stdlib/strings/split_test.go b/pkg/stdlib/strings/split_test.go index 96bc55d7..ece4c51d 100644 --- a/pkg/stdlib/strings/split_test.go +++ b/pkg/stdlib/strings/split_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestSplit(t *testing.T) { diff --git a/pkg/stdlib/strings/substitute_test.go b/pkg/stdlib/strings/substitute_test.go index 0d5f7826..39098a03 100644 --- a/pkg/stdlib/strings/substitute_test.go +++ b/pkg/stdlib/strings/substitute_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestSubstitute(t *testing.T) { diff --git a/pkg/stdlib/strings/trim_test.go b/pkg/stdlib/strings/trim_test.go index baebcd14..26728b2d 100644 --- a/pkg/stdlib/strings/trim_test.go +++ b/pkg/stdlib/strings/trim_test.go @@ -2,10 +2,11 @@ package strings_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestLTrim(t *testing.T) { diff --git a/pkg/stdlib/strings/unescape_test.go b/pkg/stdlib/strings/unescape_test.go index 0543ad8a..acba0be3 100644 --- a/pkg/stdlib/strings/unescape_test.go +++ b/pkg/stdlib/strings/unescape_test.go @@ -2,9 +2,10 @@ package strings_test import ( "context" - "github.com/MontFerret/ferret/pkg/runtime/values" "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" + "github.com/MontFerret/ferret/pkg/stdlib/strings" . "github.com/smartystreets/goconvey/convey" diff --git a/pkg/stdlib/testing/len_test.go b/pkg/stdlib/testing/len_test.go index 855a3824..b8a8fc2c 100644 --- a/pkg/stdlib/testing/len_test.go +++ b/pkg/stdlib/testing/len_test.go @@ -2,9 +2,10 @@ package testing_test import ( "context" - "github.com/MontFerret/ferret/pkg/stdlib/testing/base" t "testing" + "github.com/MontFerret/ferret/pkg/stdlib/testing/base" + . "github.com/smartystreets/goconvey/convey" "github.com/MontFerret/ferret/pkg/runtime/core" diff --git a/pkg/stdlib/testing/none_test.go b/pkg/stdlib/testing/none_test.go index 434c5abe..bee834d3 100644 --- a/pkg/stdlib/testing/none_test.go +++ b/pkg/stdlib/testing/none_test.go @@ -2,9 +2,10 @@ package testing_test import ( "context" + t "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/testing/base" - t "testing" . "github.com/smartystreets/goconvey/convey" diff --git a/pkg/stdlib/types/to_array.go b/pkg/stdlib/types/to_array.go index a65cb7bb..fb93b1d0 100644 --- a/pkg/stdlib/types/to_array.go +++ b/pkg/stdlib/types/to_array.go @@ -2,6 +2,7 @@ package types import ( "context" + "github.com/MontFerret/ferret/pkg/runtime/core" "github.com/MontFerret/ferret/pkg/runtime/values" ) diff --git a/pkg/stdlib/types/to_boolean_test.go b/pkg/stdlib/types/to_boolean_test.go index 5eb904d0..0a9a8555 100644 --- a/pkg/stdlib/types/to_boolean_test.go +++ b/pkg/stdlib/types/to_boolean_test.go @@ -2,10 +2,11 @@ package types_test import ( "context" + "testing" + "github.com/MontFerret/ferret/pkg/runtime/values" "github.com/MontFerret/ferret/pkg/stdlib/types" . "github.com/smartystreets/goconvey/convey" - "testing" ) func TestToBool(t *testing.T) {