From 61d1e7e6e901614dd9857d8bba3170efabaf1920 Mon Sep 17 00:00:00 2001 From: quobix Date: Mon, 15 Jun 2026 17:30:19 -0400 Subject: [PATCH] address issue #590 Also move to our own fork of testify. --- arazzo/coverage_test.go | 4 +- arazzo/criterion_test.go | 4 +- arazzo/engine_coverage_test.go | 8 +- arazzo/engine_test.go | 4 +- arazzo/expression/evaluator_test.go | 6 +- arazzo/expression/gap_coverage_test.go | 4 +- arazzo/expression/parser_test.go | 2 +- arazzo/final_coverage_test.go | 4 +- arazzo/gap_coverage_test.go | 6 +- arazzo/resolve_test.go | 4 +- arazzo/validation_test.go | 4 +- arazzo_test.go | 4 +- bundler/bundler_composer_test.go | 4 +- bundler/bundler_embedded_rootrefs_test.go | 4 +- bundler/bundler_issue873_test.go | 4 +- bundler/bundler_ref_rewrite_test.go | 4 +- bundler/bundler_strict_validation_test.go | 4 +- bundler/bundler_test.go | 4 +- bundler/composer_functions_test.go | 4 +- bundler/detect_type_test.go | 5 +- bundler/external_component_ref_test.go | 4 +- bundler/issue590_test.go | 137 ++++++++++++++++++ bundler/origin_test.go | 4 +- bundler/source_context_test.go | 4 +- datamodel/document_config_test.go | 2 +- datamodel/high/arazzo/arazzo_test.go | 4 +- datamodel/high/arazzo/build_helpers_test.go | 2 +- datamodel/high/arazzo/coverage_test.go | 4 +- datamodel/high/base/contact_test.go | 2 +- datamodel/high/base/discriminator_test.go | 2 +- datamodel/high/base/dynamic_value_test.go | 2 +- datamodel/high/base/example_test.go | 2 +- datamodel/high/base/external_doc_test.go | 2 +- datamodel/high/base/info_test.go | 2 +- datamodel/high/base/licence_test.go | 2 +- datamodel/high/base/schema_proxy_test.go | 4 +- datamodel/high/base/schema_renderzero_test.go | 2 +- datamodel/high/base/schema_test.go | 4 +- .../high/base/security_requirement_test.go | 2 +- datamodel/high/base/tag_test.go | 2 +- datamodel/high/base/xml_test.go | 2 +- datamodel/high/node_builder_test.go | 2 +- datamodel/high/overlay/action_test.go | 4 +- datamodel/high/overlay/info_test.go | 4 +- datamodel/high/overlay/overlay_test.go | 4 +- datamodel/high/shared.go | 21 +++ datamodel/high/shared_test.go | 89 +++++++++++- datamodel/high/v2/path_item_test.go | 2 +- datamodel/high/v2/swagger_test.go | 2 +- datamodel/high/v3/callback_test.go | 2 +- datamodel/high/v3/components_test.go | 4 +- datamodel/high/v3/document_test.go | 2 +- datamodel/high/v3/encoding_test.go | 2 +- datamodel/high/v3/header_test.go | 2 +- datamodel/high/v3/link_test.go | 2 +- .../high/v3/media_type_itemschema_test.go | 2 +- datamodel/high/v3/media_type_test.go | 2 +- datamodel/high/v3/oauth_flow_test.go | 2 +- datamodel/high/v3/oauth_flows_test.go | 2 +- datamodel/high/v3/operation_test.go | 2 +- datamodel/high/v3/parameter_test.go | 2 +- datamodel/high/v3/path_item_query_test.go | 2 +- datamodel/high/v3/path_item_test.go | 2 +- datamodel/high/v3/paths_test.go | 2 +- datamodel/high/v3/request_body_test.go | 2 +- datamodel/high/v3/response_test.go | 2 +- datamodel/high/v3/responses_test.go | 2 +- datamodel/high/v3/security_scheme_test.go | 2 +- datamodel/high/v3/server_test.go | 2 +- datamodel/high/v3/server_variable_test.go | 2 +- datamodel/low/arazzo/arazzo_test.go | 4 +- datamodel/low/arazzo/coverage_test.go | 4 +- datamodel/low/arazzo/final_coverage_test.go | 4 +- datamodel/low/arazzo/gap_coverage_test.go | 8 +- datamodel/low/base/circ_check_test.go | 2 +- datamodel/low/base/contact_test.go | 2 +- datamodel/low/base/context_test.go | 2 +- datamodel/low/base/discriminator_test.go | 2 +- datamodel/low/base/example_test.go | 4 +- datamodel/low/base/external_doc_test.go | 2 +- datamodel/low/base/info_test.go | 2 +- datamodel/low/base/license_test.go | 2 +- datamodel/low/base/property_merger_test.go | 2 +- .../low/base/schema_build_coverage_test.go | 4 +- .../low/base/schema_hash_coverage_test.go | 2 +- datamodel/low/base/schema_proxy_test.go | 4 +- datamodel/low/base/schema_test.go | 2 +- .../low/base/security_requirement_test.go | 2 +- .../low/base/sibling_ref_transformer_test.go | 4 +- datamodel/low/base/tag_test.go | 2 +- datamodel/low/base/xml_test.go | 2 +- datamodel/low/extraction_fragment_test.go | 4 +- datamodel/low/extraction_functions_test.go | 4 +- .../low/generate_hash_schema_proxy_test.go | 4 +- datamodel/low/hash_test.go | 2 +- datamodel/low/model_builder_test.go | 2 +- datamodel/low/node_map_merge_test.go | 4 +- datamodel/low/node_map_test.go | 2 +- datamodel/low/overlay/action_test.go | 4 +- datamodel/low/overlay/info_test.go | 4 +- datamodel/low/overlay/overlay_test.go | 4 +- datamodel/low/reference_test.go | 4 +- datamodel/low/v2/definitions_test.go | 2 +- datamodel/low/v2/examples_test.go | 2 +- datamodel/low/v2/header_test.go | 2 +- datamodel/low/v2/items_test.go | 2 +- datamodel/low/v2/operation_test.go | 2 +- datamodel/low/v2/parameter_test.go | 2 +- datamodel/low/v2/path_item_test.go | 2 +- datamodel/low/v2/paths_test.go | 2 +- datamodel/low/v2/response_test.go | 2 +- datamodel/low/v2/responses_test.go | 2 +- datamodel/low/v2/scopes_test.go | 2 +- datamodel/low/v2/security_scheme_test.go | 2 +- datamodel/low/v2/swagger_test.go | 4 +- datamodel/low/v3/callback_test.go | 2 +- ...component_value_reference_coverage_test.go | 4 +- datamodel/low/v3/components_test.go | 2 +- datamodel/low/v3/create_document_test.go | 4 +- datamodel/low/v3/encoding_test.go | 2 +- datamodel/low/v3/header_test.go | 4 +- datamodel/low/v3/link_test.go | 2 +- .../low/v3/media_type_itemschema_test.go | 2 +- datamodel/low/v3/media_type_test.go | 2 +- datamodel/low/v3/oauth_flows_test.go | 2 +- datamodel/low/v3/operation_test.go | 2 +- datamodel/low/v3/parameter_test.go | 4 +- datamodel/low/v3/path_item_query_test.go | 2 +- datamodel/low/v3/path_item_test.go | 2 +- datamodel/low/v3/paths_test.go | 2 +- datamodel/low/v3/request_body_test.go | 2 +- datamodel/low/v3/response_test.go | 4 +- datamodel/low/v3/security_scheme_test.go | 2 +- datamodel/low/v3/server_test.go | 2 +- datamodel/spec_info_duplicate_keys_test.go | 4 +- datamodel/spec_info_lazy_json_test.go | 4 +- datamodel/spec_info_test.go | 2 +- datamodel/translate_coverage_test.go | 4 +- datamodel/translate_test.go | 4 +- document_examples_test.go | 2 +- document_iteration_test.go | 2 +- document_test.go | 4 +- go.mod | 7 +- go.sum | 12 +- index/cache_test.go | 2 +- index/cache_test/docusign_test.go | 2 +- index/circular_reference_result_test.go | 2 +- index/enhanced_coverage_test.go | 4 +- index/extract_refs_test.go | 4 +- index/find_component_test.go | 2 +- index/index_model_test.go | 2 +- index/inline_collector_parity_test.go | 4 +- index/issue361_test.go | 4 +- index/issue438_test.go | 4 +- index/map_index_nodes_test.go | 2 +- index/path_resolution_test.go | 4 +- index/resolve_reference_value_test.go | 2 +- index/resolve_refs_node_test.go | 2 +- index/resolver_test.go | 2 +- index/rolodex_file_loader_test.go | 2 +- index/rolodex_fscompat_test.go | 4 +- index/rolodex_ref_extractor_test.go | 2 +- index/rolodex_remote_loader_deep_test.go | 2 +- index/rolodex_remote_loader_test.go | 2 +- index/rolodex_test.go | 2 +- index/schema_id_test.go | 2 +- index/search_index_test.go | 2 +- index/search_rolodex_test.go | 4 +- index/skip_metadata_collection_test.go | 4 +- index/spec_index_test.go | 2 +- index/tag_circular_references_test.go | 2 +- index/utility_methods_buffer_test.go | 2 +- index/utility_methods_test.go | 2 +- json/json_test.go | 4 +- orderedmap/builder_test.go | 2 +- orderedmap/orderedmap_test.go | 4 +- overlay/engine_test.go | 4 +- overlay/validation_test.go | 2 +- overlay_test.go | 4 +- renderer/mock_generation_options_test.go | 4 +- renderer/mock_generator_test.go | 4 +- renderer/mock_generator_xml_test.go | 4 +- renderer/mock_value_renderer_test.go | 2 +- renderer/schema_renderer_test.go | 2 +- tests/integration_sibling_refs_test.go | 2 +- tests/issue438_integration_test.go | 2 +- tests/sibling_refs_bench_test.go | 2 +- tests/what_changed_sibling_refs_test.go | 2 +- utils/component_id_golden_test.go | 4 +- utils/jsonpath_fastpath_test.go | 4 +- utils/nodes_test.go | 2 +- utils/type_check_test.go | 2 +- utils/unwrap_errors_test.go | 2 +- utils/utils_test.go | 4 +- .../model/breaking_rules_config_test.go | 4 +- what-changed/model/breaking_rules_test.go | 2 +- what-changed/model/callback_test.go | 2 +- what-changed/model/change_types_test.go | 2 +- .../model/comparison_functions_test.go | 2 +- what-changed/model/components_test.go | 2 +- what-changed/model/contact_test.go | 2 +- what-changed/model/discriminator_test.go | 2 +- what-changed/model/document_test.go | 2 +- what-changed/model/encoding_test.go | 2 +- what-changed/model/example_test.go | 2 +- what-changed/model/examples_test.go | 2 +- what-changed/model/extensions_test.go | 2 +- what-changed/model/external_docs_test.go | 2 +- what-changed/model/header_test.go | 2 +- what-changed/model/info_test.go | 2 +- what-changed/model/items_test.go | 2 +- what-changed/model/license_test.go | 2 +- what-changed/model/link_test.go | 2 +- what-changed/model/media_type_test.go | 2 +- what-changed/model/nil_checks_test.go | 2 +- what-changed/model/oauth_flows_test.go | 2 +- .../model/openapi32_breaking_rules_test.go | 2 +- what-changed/model/operation_test.go | 2 +- what-changed/model/parameter_test.go | 2 +- what-changed/model/path_item_query_test.go | 2 +- what-changed/model/path_item_test.go | 2 +- what-changed/model/paths_test.go | 2 +- what-changed/model/request_body_test.go | 2 +- what-changed/model/response_test.go | 2 +- what-changed/model/responses_test.go | 2 +- what-changed/model/schema_test.go | 2 +- what-changed/model/scopes_test.go | 2 +- .../model/security_requirement_test.go | 2 +- what-changed/model/security_scheme_test.go | 2 +- what-changed/model/server_test.go | 2 +- what-changed/model/server_variable_test.go | 2 +- what-changed/model/tags_test.go | 2 +- what-changed/model/xml_test.go | 2 +- what-changed/reports/summary_test.go | 2 +- what-changed/what_changed_test.go | 2 +- 235 files changed, 562 insertions(+), 331 deletions(-) create mode 100644 bundler/issue590_test.go diff --git a/arazzo/coverage_test.go b/arazzo/coverage_test.go index 65d2ff8b2..f54a4af9f 100644 --- a/arazzo/coverage_test.go +++ b/arazzo/coverage_test.go @@ -18,8 +18,8 @@ import ( high "github.com/pb33f/libopenapi/datamodel/high/arazzo" v3high "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/arazzo/criterion_test.go b/arazzo/criterion_test.go index f8b448639..85e219b4f 100644 --- a/arazzo/criterion_test.go +++ b/arazzo/criterion_test.go @@ -8,8 +8,8 @@ import ( "github.com/pb33f/libopenapi/arazzo/expression" high "github.com/pb33f/libopenapi/datamodel/high/arazzo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestEvaluateCriterion_SimpleCondition_StatusCodeComparison(t *testing.T) { diff --git a/arazzo/engine_coverage_test.go b/arazzo/engine_coverage_test.go index 5b680e907..a08f7a06a 100644 --- a/arazzo/engine_coverage_test.go +++ b/arazzo/engine_coverage_test.go @@ -19,8 +19,8 @@ import ( high "github.com/pb33f/libopenapi/datamodel/high/arazzo" v3high "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) @@ -2067,8 +2067,8 @@ func TestFetchSourceBytes_WindowsDriveInHost(t *testing.T) { driveAndPath := filepath.ToSlash(testFile) fakeURL := &url.URL{ Scheme: "file", - Host: driveAndPath[:2], // e.g. "/p" on Unix, "C:" on Windows - Path: driveAndPath[2:], // rest of path + Host: driveAndPath[:2], // e.g. "/p" on Unix, "C:" on Windows + Path: driveAndPath[2:], // rest of path } // This only works as a Windows drive when Host is like "X:" (letter + colon). diff --git a/arazzo/engine_test.go b/arazzo/engine_test.go index 3399d50be..71fcee9ae 100644 --- a/arazzo/engine_test.go +++ b/arazzo/engine_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/arazzo/expression" high "github.com/pb33f/libopenapi/datamodel/high/arazzo" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/arazzo/expression/evaluator_test.go b/arazzo/expression/evaluator_test.go index 2a8065231..4094e83eb 100644 --- a/arazzo/expression/evaluator_test.go +++ b/arazzo/expression/evaluator_test.go @@ -6,7 +6,7 @@ package expression import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) @@ -56,8 +56,8 @@ nested: a~c: tilde `), ResponseHeaders: map[string]string{ - "Content-Type": "application/json", - "X-Request-Id": "req-999", + "Content-Type": "application/json", + "X-Request-Id": "req-999", }, ResponseBody: buildYAMLNode(t, `results: - id: 1 diff --git a/arazzo/expression/gap_coverage_test.go b/arazzo/expression/gap_coverage_test.go index f41989d83..a72b0e77a 100644 --- a/arazzo/expression/gap_coverage_test.go +++ b/arazzo/expression/gap_coverage_test.go @@ -6,8 +6,8 @@ package expression import ( "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/arazzo/expression/parser_test.go b/arazzo/expression/parser_test.go index 32522005c..fde36b2b0 100644 --- a/arazzo/expression/parser_test.go +++ b/arazzo/expression/parser_test.go @@ -6,7 +6,7 @@ package expression import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) // --------------------------------------------------------------------------- diff --git a/arazzo/final_coverage_test.go b/arazzo/final_coverage_test.go index 6e7a2e4e4..03a1b349c 100644 --- a/arazzo/final_coverage_test.go +++ b/arazzo/final_coverage_test.go @@ -17,8 +17,8 @@ import ( "github.com/pb33f/libopenapi/arazzo/expression" high "github.com/pb33f/libopenapi/datamodel/high/arazzo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/arazzo/gap_coverage_test.go b/arazzo/gap_coverage_test.go index bb49f0e78..1867877a8 100644 --- a/arazzo/gap_coverage_test.go +++ b/arazzo/gap_coverage_test.go @@ -18,12 +18,12 @@ import ( "github.com/pb33f/libopenapi/arazzo/expression" high "github.com/pb33f/libopenapi/datamodel/high/arazzo" + v3high "github.com/pb33f/libopenapi/datamodel/high/v3" lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowarazzo "github.com/pb33f/libopenapi/datamodel/low/arazzo" - v3high "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/arazzo/resolve_test.go b/arazzo/resolve_test.go index f64c057c2..884f235dc 100644 --- a/arazzo/resolve_test.go +++ b/arazzo/resolve_test.go @@ -15,8 +15,8 @@ import ( high "github.com/pb33f/libopenapi/datamodel/high/arazzo" v3high "github.com/pb33f/libopenapi/datamodel/high/v3" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestResolveSources_PopulatesDocumentWithConfiguredFactories(t *testing.T) { diff --git a/arazzo/validation_test.go b/arazzo/validation_test.go index 684b3ee99..df7b4c715 100644 --- a/arazzo/validation_test.go +++ b/arazzo/validation_test.go @@ -12,8 +12,8 @@ import ( v3high "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/arazzo_test.go b/arazzo_test.go index 54c97093a..27cc5b3ef 100644 --- a/arazzo_test.go +++ b/arazzo_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowArazzo "github.com/pb33f/libopenapi/datamodel/low/arazzo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/bundler/bundler_composer_test.go b/bundler/bundler_composer_test.go index 3b10d81db..5479be2ce 100644 --- a/bundler/bundler_composer_test.go +++ b/bundler/bundler_composer_test.go @@ -19,8 +19,8 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/bundler/bundler_embedded_rootrefs_test.go b/bundler/bundler_embedded_rootrefs_test.go index 3fea84658..78cb206f2 100644 --- a/bundler/bundler_embedded_rootrefs_test.go +++ b/bundler/bundler_embedded_rootrefs_test.go @@ -6,8 +6,8 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/bundler/test/specs/rootrefs" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestBundleDocument_Embedded_RootRelativeRefs(t *testing.T) { diff --git a/bundler/bundler_issue873_test.go b/bundler/bundler_issue873_test.go index 3419b0bc1..744ac8715 100644 --- a/bundler/bundler_issue873_test.go +++ b/bundler/bundler_issue873_test.go @@ -10,8 +10,8 @@ import ( highbase "github.com/pb33f/libopenapi/datamodel/high/base" v3 "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/bundler/bundler_ref_rewrite_test.go b/bundler/bundler_ref_rewrite_test.go index 42be5040a..3e50dc54d 100644 --- a/bundler/bundler_ref_rewrite_test.go +++ b/bundler/bundler_ref_rewrite_test.go @@ -15,8 +15,8 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) // assertNoFilePathRefs checks that no file-path refs remain in the bundled output diff --git a/bundler/bundler_strict_validation_test.go b/bundler/bundler_strict_validation_test.go index ddf778fa8..0bf26b8b5 100644 --- a/bundler/bundler_strict_validation_test.go +++ b/bundler/bundler_strict_validation_test.go @@ -6,8 +6,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestStrictValidation_RefWithSiblings_ShouldError(t *testing.T) { diff --git a/bundler/bundler_test.go b/bundler/bundler_test.go index 4c8e0fdcc..ed67eefdc 100644 --- a/bundler/bundler_test.go +++ b/bundler/bundler_test.go @@ -27,8 +27,8 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/bundler/composer_functions_test.go b/bundler/composer_functions_test.go index 18771e79a..4fd2fa909 100644 --- a/bundler/composer_functions_test.go +++ b/bundler/composer_functions_test.go @@ -14,8 +14,8 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/bundler/detect_type_test.go b/bundler/detect_type_test.go index 5b8dc8287..114af6163 100644 --- a/bundler/detect_type_test.go +++ b/bundler/detect_type_test.go @@ -7,7 +7,7 @@ import ( "testing" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) @@ -712,7 +712,8 @@ func TestDetectOpenAPIComponentType_JSONSourced(t *testing.T) { // TestGetNodeKeys_UniformQuoting guards the detector's key-filter against JSON. When every // key in a mapping shares the same quote style, the style carries no intent to escape -// keywords, the filter only kicks in when styles are mixed within one mapping. +// +// keywords, the filter only kicks in when styles are mixed within one mapping. func TestGetNodeKeys_UniformQuoting(t *testing.T) { cases := []struct { name string diff --git a/bundler/external_component_ref_test.go b/bundler/external_component_ref_test.go index 56762f334..94c96e471 100644 --- a/bundler/external_component_ref_test.go +++ b/bundler/external_component_ref_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) // TestBundleDocument_ExternalParameterRef tests that external $ref in components.parameters diff --git a/bundler/issue590_test.go b/bundler/issue590_test.go new file mode 100644 index 000000000..4bdf6d555 --- /dev/null +++ b/bundler/issue590_test.go @@ -0,0 +1,137 @@ +// Copyright 2026 Princess Beef Heavy Industries / Dave Shanley +// SPDX-License-Identifier: MIT + +package bundler + +import ( + "context" + "log/slog" + "os" + "path/filepath" + "strings" + "sync" + "testing" + + "github.com/pb33f/libopenapi" + "github.com/pb33f/libopenapi/datamodel" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" +) + +type issue590LogCapture struct { + mu sync.Mutex + records []string +} + +func (h *issue590LogCapture) Enabled(_ context.Context, level slog.Level) bool { + return level >= slog.LevelError +} + +func (h *issue590LogCapture) Handle(_ context.Context, record slog.Record) error { + h.mu.Lock() + defer h.mu.Unlock() + var b strings.Builder + b.WriteString(record.Message) + record.Attrs(func(attr slog.Attr) bool { + b.WriteByte(' ') + b.WriteString(attr.Key) + b.WriteByte('=') + b.WriteString(attr.Value.String()) + return true + }) + h.records = append(h.records, b.String()) + return nil +} + +func (h *issue590LogCapture) WithAttrs(_ []slog.Attr) slog.Handler { + return h +} + +func (h *issue590LogCapture) WithGroup(_ string) slog.Handler { + return h +} + +func (h *issue590LogCapture) joined() string { + h.mu.Lock() + defer h.mu.Unlock() + return strings.Join(h.records, "\n") +} + +func TestBundleDocument_Issue590_NoFalseRolodexErrors(t *testing.T) { + tmp := t.TempDir() + specDir := filepath.Join(tmp, "oapispec") + require.NoError(t, os.MkdirAll(filepath.Join(specDir, "ops", "somefolder"), 0755)) + require.NoError(t, os.MkdirAll(filepath.Join(specDir, "parameters"), 0755)) + + openapi := `openapi: 3.1.0 +info: + title: Common schemas + version: 0.0.1 +servers: + - url: http://localhost:8080/ +paths: + /somePath: + $ref: './ops/somefolder/someOp.yaml' +components: + parameters: + foo: + $ref: "./parameters/list.yaml#/foo" + bar: + in: query + name: bar + schema: + type: integer + required: false +` + operation := `get: + parameters: + - $ref: '../../parameters/list.yaml#/foo' + responses: + "200": + content: + application/json: + schema: + type: string +` + parameters := `foo: + name: SomeName + in: path + required: true + schema: + type: string +` + + require.NoError(t, os.WriteFile(filepath.Join(specDir, "openapi.yaml"), []byte(openapi), 0644)) + require.NoError(t, os.WriteFile(filepath.Join(specDir, "ops", "somefolder", "someOp.yaml"), []byte(operation), 0644)) + require.NoError(t, os.WriteFile(filepath.Join(specDir, "parameters", "list.yaml"), []byte(parameters), 0644)) + + logs := &issue590LogCapture{} + config := datamodel.NewDocumentConfiguration() + config.AllowFileReferences = true + config.ExtractRefsSequentially = true + config.BasePath = specDir + config.Logger = slog.New(logs) + + specBytes, err := os.ReadFile(filepath.Join(specDir, "openapi.yaml")) + require.NoError(t, err) + + doc, err := libopenapi.NewDocumentWithConfiguration(specBytes, config) + require.NoError(t, err) + + v3Model, errs := doc.BuildV3Model() + require.Empty(t, errs) + + bundled, err := BundleDocument(&v3Model.Model) + require.NoError(t, err) + + output := string(bundled) + assert.Contains(t, output, "name: SomeName") + assert.Equal(t, 2, strings.Count(output, "name: SomeName")) + assert.NotContains(t, output, "parameters/list.yaml") + assert.NotContains(t, output, "$ref") + + logOutput := logs.joined() + assert.NotContains(t, logOutput, "unable to open the rolodex file") + assert.NotContains(t, logOutput, filepath.Join(tmp, "parameters", "list.yaml")) + assert.NotContains(t, logOutput, filepath.Join(specDir, "parameters", "parameters", "list.yaml")) +} diff --git a/bundler/origin_test.go b/bundler/origin_test.go index 0e0c4234d..6157d04ff 100644 --- a/bundler/origin_test.go +++ b/bundler/origin_test.go @@ -12,8 +12,8 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/bundler/source_context_test.go b/bundler/source_context_test.go index 6bde245b5..c6b354e05 100644 --- a/bundler/source_context_test.go +++ b/bundler/source_context_test.go @@ -7,8 +7,8 @@ import ( "testing" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/document_config_test.go b/datamodel/document_config_test.go index a93e55d91..1488eacc0 100644 --- a/datamodel/document_config_test.go +++ b/datamodel/document_config_test.go @@ -6,7 +6,7 @@ package datamodel import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestNewClosedDocumentConfiguration(t *testing.T) { diff --git a/datamodel/high/arazzo/arazzo_test.go b/datamodel/high/arazzo/arazzo_test.go index d3d3149c9..6c48725e3 100644 --- a/datamodel/high/arazzo/arazzo_test.go +++ b/datamodel/high/arazzo/arazzo_test.go @@ -11,8 +11,8 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/high/v3" lowmodel "github.com/pb33f/libopenapi/datamodel/low" low "github.com/pb33f/libopenapi/datamodel/low/arazzo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/arazzo/build_helpers_test.go b/datamodel/high/arazzo/build_helpers_test.go index add867a5f..b0490a973 100644 --- a/datamodel/high/arazzo/build_helpers_test.go +++ b/datamodel/high/arazzo/build_helpers_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestBuildSlice_EmptyReturnsNil(t *testing.T) { diff --git a/datamodel/high/arazzo/coverage_test.go b/datamodel/high/arazzo/coverage_test.go index 77abf3cc0..293a720b9 100644 --- a/datamodel/high/arazzo/coverage_test.go +++ b/datamodel/high/arazzo/coverage_test.go @@ -11,8 +11,8 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" low "github.com/pb33f/libopenapi/datamodel/low/arazzo" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/contact_test.go b/datamodel/high/base/contact_test.go index e7ac45b6c..07348889f 100644 --- a/datamodel/high/base/contact_test.go +++ b/datamodel/high/base/contact_test.go @@ -10,7 +10,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/discriminator_test.go b/datamodel/high/base/discriminator_test.go index 26151be1a..f4b0ab23f 100644 --- a/datamodel/high/base/discriminator_test.go +++ b/datamodel/high/base/discriminator_test.go @@ -10,7 +10,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/dynamic_value_test.go b/datamodel/high/base/dynamic_value_test.go index eab7e4ae6..0e9223a8c 100644 --- a/datamodel/high/base/dynamic_value_test.go +++ b/datamodel/high/base/dynamic_value_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/example_test.go b/datamodel/high/base/example_test.go index 3d269b825..bea8e2a22 100644 --- a/datamodel/high/base/example_test.go +++ b/datamodel/high/base/example_test.go @@ -14,7 +14,7 @@ import ( lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/external_doc_test.go b/datamodel/high/base/external_doc_test.go index 82030df62..6ecb8f2d6 100644 --- a/datamodel/high/base/external_doc_test.go +++ b/datamodel/high/base/external_doc_test.go @@ -11,7 +11,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/info_test.go b/datamodel/high/base/info_test.go index 5d981fd10..f093d72d8 100644 --- a/datamodel/high/base/info_test.go +++ b/datamodel/high/base/info_test.go @@ -12,7 +12,7 @@ import ( lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/licence_test.go b/datamodel/high/base/licence_test.go index 24e1eaa90..4d5b7b3ee 100644 --- a/datamodel/high/base/licence_test.go +++ b/datamodel/high/base/licence_test.go @@ -9,7 +9,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/schema_proxy_test.go b/datamodel/high/base/schema_proxy_test.go index 84ec3e6d2..28e258632 100644 --- a/datamodel/high/base/schema_proxy_test.go +++ b/datamodel/high/base/schema_proxy_test.go @@ -18,8 +18,8 @@ import ( lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/schema_renderzero_test.go b/datamodel/high/base/schema_renderzero_test.go index 1f2447b84..012a2c06d 100644 --- a/datamodel/high/base/schema_renderzero_test.go +++ b/datamodel/high/base/schema_renderzero_test.go @@ -7,7 +7,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/schema_test.go b/datamodel/high/base/schema_test.go index f770c08e8..78b290d0d 100644 --- a/datamodel/high/base/schema_test.go +++ b/datamodel/high/base/schema_test.go @@ -15,8 +15,8 @@ import ( lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/security_requirement_test.go b/datamodel/high/base/security_requirement_test.go index ad7789069..945e3e779 100644 --- a/datamodel/high/base/security_requirement_test.go +++ b/datamodel/high/base/security_requirement_test.go @@ -11,7 +11,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/tag_test.go b/datamodel/high/base/tag_test.go index 1ee412c07..799c4c9d7 100644 --- a/datamodel/high/base/tag_test.go +++ b/datamodel/high/base/tag_test.go @@ -11,7 +11,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/base/xml_test.go b/datamodel/high/base/xml_test.go index cbe040b33..81658e5b7 100644 --- a/datamodel/high/base/xml_test.go +++ b/datamodel/high/base/xml_test.go @@ -14,7 +14,7 @@ import ( lowmodel "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/node_builder_test.go b/datamodel/high/node_builder_test.go index b6e8c1eec..da323baf0 100644 --- a/datamodel/high/node_builder_test.go +++ b/datamodel/high/node_builder_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/overlay/action_test.go b/datamodel/high/overlay/action_test.go index 619037da6..31879fbf2 100644 --- a/datamodel/high/overlay/action_test.go +++ b/datamodel/high/overlay/action_test.go @@ -9,8 +9,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowoverlay "github.com/pb33f/libopenapi/datamodel/low/overlay" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/overlay/info_test.go b/datamodel/high/overlay/info_test.go index 1edcac30e..7c06ba469 100644 --- a/datamodel/high/overlay/info_test.go +++ b/datamodel/high/overlay/info_test.go @@ -9,8 +9,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowoverlay "github.com/pb33f/libopenapi/datamodel/low/overlay" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/overlay/overlay_test.go b/datamodel/high/overlay/overlay_test.go index 60b7189a7..4c3c4efa2 100644 --- a/datamodel/high/overlay/overlay_test.go +++ b/datamodel/high/overlay/overlay_test.go @@ -9,8 +9,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowoverlay "github.com/pb33f/libopenapi/datamodel/low/overlay" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/shared.go b/datamodel/high/shared.go index bc72d0853..4e5ee01b7 100644 --- a/datamodel/high/shared.go +++ b/datamodel/high/shared.go @@ -20,6 +20,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" + "github.com/pb33f/libopenapi/utils" "go.yaml.in/yaml/v4" ) @@ -147,6 +148,10 @@ func ResolveExternalRef[H any, L any]( return result, nil } + if isResolvedExternalRefModel(lowObj) { + return result, nil + } + ref := lowObj.GetReference() resolved := idx.FindComponent(context.Background(), ref) if resolved == nil || resolved.Node == nil { @@ -168,6 +173,22 @@ func ResolveExternalRef[H any, L any]( return result, nil } +func isResolvedExternalRefModel(lowObj ExternalRefResolver) bool { + if !utils.IsExternalRef(lowObj.GetReference()) { + return false + } + rooted, ok := lowObj.(low.HasRootNode) + if !ok { + return false + } + root := rooted.GetRootNode() + if root == nil { + return false + } + isRef, _, _ := utils.IsNodeRefValue(root) + return !isRef +} + // RenderExternalRef is a convenience function that resolves an external reference and renders it inline. // This combines ResolveExternalRef with RenderInline for the common case where you want to // resolve and immediately render an external reference. diff --git a/datamodel/high/shared_test.go b/datamodel/high/shared_test.go index e271b3bef..9a7b66dab 100644 --- a/datamodel/high/shared_test.go +++ b/datamodel/high/shared_test.go @@ -10,8 +10,8 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) @@ -227,6 +227,66 @@ func (m *mockExternalRefResolver) GetIndex() *index.SpecIndex { return m.indexVal } +type mockRootedExternalRefResolver struct { + *mockExternalRefResolver + root *yaml.Node +} + +func (m *mockRootedExternalRefResolver) GetRootNode() *yaml.Node { + return m.root +} + +func TestIsResolvedExternalRefModel(t *testing.T) { + refRoot := utils.CreateRefNode("#/components/schemas/TestSchema") + concreteRoot := utils.CreateStringNode("resolved") + + tests := []struct { + name string + obj ExternalRefResolver + want bool + }{ + { + name: "local reference", + obj: &mockExternalRefResolver{isRef: true, ref: "#/components/schemas/TestSchema"}, + want: false, + }, + { + name: "no root provider", + obj: &mockExternalRefResolver{isRef: true, ref: "./schemas.yaml#/TestSchema"}, + want: false, + }, + { + name: "nil root", + obj: &mockRootedExternalRefResolver{ + mockExternalRefResolver: &mockExternalRefResolver{isRef: true, ref: "./schemas.yaml#/TestSchema"}, + }, + want: false, + }, + { + name: "reference root", + obj: &mockRootedExternalRefResolver{ + mockExternalRefResolver: &mockExternalRefResolver{isRef: true, ref: "./schemas.yaml#/TestSchema"}, + root: refRoot, + }, + want: false, + }, + { + name: "concrete root", + obj: &mockRootedExternalRefResolver{ + mockExternalRefResolver: &mockExternalRefResolver{isRef: true, ref: "./schemas.yaml#/TestSchema"}, + root: concreteRoot, + }, + want: true, + }, + } + + for _, tt := range tests { + t.Run(tt.name, func(t *testing.T) { + assert.Equal(t, tt.want, isResolvedExternalRefModel(tt.obj)) + }) + } +} + func TestResolveExternalRef_NilLowObj(t *testing.T) { result, err := ResolveExternalRef[string, string](nil, nil, nil) @@ -412,6 +472,31 @@ components: assert.False(t, result.Resolved) } +func TestResolveExternalRef_AlreadyResolvedModelDoesNotReResolve(t *testing.T) { + config := index.CreateOpenAPIIndexConfig() + idx := index.NewSpecIndexWithConfig(nil, config) + mock := &mockRootedExternalRefResolver{ + mockExternalRefResolver: &mockExternalRefResolver{ + isRef: true, + ref: "./schemas.yaml#/TestSchema", + indexVal: idx, + }, + root: utils.CreateStringNode("resolved"), + } + buildCalled := false + + result, err := ResolveExternalRef(mock, func(_ *yaml.Node, _ *index.SpecIndex) (*testLow, error) { + buildCalled = true + return &testLow{}, nil + }, func(l *testLow) *testHigh { + return &testHigh{Name: l.Name} + }) + + assert.NoError(t, err) + assert.False(t, result.Resolved) + assert.False(t, buildCalled) +} + func TestRenderExternalRef_Success(t *testing.T) { // Create a spec with a component spec := `openapi: 3.1.0 diff --git a/datamodel/high/v2/path_item_test.go b/datamodel/high/v2/path_item_test.go index 65a514af1..a1311013d 100644 --- a/datamodel/high/v2/path_item_test.go +++ b/datamodel/high/v2/path_item_test.go @@ -11,7 +11,7 @@ import ( lowV2 "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v2/swagger_test.go b/datamodel/high/v2/swagger_test.go index ac1eb9160..e2d368fb9 100644 --- a/datamodel/high/v2/swagger_test.go +++ b/datamodel/high/v2/swagger_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) var doc *v2.Swagger diff --git a/datamodel/high/v3/callback_test.go b/datamodel/high/v3/callback_test.go index 205bf15f0..d7a8ccefc 100644 --- a/datamodel/high/v3/callback_test.go +++ b/datamodel/high/v3/callback_test.go @@ -14,7 +14,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/components_test.go b/datamodel/high/v3/components_test.go index 60360184d..5b56f8022 100644 --- a/datamodel/high/v3/components_test.go +++ b/datamodel/high/v3/components_test.go @@ -20,8 +20,8 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/document_test.go b/datamodel/high/v3/document_test.go index e687449a5..c86c1333a 100644 --- a/datamodel/high/v3/document_test.go +++ b/datamodel/high/v3/document_test.go @@ -23,7 +23,7 @@ import ( lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/encoding_test.go b/datamodel/high/v3/encoding_test.go index 8d6c19989..702640cdb 100644 --- a/datamodel/high/v3/encoding_test.go +++ b/datamodel/high/v3/encoding_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/header_test.go b/datamodel/high/v3/header_test.go index 432c1d366..0c5746bfd 100644 --- a/datamodel/high/v3/header_test.go +++ b/datamodel/high/v3/header_test.go @@ -14,7 +14,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/link_test.go b/datamodel/high/v3/link_test.go index 13c464e01..69c025f91 100644 --- a/datamodel/high/v3/link_test.go +++ b/datamodel/high/v3/link_test.go @@ -13,7 +13,7 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/media_type_itemschema_test.go b/datamodel/high/v3/media_type_itemschema_test.go index bc161333a..6d97dc96f 100644 --- a/datamodel/high/v3/media_type_itemschema_test.go +++ b/datamodel/high/v3/media_type_itemschema_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/media_type_test.go b/datamodel/high/v3/media_type_test.go index 7ae981f74..ba47d9d40 100644 --- a/datamodel/high/v3/media_type_test.go +++ b/datamodel/high/v3/media_type_test.go @@ -16,7 +16,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/oauth_flow_test.go b/datamodel/high/v3/oauth_flow_test.go index 391826268..d96b27d62 100644 --- a/datamodel/high/v3/oauth_flow_test.go +++ b/datamodel/high/v3/oauth_flow_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/oauth_flows_test.go b/datamodel/high/v3/oauth_flows_test.go index c708776d0..f958abf67 100644 --- a/datamodel/high/v3/oauth_flows_test.go +++ b/datamodel/high/v3/oauth_flows_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/operation_test.go b/datamodel/high/v3/operation_test.go index f9c77f260..751be1043 100644 --- a/datamodel/high/v3/operation_test.go +++ b/datamodel/high/v3/operation_test.go @@ -13,7 +13,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/parameter_test.go b/datamodel/high/v3/parameter_test.go index 8c19fe8e7..bb4413b35 100644 --- a/datamodel/high/v3/parameter_test.go +++ b/datamodel/high/v3/parameter_test.go @@ -14,7 +14,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/path_item_query_test.go b/datamodel/high/v3/path_item_query_test.go index 8c00574fe..370e38652 100644 --- a/datamodel/high/v3/path_item_query_test.go +++ b/datamodel/high/v3/path_item_query_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowV3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/path_item_test.go b/datamodel/high/v3/path_item_test.go index 6d70c7167..5a4bb7a3a 100644 --- a/datamodel/high/v3/path_item_test.go +++ b/datamodel/high/v3/path_item_test.go @@ -13,7 +13,7 @@ import ( lowV3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/paths_test.go b/datamodel/high/v3/paths_test.go index f4af595b2..0134c347f 100644 --- a/datamodel/high/v3/paths_test.go +++ b/datamodel/high/v3/paths_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3low "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/request_body_test.go b/datamodel/high/v3/request_body_test.go index 6a073f04b..0628af8b7 100644 --- a/datamodel/high/v3/request_body_test.go +++ b/datamodel/high/v3/request_body_test.go @@ -14,7 +14,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/response_test.go b/datamodel/high/v3/response_test.go index 711756f7d..5fa4c2cba 100644 --- a/datamodel/high/v3/response_test.go +++ b/datamodel/high/v3/response_test.go @@ -13,7 +13,7 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/responses_test.go b/datamodel/high/v3/responses_test.go index 59307471c..a2ea86882 100644 --- a/datamodel/high/v3/responses_test.go +++ b/datamodel/high/v3/responses_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/security_scheme_test.go b/datamodel/high/v3/security_scheme_test.go index c9365f7dd..b89508d20 100644 --- a/datamodel/high/v3/security_scheme_test.go +++ b/datamodel/high/v3/security_scheme_test.go @@ -12,7 +12,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/high/v3/server_test.go b/datamodel/high/v3/server_test.go index 7507534bd..7499545d7 100644 --- a/datamodel/high/v3/server_test.go +++ b/datamodel/high/v3/server_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestServer_MarshalYAML(t *testing.T) { diff --git a/datamodel/high/v3/server_variable_test.go b/datamodel/high/v3/server_variable_test.go index d6168c756..4822bceeb 100644 --- a/datamodel/high/v3/server_variable_test.go +++ b/datamodel/high/v3/server_variable_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/arazzo/arazzo_test.go b/datamodel/low/arazzo/arazzo_test.go index 1888159af..4c13a4a7f 100644 --- a/datamodel/low/arazzo/arazzo_test.go +++ b/datamodel/low/arazzo/arazzo_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/arazzo/coverage_test.go b/datamodel/low/arazzo/coverage_test.go index e0d416c59..a67778816 100644 --- a/datamodel/low/arazzo/coverage_test.go +++ b/datamodel/low/arazzo/coverage_test.go @@ -9,8 +9,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/arazzo/final_coverage_test.go b/datamodel/low/arazzo/final_coverage_test.go index fe81a5b78..912132d7f 100644 --- a/datamodel/low/arazzo/final_coverage_test.go +++ b/datamodel/low/arazzo/final_coverage_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/arazzo/gap_coverage_test.go b/datamodel/low/arazzo/gap_coverage_test.go index 84c1a1fae..f4a7b8670 100644 --- a/datamodel/low/arazzo/gap_coverage_test.go +++ b/datamodel/low/arazzo/gap_coverage_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) @@ -110,7 +110,7 @@ workflows: - stepId: s1 operationId: op1`) -var a Arazzo + var a Arazzo require.NoError(t, low.BuildModel(root, &a)) err := a.Build(context.Background(), nil, root, index.NewSpecIndex(docNode)) require.Error(t, err) @@ -132,7 +132,7 @@ workflows: requestBody: $ref: '#/missing'`) -var a Arazzo + var a Arazzo require.NoError(t, low.BuildModel(root, &a)) err := a.Build(context.Background(), nil, root, index.NewSpecIndex(docNode)) require.Error(t, err) diff --git a/datamodel/low/base/circ_check_test.go b/datamodel/low/base/circ_check_test.go index 3ab580e86..4bac0a7c2 100644 --- a/datamodel/low/base/circ_check_test.go +++ b/datamodel/low/base/circ_check_test.go @@ -7,7 +7,7 @@ import ( "context" "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" "testing" ) diff --git a/datamodel/low/base/contact_test.go b/datamodel/low/base/contact_test.go index e3bcd3753..236a9b0e5 100644 --- a/datamodel/low/base/contact_test.go +++ b/datamodel/low/base/contact_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/context_test.go b/datamodel/low/base/context_test.go index 5fb708ac8..652def928 100644 --- a/datamodel/low/base/context_test.go +++ b/datamodel/low/base/context_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestGetModelContext(t *testing.T) { diff --git a/datamodel/low/base/discriminator_test.go b/datamodel/low/base/discriminator_test.go index bdb70ad4e..5bbac61fc 100644 --- a/datamodel/low/base/discriminator_test.go +++ b/datamodel/low/base/discriminator_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/example_test.go b/datamodel/low/base/example_test.go index a91b8191d..d320dd693 100644 --- a/datamodel/low/base/example_test.go +++ b/datamodel/low/base/example_test.go @@ -10,8 +10,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/external_doc_test.go b/datamodel/low/base/external_doc_test.go index 23fc8808a..d24d9f8d0 100644 --- a/datamodel/low/base/external_doc_test.go +++ b/datamodel/low/base/external_doc_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/info_test.go b/datamodel/low/base/info_test.go index 44a3fac03..a9d581b39 100644 --- a/datamodel/low/base/info_test.go +++ b/datamodel/low/base/info_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/license_test.go b/datamodel/low/base/license_test.go index 869ab166b..f0e2fb405 100644 --- a/datamodel/low/base/license_test.go +++ b/datamodel/low/base/license_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/property_merger_test.go b/datamodel/low/base/property_merger_test.go index 64b60e8fd..8d8c5f304 100644 --- a/datamodel/low/base/property_merger_test.go +++ b/datamodel/low/base/property_merger_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/schema_build_coverage_test.go b/datamodel/low/base/schema_build_coverage_test.go index 43eaf8109..f6f06b2bb 100644 --- a/datamodel/low/base/schema_build_coverage_test.go +++ b/datamodel/low/base/schema_build_coverage_test.go @@ -13,8 +13,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/schema_hash_coverage_test.go b/datamodel/low/base/schema_hash_coverage_test.go index 45e588462..be4acdd2f 100644 --- a/datamodel/low/base/schema_hash_coverage_test.go +++ b/datamodel/low/base/schema_hash_coverage_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestWriteSchemaBoolMap(t *testing.T) { diff --git a/datamodel/low/base/schema_proxy_test.go b/datamodel/low/base/schema_proxy_test.go index a0988064b..0156f04a2 100644 --- a/datamodel/low/base/schema_proxy_test.go +++ b/datamodel/low/base/schema_proxy_test.go @@ -15,8 +15,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/schema_test.go b/datamodel/low/base/schema_test.go index 8a3377360..331333f8d 100644 --- a/datamodel/low/base/schema_test.go +++ b/datamodel/low/base/schema_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/security_requirement_test.go b/datamodel/low/base/security_requirement_test.go index 9ff5eed15..b70833ce7 100644 --- a/datamodel/low/base/security_requirement_test.go +++ b/datamodel/low/base/security_requirement_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/sibling_ref_transformer_test.go b/datamodel/low/base/sibling_ref_transformer_test.go index e4d2383fb..9f80c72b5 100644 --- a/datamodel/low/base/sibling_ref_transformer_test.go +++ b/datamodel/low/base/sibling_ref_transformer_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/tag_test.go b/datamodel/low/base/tag_test.go index 1fe22c99a..955d12886 100644 --- a/datamodel/low/base/tag_test.go +++ b/datamodel/low/base/tag_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/base/xml_test.go b/datamodel/low/base/xml_test.go index a51f02bb6..38f86bde0 100644 --- a/datamodel/low/base/xml_test.go +++ b/datamodel/low/base/xml_test.go @@ -8,7 +8,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/extraction_fragment_test.go b/datamodel/low/extraction_fragment_test.go index 17b54fe87..4bc6909da 100644 --- a/datamodel/low/extraction_fragment_test.go +++ b/datamodel/low/extraction_fragment_test.go @@ -6,8 +6,8 @@ package low import ( "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/extraction_functions_test.go b/datamodel/low/extraction_functions_test.go index edfc49df2..7c829bfca 100644 --- a/datamodel/low/extraction_functions_test.go +++ b/datamodel/low/extraction_functions_test.go @@ -20,8 +20,8 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestFindItemInOrderedMap(t *testing.T) { diff --git a/datamodel/low/generate_hash_schema_proxy_test.go b/datamodel/low/generate_hash_schema_proxy_test.go index 00361eccf..e25c604ca 100644 --- a/datamodel/low/generate_hash_schema_proxy_test.go +++ b/datamodel/low/generate_hash_schema_proxy_test.go @@ -9,8 +9,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/hash_test.go b/datamodel/low/hash_test.go index 8b389e8bb..b91d782c2 100644 --- a/datamodel/low/hash_test.go +++ b/datamodel/low/hash_test.go @@ -7,7 +7,7 @@ import ( "hash/maphash" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/model_builder_test.go b/datamodel/low/model_builder_test.go index 05cff424f..879e9b44c 100644 --- a/datamodel/low/model_builder_test.go +++ b/datamodel/low/model_builder_test.go @@ -6,7 +6,7 @@ import ( "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/node_map_merge_test.go b/datamodel/low/node_map_merge_test.go index 2cf5c5bd1..9635fcc04 100644 --- a/datamodel/low/node_map_merge_test.go +++ b/datamodel/low/node_map_merge_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/node_map_test.go b/datamodel/low/node_map_test.go index 6a2b68ac9..a16b925d0 100644 --- a/datamodel/low/node_map_test.go +++ b/datamodel/low/node_map_test.go @@ -7,7 +7,7 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/overlay/action_test.go b/datamodel/low/overlay/action_test.go index 82995c469..3c88f84b5 100644 --- a/datamodel/low/overlay/action_test.go +++ b/datamodel/low/overlay/action_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/overlay/info_test.go b/datamodel/low/overlay/info_test.go index 2104d44c2..3326905a0 100644 --- a/datamodel/low/overlay/info_test.go +++ b/datamodel/low/overlay/info_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/overlay/overlay_test.go b/datamodel/low/overlay/overlay_test.go index 615a3fef5..76d8987e6 100644 --- a/datamodel/low/overlay/overlay_test.go +++ b/datamodel/low/overlay/overlay_test.go @@ -8,8 +8,8 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/reference_test.go b/datamodel/low/reference_test.go index 57f0ccbf7..0c5a89b01 100644 --- a/datamodel/low/reference_test.go +++ b/datamodel/low/reference_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/utils" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/definitions_test.go b/datamodel/low/v2/definitions_test.go index 8d549a032..81819b899 100644 --- a/datamodel/low/v2/definitions_test.go +++ b/datamodel/low/v2/definitions_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/examples_test.go b/datamodel/low/v2/examples_test.go index 6251a4be0..2cb68e852 100644 --- a/datamodel/low/v2/examples_test.go +++ b/datamodel/low/v2/examples_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/header_test.go b/datamodel/low/v2/header_test.go index 55578fd40..f9ad41ec0 100644 --- a/datamodel/low/v2/header_test.go +++ b/datamodel/low/v2/header_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/items_test.go b/datamodel/low/v2/items_test.go index 6b8a3ae04..dc1f680fb 100644 --- a/datamodel/low/v2/items_test.go +++ b/datamodel/low/v2/items_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/operation_test.go b/datamodel/low/v2/operation_test.go index 276d8f1d8..f5e642339 100644 --- a/datamodel/low/v2/operation_test.go +++ b/datamodel/low/v2/operation_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/parameter_test.go b/datamodel/low/v2/parameter_test.go index 6bdcd49b6..1a46b39dd 100644 --- a/datamodel/low/v2/parameter_test.go +++ b/datamodel/low/v2/parameter_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/path_item_test.go b/datamodel/low/v2/path_item_test.go index 0fa37bbe6..062f837f0 100644 --- a/datamodel/low/v2/path_item_test.go +++ b/datamodel/low/v2/path_item_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/paths_test.go b/datamodel/low/v2/paths_test.go index 64981e8cc..36cfca3a0 100644 --- a/datamodel/low/v2/paths_test.go +++ b/datamodel/low/v2/paths_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/response_test.go b/datamodel/low/v2/response_test.go index b55a0799e..58acdd219 100644 --- a/datamodel/low/v2/response_test.go +++ b/datamodel/low/v2/response_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/responses_test.go b/datamodel/low/v2/responses_test.go index f3588a6a7..a16fef7cd 100644 --- a/datamodel/low/v2/responses_test.go +++ b/datamodel/low/v2/responses_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/scopes_test.go b/datamodel/low/v2/scopes_test.go index 52b4e27e0..46b7a0351 100644 --- a/datamodel/low/v2/scopes_test.go +++ b/datamodel/low/v2/scopes_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/security_scheme_test.go b/datamodel/low/v2/security_scheme_test.go index 673f4ce0f..691c9b522 100644 --- a/datamodel/low/v2/security_scheme_test.go +++ b/datamodel/low/v2/security_scheme_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v2/swagger_test.go b/datamodel/low/v2/swagger_test.go index 03e09f84a..f3a161bb4 100644 --- a/datamodel/low/v2/swagger_test.go +++ b/datamodel/low/v2/swagger_test.go @@ -17,8 +17,8 @@ import ( "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) var doc *Swagger diff --git a/datamodel/low/v3/callback_test.go b/datamodel/low/v3/callback_test.go index 7ee77f992..5a4a5557b 100644 --- a/datamodel/low/v3/callback_test.go +++ b/datamodel/low/v3/callback_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/component_value_reference_coverage_test.go b/datamodel/low/v3/component_value_reference_coverage_test.go index 6a25f0962..06beadc40 100644 --- a/datamodel/low/v3/component_value_reference_coverage_test.go +++ b/datamodel/low/v3/component_value_reference_coverage_test.go @@ -9,8 +9,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/components_test.go b/datamodel/low/v3/components_test.go index 1e2981dbb..2c6e48feb 100644 --- a/datamodel/low/v3/components_test.go +++ b/datamodel/low/v3/components_test.go @@ -13,7 +13,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/create_document_test.go b/datamodel/low/v3/create_document_test.go index e8a2b1dd4..0f7080b4d 100644 --- a/datamodel/low/v3/create_document_test.go +++ b/datamodel/low/v3/create_document_test.go @@ -21,8 +21,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/encoding_test.go b/datamodel/low/v3/encoding_test.go index c2abdb5f9..6efc9f046 100644 --- a/datamodel/low/v3/encoding_test.go +++ b/datamodel/low/v3/encoding_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/header_test.go b/datamodel/low/v3/header_test.go index 6aa8a2aa6..b05a80500 100644 --- a/datamodel/low/v3/header_test.go +++ b/datamodel/low/v3/header_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/link_test.go b/datamodel/low/v3/link_test.go index 077082fa8..1b9b4eba8 100644 --- a/datamodel/low/v3/link_test.go +++ b/datamodel/low/v3/link_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/media_type_itemschema_test.go b/datamodel/low/v3/media_type_itemschema_test.go index 69bdace04..57e701a6f 100644 --- a/datamodel/low/v3/media_type_itemschema_test.go +++ b/datamodel/low/v3/media_type_itemschema_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/media_type_test.go b/datamodel/low/v3/media_type_test.go index 470ee2ecf..f0536bf1e 100644 --- a/datamodel/low/v3/media_type_test.go +++ b/datamodel/low/v3/media_type_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/oauth_flows_test.go b/datamodel/low/v3/oauth_flows_test.go index 97346710f..30fdbe444 100644 --- a/datamodel/low/v3/oauth_flows_test.go +++ b/datamodel/low/v3/oauth_flows_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/operation_test.go b/datamodel/low/v3/operation_test.go index ee75b8696..83a5f67a2 100644 --- a/datamodel/low/v3/operation_test.go +++ b/datamodel/low/v3/operation_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/parameter_test.go b/datamodel/low/v3/parameter_test.go index a3b8d2576..b30646778 100644 --- a/datamodel/low/v3/parameter_test.go +++ b/datamodel/low/v3/parameter_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/path_item_query_test.go b/datamodel/low/v3/path_item_query_test.go index a5e3449b4..d3ff2fd74 100644 --- a/datamodel/low/v3/path_item_query_test.go +++ b/datamodel/low/v3/path_item_query_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/path_item_test.go b/datamodel/low/v3/path_item_test.go index 6bc6693b7..fdf6ff2ba 100644 --- a/datamodel/low/v3/path_item_test.go +++ b/datamodel/low/v3/path_item_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/paths_test.go b/datamodel/low/v3/paths_test.go index e3ee14f59..6d48da514 100644 --- a/datamodel/low/v3/paths_test.go +++ b/datamodel/low/v3/paths_test.go @@ -14,7 +14,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/request_body_test.go b/datamodel/low/v3/request_body_test.go index 7a53db7e0..15ae9097f 100644 --- a/datamodel/low/v3/request_body_test.go +++ b/datamodel/low/v3/request_body_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/response_test.go b/datamodel/low/v3/response_test.go index 7e22f58b2..fca75e7ba 100644 --- a/datamodel/low/v3/response_test.go +++ b/datamodel/low/v3/response_test.go @@ -10,8 +10,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/security_scheme_test.go b/datamodel/low/v3/security_scheme_test.go index db2d9fa0c..61df71868 100644 --- a/datamodel/low/v3/security_scheme_test.go +++ b/datamodel/low/v3/security_scheme_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/low/v3/server_test.go b/datamodel/low/v3/server_test.go index 774f1c267..3a8943371 100644 --- a/datamodel/low/v3/server_test.go +++ b/datamodel/low/v3/server_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/spec_info_duplicate_keys_test.go b/datamodel/spec_info_duplicate_keys_test.go index 12535b2e3..e01c580a3 100644 --- a/datamodel/spec_info_duplicate_keys_test.go +++ b/datamodel/spec_info_duplicate_keys_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/spec_info_lazy_json_test.go b/datamodel/spec_info_lazy_json_test.go index 9973a9522..bc09e8f86 100644 --- a/datamodel/spec_info_lazy_json_test.go +++ b/datamodel/spec_info_lazy_json_test.go @@ -7,8 +7,8 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) const lazyJSONYAML = `openapi: 3.0.1 diff --git a/datamodel/spec_info_test.go b/datamodel/spec_info_test.go index 7decb1192..cb761606c 100644 --- a/datamodel/spec_info_test.go +++ b/datamodel/spec_info_test.go @@ -9,7 +9,7 @@ import ( "testing" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/datamodel/translate_coverage_test.go b/datamodel/translate_coverage_test.go index 1aa436879..0bcd53a34 100644 --- a/datamodel/translate_coverage_test.go +++ b/datamodel/translate_coverage_test.go @@ -9,8 +9,8 @@ import ( "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestTranslateMapParallel_EmptyMap(t *testing.T) { diff --git a/datamodel/translate_test.go b/datamodel/translate_test.go index 0ee4321d0..378f75c1b 100644 --- a/datamodel/translate_test.go +++ b/datamodel/translate_test.go @@ -14,8 +14,8 @@ import ( "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestTranslateSliceParallel(t *testing.T) { diff --git a/document_examples_test.go b/document_examples_test.go index 3ed624ee9..7f3b8cb1d 100644 --- a/document_examples_test.go +++ b/document_examples_test.go @@ -24,7 +24,7 @@ import ( low "github.com/pb33f/libopenapi/datamodel/low/base" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func ExampleNewDocument_fromOpenAPI3Document() { diff --git a/document_iteration_test.go b/document_iteration_test.go index 8210dafe5..7e92504ea 100644 --- a/document_iteration_test.go +++ b/document_iteration_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/high/base" v3 "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/require" ) type loopFrame struct { diff --git a/document_test.go b/document_test.go index 1c2bb9f70..cf2b13ea7 100644 --- a/document_test.go +++ b/document_test.go @@ -24,8 +24,8 @@ import ( "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" "github.com/pb33f/libopenapi/what-changed/model" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/go.mod b/go.mod index 255b225af..ef0c1ee1b 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb github.com/pb33f/jsonpath v0.8.2 github.com/pb33f/ordered-map/v2 v2.3.1 - github.com/stretchr/testify v1.11.1 + github.com/pb33f/testify v0.1.0 go.yaml.in/yaml/v4 v4.0.0-rc.5 golang.org/x/sync v0.21.0 ) @@ -14,9 +14,4 @@ require ( require ( github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/buger/jsonparser v1.1.2 // indirect - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rogpeppe/go-internal v1.9.0 // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect ) diff --git a/go.sum b/go.sum index a3bebefd2..9e9e3014f 100644 --- a/go.sum +++ b/go.sum @@ -2,31 +2,23 @@ github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPn github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg= github.com/buger/jsonparser v1.1.2 h1:frqHqw7otoVbk5M8LlE/L7HTnIq2v9RX6EJ48i9AxJk= github.com/buger/jsonparser v1.1.2/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= -github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb h1:w1g9wNDIE/pHSTmAaUhv4TZQuPBS6GV3mMz5hkgziIU= github.com/lucasjones/reggen v0.0.0-20200904144131-37ba4fa293bb/go.mod h1:5ELEyG+X8f+meRWHuqUOewBOhvHkl7M76pdGEansxW4= github.com/pb33f/jsonpath v0.8.2 h1:Ou4C7zjYClBm97dfZjDCjdZGusJoynv/vrtiEKNfj2Y= github.com/pb33f/jsonpath v0.8.2/go.mod h1:zBV5LJW4OQOPatmQE2QdKpGQJvhDTlE5IEj6ASaRNTo= github.com/pb33f/ordered-map/v2 v2.3.1 h1:5319HDO0aw4DA4gzi+zv4FXU9UlSs3xGZ40wcP1nBjY= github.com/pb33f/ordered-map/v2 v2.3.1/go.mod h1:qxFQgd0PkVUtOMCkTapqotNgzRhMPL7VvaHKbd1HnmQ= +github.com/pb33f/testify v0.1.0 h1:g48/HDU/jn2COspS4nM0scptxiKTJ4DnbX/4ehK6IZ8= +github.com/pb33f/testify v0.1.0/go.mod h1:nq283P/jJ8hXMmdhAqfj7BJIz0y+6IOHj9q0044rKt4= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= go.yaml.in/yaml/v4 v4.0.0-rc.5 h1:JVliQq9EGOYaTgMi+k8BhUJyqcGk4ZqeuiN1Cirba9c= go.yaml.in/yaml/v4 v4.0.0-rc.5/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0= golang.org/x/sync v0.21.0 h1:HLII4xRRTtCRkxYp4HNFF0Js/Og6q2i++KXbg0gHCwM= golang.org/x/sync v0.21.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= -gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/index/cache_test.go b/index/cache_test.go index 64fda03b0..e23059be8 100644 --- a/index/cache_test.go +++ b/index/cache_test.go @@ -8,7 +8,7 @@ import ( "sync/atomic" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) // NewTestSpecIndex Test helper function to create a SpecIndex with initialized high cache. diff --git a/index/cache_test/docusign_test.go b/index/cache_test/docusign_test.go index 58b4b38a4..3322171aa 100644 --- a/index/cache_test/docusign_test.go +++ b/index/cache_test/docusign_test.go @@ -12,7 +12,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/high/base" v3 "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/require" ) type loopFrame struct { diff --git a/index/circular_reference_result_test.go b/index/circular_reference_result_test.go index 9be38f8a2..0dcc6c8eb 100644 --- a/index/circular_reference_result_test.go +++ b/index/circular_reference_result_test.go @@ -6,7 +6,7 @@ package index import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestCircularReferenceResult_GenerateJourneyPath(t *testing.T) { diff --git a/index/enhanced_coverage_test.go b/index/enhanced_coverage_test.go index 1ea55c849..b9036a0be 100644 --- a/index/enhanced_coverage_test.go +++ b/index/enhanced_coverage_test.go @@ -15,8 +15,8 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) // TestEnhancedCoverage provides essential coverage for the newly implemented functionality diff --git a/index/extract_refs_test.go b/index/extract_refs_test.go index 9c9e7b97b..c2339e961 100644 --- a/index/extract_refs_test.go +++ b/index/extract_refs_test.go @@ -9,8 +9,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/index/find_component_test.go b/index/find_component_test.go index 8c8d4ecdc..a9439a5d8 100644 --- a/index/find_component_test.go +++ b/index/find_component_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/index_model_test.go b/index/index_model_test.go index 26d8c8b2f..7ee5b91f7 100644 --- a/index/index_model_test.go +++ b/index/index_model_test.go @@ -8,7 +8,7 @@ import ( "net/url" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/inline_collector_parity_test.go b/index/inline_collector_parity_test.go index b0a4c58f6..dc2cf0706 100644 --- a/index/inline_collector_parity_test.go +++ b/index/inline_collector_parity_test.go @@ -13,8 +13,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/index/issue361_test.go b/index/issue361_test.go index 20cd1ca51..2a64a6f98 100644 --- a/index/issue361_test.go +++ b/index/issue361_test.go @@ -10,8 +10,8 @@ import ( "testing/fstest" "time" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) // TestIssue361_FSInterfaceCompliance tests the fix for issue #361 diff --git a/index/issue438_test.go b/index/issue438_test.go index cff8b4cea..c6baa212b 100644 --- a/index/issue438_test.go +++ b/index/issue438_test.go @@ -10,8 +10,8 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) // TestIssue438_UnknownExtensionContentDetection tests the fix for issue #438 diff --git a/index/map_index_nodes_test.go b/index/map_index_nodes_test.go index 79e812ce8..0ffe51622 100644 --- a/index/map_index_nodes_test.go +++ b/index/map_index_nodes_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/jsonpath/pkg/jsonpath" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/path_resolution_test.go b/index/path_resolution_test.go index 367427daf..d8e695b15 100644 --- a/index/path_resolution_test.go +++ b/index/path_resolution_test.go @@ -10,8 +10,8 @@ import ( "testing/fstest" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestResolveRelativeFilePath_PrefersBasePath(t *testing.T) { diff --git a/index/resolve_reference_value_test.go b/index/resolve_reference_value_test.go index b931da268..d4a4ffe97 100644 --- a/index/resolve_reference_value_test.go +++ b/index/resolve_reference_value_test.go @@ -3,7 +3,7 @@ package index import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/resolve_refs_node_test.go b/index/resolve_refs_node_test.go index 5d9bed05b..d778c0e60 100644 --- a/index/resolve_refs_node_test.go +++ b/index/resolve_refs_node_test.go @@ -3,7 +3,7 @@ package index import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/resolver_test.go b/index/resolver_test.go index 9edf813dd..5bb43d338 100644 --- a/index/resolver_test.go +++ b/index/resolver_test.go @@ -17,7 +17,7 @@ import ( "github.com/pb33f/libopenapi/utils" "context" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/rolodex_file_loader_test.go b/index/rolodex_file_loader_test.go index 1f67f5dd4..f6ebaad5b 100644 --- a/index/rolodex_file_loader_test.go +++ b/index/rolodex_file_loader_test.go @@ -16,7 +16,7 @@ import ( "time" "context" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/rolodex_fscompat_test.go b/index/rolodex_fscompat_test.go index 1dd37dc18..f7e06c89c 100644 --- a/index/rolodex_fscompat_test.go +++ b/index/rolodex_fscompat_test.go @@ -11,8 +11,8 @@ import ( "testing/fstest" "time" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) // strictFS is a test file system that strictly enforces the fs.FS interface contract diff --git a/index/rolodex_ref_extractor_test.go b/index/rolodex_ref_extractor_test.go index 42c4c7d28..953d05d87 100644 --- a/index/rolodex_ref_extractor_test.go +++ b/index/rolodex_ref_extractor_test.go @@ -6,7 +6,7 @@ package index import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestExtractedRef_GetFile(t *testing.T) { diff --git a/index/rolodex_remote_loader_deep_test.go b/index/rolodex_remote_loader_deep_test.go index c5ba209e0..749c7dcb2 100644 --- a/index/rolodex_remote_loader_deep_test.go +++ b/index/rolodex_remote_loader_deep_test.go @@ -15,7 +15,7 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) // failingReader is a reader that fails after reading a certain number of bytes diff --git a/index/rolodex_remote_loader_test.go b/index/rolodex_remote_loader_test.go index 5c408a0ac..ec42305ab 100644 --- a/index/rolodex_remote_loader_test.go +++ b/index/rolodex_remote_loader_test.go @@ -17,7 +17,7 @@ import ( "time" "context" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/rolodex_test.go b/index/rolodex_test.go index 0f8239310..bc7272a2a 100644 --- a/index/rolodex_test.go +++ b/index/rolodex_test.go @@ -21,7 +21,7 @@ import ( "testing/fstest" "time" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/schema_id_test.go b/index/schema_id_test.go index b086c30f5..a3aaefa64 100644 --- a/index/schema_id_test.go +++ b/index/schema_id_test.go @@ -10,7 +10,7 @@ import ( "testing" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/search_index_test.go b/index/search_index_test.go index 53b3e0f52..2ddb0781b 100644 --- a/index/search_index_test.go +++ b/index/search_index_test.go @@ -12,7 +12,7 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/search_rolodex_test.go b/index/search_rolodex_test.go index 15c9619fc..9991b2503 100644 --- a/index/search_rolodex_test.go +++ b/index/search_rolodex_test.go @@ -5,7 +5,7 @@ package index import ( "fmt" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/require" "path/filepath" "strings" "sync" @@ -15,7 +15,7 @@ import ( "context" "github.com/pb33f/jsonpath/pkg/jsonpath" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/skip_metadata_collection_test.go b/index/skip_metadata_collection_test.go index e6f0b761d..74f675901 100644 --- a/index/skip_metadata_collection_test.go +++ b/index/skip_metadata_collection_test.go @@ -7,8 +7,8 @@ import ( "os" "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/index/spec_index_test.go b/index/spec_index_test.go index c51319699..e94f1c99e 100644 --- a/index/spec_index_test.go +++ b/index/spec_index_test.go @@ -24,7 +24,7 @@ import ( "time" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/tag_circular_references_test.go b/index/tag_circular_references_test.go index 6586436d7..a46568bf4 100644 --- a/index/tag_circular_references_test.go +++ b/index/tag_circular_references_test.go @@ -6,7 +6,7 @@ package index import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/utility_methods_buffer_test.go b/index/utility_methods_buffer_test.go index 44b046cd9..2be6031b9 100644 --- a/index/utility_methods_buffer_test.go +++ b/index/utility_methods_buffer_test.go @@ -8,7 +8,7 @@ import ( "strings" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/index/utility_methods_test.go b/index/utility_methods_test.go index b6939a3e3..73abec0cd 100644 --- a/index/utility_methods_test.go +++ b/index/utility_methods_test.go @@ -11,7 +11,7 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/json/json_test.go b/json/json_test.go index ee2a99077..819cda79e 100644 --- a/json/json_test.go +++ b/json/json_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/pb33f/libopenapi/json" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/orderedmap/builder_test.go b/orderedmap/builder_test.go index 7166f3779..7af92e83c 100644 --- a/orderedmap/builder_test.go +++ b/orderedmap/builder_test.go @@ -7,7 +7,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/orderedmap/orderedmap_test.go b/orderedmap/orderedmap_test.go index d73fa3436..9935c898a 100644 --- a/orderedmap/orderedmap_test.go +++ b/orderedmap/orderedmap_test.go @@ -11,8 +11,8 @@ import ( "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestOrderedMap(t *testing.T) { diff --git a/overlay/engine_test.go b/overlay/engine_test.go index 3ec9d2e64..d0c0eacb8 100644 --- a/overlay/engine_test.go +++ b/overlay/engine_test.go @@ -10,8 +10,8 @@ import ( highoverlay "github.com/pb33f/libopenapi/datamodel/high/overlay" "github.com/pb33f/libopenapi/datamodel/low" lowoverlay "github.com/pb33f/libopenapi/datamodel/low/overlay" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/overlay/validation_test.go b/overlay/validation_test.go index f518b7cd4..f6daf6bf7 100644 --- a/overlay/validation_test.go +++ b/overlay/validation_test.go @@ -7,7 +7,7 @@ import ( "testing" highoverlay "github.com/pb33f/libopenapi/datamodel/high/overlay" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/overlay_test.go b/overlay_test.go index a52587b47..ae23a157a 100644 --- a/overlay_test.go +++ b/overlay_test.go @@ -11,8 +11,8 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/high/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/overlay" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestNewOverlayDocument(t *testing.T) { diff --git a/renderer/mock_generation_options_test.go b/renderer/mock_generation_options_test.go index 671a4676f..10eaac029 100644 --- a/renderer/mock_generation_options_test.go +++ b/renderer/mock_generation_options_test.go @@ -14,8 +14,8 @@ import ( highbase "github.com/pb33f/libopenapi/datamodel/high/base" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/renderer/mock_generator_test.go b/renderer/mock_generator_test.go index b65b52699..a9785415f 100644 --- a/renderer/mock_generator_test.go +++ b/renderer/mock_generator_test.go @@ -14,8 +14,8 @@ import ( lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/renderer/mock_generator_xml_test.go b/renderer/mock_generator_xml_test.go index 252e367b5..c120ee053 100644 --- a/renderer/mock_generator_xml_test.go +++ b/renderer/mock_generator_xml_test.go @@ -13,8 +13,8 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/renderer/mock_value_renderer_test.go b/renderer/mock_value_renderer_test.go index 2ecb541ba..c5bb11762 100644 --- a/renderer/mock_value_renderer_test.go +++ b/renderer/mock_value_renderer_test.go @@ -7,7 +7,7 @@ import ( "testing" highbase "github.com/pb33f/libopenapi/datamodel/high/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestMockValueRendererHandlesNilSchemas(t *testing.T) { diff --git a/renderer/schema_renderer_test.go b/renderer/schema_renderer_test.go index 5691b922f..ce6cef88a 100644 --- a/renderer/schema_renderer_test.go +++ b/renderer/schema_renderer_test.go @@ -26,7 +26,7 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/tests/integration_sibling_refs_test.go b/tests/integration_sibling_refs_test.go index d9b64f6ad..ef7708c67 100644 --- a/tests/integration_sibling_refs_test.go +++ b/tests/integration_sibling_refs_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestSiblingRefs_Integration_Issue90(t *testing.T) { diff --git a/tests/issue438_integration_test.go b/tests/issue438_integration_test.go index c931439b4..20ba7aa24 100644 --- a/tests/issue438_integration_test.go +++ b/tests/issue438_integration_test.go @@ -8,7 +8,7 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) // TestIssue438_PastebinExample tests the specific scenario from the GitHub issue diff --git a/tests/sibling_refs_bench_test.go b/tests/sibling_refs_bench_test.go index 86e23f301..6adabab91 100644 --- a/tests/sibling_refs_bench_test.go +++ b/tests/sibling_refs_bench_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func BenchmarkSiblingRefTransformation(b *testing.B) { diff --git a/tests/what_changed_sibling_refs_test.go b/tests/what_changed_sibling_refs_test.go index ce6d6800b..a9ecb5642 100644 --- a/tests/what_changed_sibling_refs_test.go +++ b/tests/what_changed_sibling_refs_test.go @@ -8,7 +8,7 @@ import ( "github.com/pb33f/libopenapi" "github.com/pb33f/libopenapi/datamodel" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestSiblingRefs_WhatChanged_Integration(t *testing.T) { diff --git a/utils/component_id_golden_test.go b/utils/component_id_golden_test.go index 4d8c827f7..1e71b5789 100644 --- a/utils/component_id_golden_test.go +++ b/utils/component_id_golden_test.go @@ -15,8 +15,8 @@ import ( "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/utils/jsonpath_fastpath_test.go b/utils/jsonpath_fastpath_test.go index 9bcee0e5a..de139a7fb 100644 --- a/utils/jsonpath_fastpath_test.go +++ b/utils/jsonpath_fastpath_test.go @@ -8,8 +8,8 @@ import ( "time" "github.com/pb33f/jsonpath/pkg/jsonpath" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/utils/nodes_test.go b/utils/nodes_test.go index d7ebb9096..a1d749a18 100644 --- a/utils/nodes_test.go +++ b/utils/nodes_test.go @@ -6,7 +6,7 @@ package utils import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestCreateBoolNode(t *testing.T) { diff --git a/utils/type_check_test.go b/utils/type_check_test.go index 8d9b99d83..eb459e5c6 100644 --- a/utils/type_check_test.go +++ b/utils/type_check_test.go @@ -6,7 +6,7 @@ package utils import ( "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestAreValuesCorrectlyTyped(t *testing.T) { diff --git a/utils/unwrap_errors_test.go b/utils/unwrap_errors_test.go index 08339e7ca..e88e18c09 100644 --- a/utils/unwrap_errors_test.go +++ b/utils/unwrap_errors_test.go @@ -7,7 +7,7 @@ import ( "errors" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestUnwrapErrors(t *testing.T) { diff --git a/utils/utils_test.go b/utils/utils_test.go index 4f42ef245..147e9a3c3 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -9,8 +9,8 @@ import ( "time" "github.com/pb33f/jsonpath/pkg/jsonpath" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/breaking_rules_config_test.go b/what-changed/model/breaking_rules_config_test.go index 24b608a0c..e97ee25ab 100644 --- a/what-changed/model/breaking_rules_config_test.go +++ b/what-changed/model/breaking_rules_config_test.go @@ -6,8 +6,8 @@ package model import ( "testing" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" + "github.com/pb33f/testify/assert" + "github.com/pb33f/testify/require" ) func TestValidateBreakingRulesConfigYAML_ValidConfig(t *testing.T) { diff --git a/what-changed/model/breaking_rules_test.go b/what-changed/model/breaking_rules_test.go index 50f9c6774..e078ad6cd 100644 --- a/what-changed/model/breaking_rules_test.go +++ b/what-changed/model/breaking_rules_test.go @@ -8,7 +8,7 @@ import ( "sync" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestDefaultBreakingRules(t *testing.T) { diff --git a/what-changed/model/callback_test.go b/what-changed/model/callback_test.go index f76887f15..28670356a 100644 --- a/what-changed/model/callback_test.go +++ b/what-changed/model/callback_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/change_types_test.go b/what-changed/model/change_types_test.go index 40d881358..9dd111d69 100644 --- a/what-changed/model/change_types_test.go +++ b/what-changed/model/change_types_test.go @@ -7,7 +7,7 @@ import ( "encoding/json" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestChange_MarshalJSON(t *testing.T) { diff --git a/what-changed/model/comparison_functions_test.go b/what-changed/model/comparison_functions_test.go index 28589da4f..bf4362f4e 100644 --- a/what-changed/model/comparison_functions_test.go +++ b/what-changed/model/comparison_functions_test.go @@ -12,7 +12,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" "github.com/pb33f/libopenapi/orderedmap" "github.com/pb33f/libopenapi/utils" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/components_test.go b/what-changed/model/components_test.go index f99b9d32d..b25842e59 100644 --- a/what-changed/model/components_test.go +++ b/what-changed/model/components_test.go @@ -11,7 +11,7 @@ import ( v2 "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/contact_test.go b/what-changed/model/contact_test.go index f12cb2d93..b0e0f6902 100644 --- a/what-changed/model/contact_test.go +++ b/what-changed/model/contact_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/discriminator_test.go b/what-changed/model/discriminator_test.go index 71c67fc03..9efe9dc73 100644 --- a/what-changed/model/discriminator_test.go +++ b/what-changed/model/discriminator_test.go @@ -8,7 +8,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/document_test.go b/what-changed/model/document_test.go index 179139a70..27f3f59e9 100644 --- a/what-changed/model/document_test.go +++ b/what-changed/model/document_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/encoding_test.go b/what-changed/model/encoding_test.go index ae36ee23b..6c8c40683 100644 --- a/what-changed/model/encoding_test.go +++ b/what-changed/model/encoding_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/example_test.go b/what-changed/model/example_test.go index 8c8ec03b8..2ef5ea0cb 100644 --- a/what-changed/model/example_test.go +++ b/what-changed/model/example_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" "github.com/pb33f/libopenapi/datamodel/low" diff --git a/what-changed/model/examples_test.go b/what-changed/model/examples_test.go index ed240adf7..7d461de1f 100644 --- a/what-changed/model/examples_test.go +++ b/what-changed/model/examples_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/extensions_test.go b/what-changed/model/extensions_test.go index 5d3484230..0ae0391a7 100644 --- a/what-changed/model/extensions_test.go +++ b/what-changed/model/extensions_test.go @@ -7,7 +7,7 @@ import ( "testing" "github.com/pb33f/libopenapi/datamodel/low" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/external_docs_test.go b/what-changed/model/external_docs_test.go index 5d6361350..e9c981e4b 100644 --- a/what-changed/model/external_docs_test.go +++ b/what-changed/model/external_docs_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/header_test.go b/what-changed/model/header_test.go index 0a1a02bee..8101cf42c 100644 --- a/what-changed/model/header_test.go +++ b/what-changed/model/header_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/info_test.go b/what-changed/model/info_test.go index ba130c1ea..54921b11b 100644 --- a/what-changed/model/info_test.go +++ b/what-changed/model/info_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/items_test.go b/what-changed/model/items_test.go index 6fd9856a9..626937686 100644 --- a/what-changed/model/items_test.go +++ b/what-changed/model/items_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/license_test.go b/what-changed/model/license_test.go index aa38df7fd..f7b6d5d1b 100644 --- a/what-changed/model/license_test.go +++ b/what-changed/model/license_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" lowbase "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/link_test.go b/what-changed/model/link_test.go index 9123178be..5ef80dbb6 100644 --- a/what-changed/model/link_test.go +++ b/what-changed/model/link_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/media_type_test.go b/what-changed/model/media_type_test.go index 74d4950c7..e2db798fe 100644 --- a/what-changed/model/media_type_test.go +++ b/what-changed/model/media_type_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/nil_checks_test.go b/what-changed/model/nil_checks_test.go index 687ee1d58..5bf376b3d 100644 --- a/what-changed/model/nil_checks_test.go +++ b/what-changed/model/nil_checks_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/base" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) // TestAllChangesModels_NilChecks tests that all *Changes models handle nil properly diff --git a/what-changed/model/oauth_flows_test.go b/what-changed/model/oauth_flows_test.go index 20b78f1a2..b47f6aba2 100644 --- a/what-changed/model/oauth_flows_test.go +++ b/what-changed/model/oauth_flows_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/openapi32_breaking_rules_test.go b/what-changed/model/openapi32_breaking_rules_test.go index a29542833..68a673b5e 100644 --- a/what-changed/model/openapi32_breaking_rules_test.go +++ b/what-changed/model/openapi32_breaking_rules_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/operation_test.go b/what-changed/model/operation_test.go index 109c6e87d..730c0c723 100644 --- a/what-changed/model/operation_test.go +++ b/what-changed/model/operation_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/parameter_test.go b/what-changed/model/parameter_test.go index 60bed0f81..47462cd95 100644 --- a/what-changed/model/parameter_test.go +++ b/what-changed/model/parameter_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/path_item_query_test.go b/what-changed/model/path_item_query_test.go index 84e5f5d18..c75e0a0c4 100644 --- a/what-changed/model/path_item_query_test.go +++ b/what-changed/model/path_item_query_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/path_item_test.go b/what-changed/model/path_item_test.go index 44d3c209f..18fe01c85 100644 --- a/what-changed/model/path_item_test.go +++ b/what-changed/model/path_item_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/paths_test.go b/what-changed/model/paths_test.go index e7ed05157..38331a197 100644 --- a/what-changed/model/paths_test.go +++ b/what-changed/model/paths_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/request_body_test.go b/what-changed/model/request_body_test.go index 9a4eb6447..c56e29fa3 100644 --- a/what-changed/model/request_body_test.go +++ b/what-changed/model/request_body_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/response_test.go b/what-changed/model/response_test.go index 55799a8ef..666b55114 100644 --- a/what-changed/model/response_test.go +++ b/what-changed/model/response_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/responses_test.go b/what-changed/model/responses_test.go index acdf9d660..41f6a2e62 100644 --- a/what-changed/model/responses_test.go +++ b/what-changed/model/responses_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/schema_test.go b/what-changed/model/schema_test.go index d3fde9ea1..a81971437 100644 --- a/what-changed/model/schema_test.go +++ b/what-changed/model/schema_test.go @@ -21,7 +21,7 @@ import ( v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/index" "github.com/pb33f/libopenapi/orderedmap" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/scopes_test.go b/what-changed/model/scopes_test.go index e46252622..7924b2d64 100644 --- a/what-changed/model/scopes_test.go +++ b/what-changed/model/scopes_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/security_requirement_test.go b/what-changed/model/security_requirement_test.go index e9058b095..204fd6764 100644 --- a/what-changed/model/security_requirement_test.go +++ b/what-changed/model/security_requirement_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/security_scheme_test.go b/what-changed/model/security_scheme_test.go index f514c841b..84c642ddd 100644 --- a/what-changed/model/security_scheme_test.go +++ b/what-changed/model/security_scheme_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/v2" "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/server_test.go b/what-changed/model/server_test.go index 4f3a4efb4..7bcd780d3 100644 --- a/what-changed/model/server_test.go +++ b/what-changed/model/server_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/server_variable_test.go b/what-changed/model/server_variable_test.go index a15182dfd..79819e41b 100644 --- a/what-changed/model/server_variable_test.go +++ b/what-changed/model/server_variable_test.go @@ -8,7 +8,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/model/tags_test.go b/what-changed/model/tags_test.go index e811bc935..bc16be208 100644 --- a/what-changed/model/tags_test.go +++ b/what-changed/model/tags_test.go @@ -9,7 +9,7 @@ import ( "github.com/pb33f/libopenapi/datamodel" "github.com/pb33f/libopenapi/datamodel/low" lowv3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestCompareTags(t *testing.T) { diff --git a/what-changed/model/xml_test.go b/what-changed/model/xml_test.go index 2f53ff257..5ea67d3ff 100644 --- a/what-changed/model/xml_test.go +++ b/what-changed/model/xml_test.go @@ -8,7 +8,7 @@ import ( "github.com/pb33f/libopenapi/datamodel/low" "github.com/pb33f/libopenapi/datamodel/low/base" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" "go.yaml.in/yaml/v4" ) diff --git a/what-changed/reports/summary_test.go b/what-changed/reports/summary_test.go index 95164a234..ad0015402 100644 --- a/what-changed/reports/summary_test.go +++ b/what-changed/reports/summary_test.go @@ -10,7 +10,7 @@ import ( "github.com/pb33f/libopenapi" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" "github.com/pb33f/libopenapi/what-changed/model" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func createDiff() *model.DocumentChanges { diff --git a/what-changed/what_changed_test.go b/what-changed/what_changed_test.go index 46d2d699f..87c9d8e1e 100644 --- a/what-changed/what_changed_test.go +++ b/what-changed/what_changed_test.go @@ -11,7 +11,7 @@ import ( "github.com/pb33f/libopenapi/datamodel" v2 "github.com/pb33f/libopenapi/datamodel/low/v2" v3 "github.com/pb33f/libopenapi/datamodel/low/v3" - "github.com/stretchr/testify/assert" + "github.com/pb33f/testify/assert" ) func TestCompareOpenAPIDocuments(t *testing.T) {