diff --git a/integration_test/desktop/env_manager_test.dart b/integration_test/desktop/env_manager_test.dart index 8b35fe4b..2b3667ec 100644 --- a/integration_test/desktop/env_manager_test.dart +++ b/integration_test/desktop/env_manager_test.dart @@ -1,5 +1,5 @@ import 'dart:ui'; - +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:spot/spot.dart'; @@ -23,9 +23,8 @@ Future runDesktopEnvIntegrationTest() async { const unknown = "unknown"; const expectedCurlCode = "curl --url '$testEndpoint$envVarValue'"; - apidashWidgetTest( - "Testing Environment Manager in desktop end-to-end", kExpandedWindowWidth, - (WidgetTester tester, helper) async { + apidashWidgetTest("Testing Environment Manager in desktop end-to-end", + WindowWidth.expanded.value, (WidgetTester tester, helper) async { await tester.pumpUntilFound(find.byType(DashApp)); await Future.delayed(const Duration(seconds: 1)); diff --git a/integration_test/desktop/his_request_test.dart b/integration_test/desktop/his_request_test.dart index b643d7e6..0594a29d 100644 --- a/integration_test/desktop/his_request_test.dart +++ b/integration_test/desktop/his_request_test.dart @@ -1,6 +1,6 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:apidash/app.dart'; -import 'package:apidash/consts.dart'; import 'package:apidash/widgets/widgets.dart'; import '../../test/extensions/widget_tester_extensions.dart'; import '../test_helper.dart'; @@ -10,9 +10,8 @@ Future main() async { } Future runDesktopHisIntegrationTest() async { - apidashWidgetTest( - "Testing History of Requests in desktop end-to-end", kExpandedWindowWidth, - (WidgetTester tester, helper) async { + apidashWidgetTest("Testing History of Requests in desktop end-to-end", + WindowWidth.expanded.value, (WidgetTester tester, helper) async { await tester.pumpUntilFound(find.byType(DashApp)); await Future.delayed(const Duration(seconds: 1)); diff --git a/integration_test/desktop/req_editor_test.dart b/integration_test/desktop/req_editor_test.dart index a3f81ddd..01397640 100644 --- a/integration_test/desktop/req_editor_test.dart +++ b/integration_test/desktop/req_editor_test.dart @@ -1,3 +1,4 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:spot/spot.dart'; import 'package:apidash/app.dart'; @@ -22,9 +23,8 @@ Future runDesktopReqIntegrationTest() async { "data": "870K" }'''; - apidashWidgetTest( - "Testing Request Editor in desktop end-to-end", kExpandedWindowWidth, - (WidgetTester tester, helper) async { + apidashWidgetTest("Testing Request Editor in desktop end-to-end", + WindowWidth.expanded.value, (WidgetTester tester, helper) async { await tester.pumpUntilFound(find.byType(DashApp)); await Future.delayed(const Duration(seconds: 1)); diff --git a/integration_test/mobile/env_manager_test.dart b/integration_test/mobile/env_manager_test.dart index 0fd810fd..8d482f44 100644 --- a/integration_test/mobile/env_manager_test.dart +++ b/integration_test/mobile/env_manager_test.dart @@ -1,5 +1,5 @@ import 'dart:ui'; - +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:spot/spot.dart'; @@ -24,9 +24,8 @@ Future runMobileEnvIntegrationTest() async { const unknown = "unknown"; const expectedCurlCode = "curl --url '$testEndpoint$envVarValue'"; - apidashWidgetTest( - "Testing Environment Manager in mobile end-to-end", kCompactWindowWidth, - (WidgetTester tester, helper) async { + apidashWidgetTest("Testing Environment Manager in mobile end-to-end", + WindowWidth.compact.value, (WidgetTester tester, helper) async { await tester.pumpUntilFound(find.byType(DashApp)); await Future.delayed(const Duration(seconds: 1)); diff --git a/integration_test/mobile/his_request_test.dart b/integration_test/mobile/his_request_test.dart index 995284e0..a73393dd 100644 --- a/integration_test/mobile/his_request_test.dart +++ b/integration_test/mobile/his_request_test.dart @@ -1,3 +1,4 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:spot/spot.dart'; @@ -13,9 +14,8 @@ Future main() async { } Future runMobileHisIntegrationTest() async { - apidashWidgetTest( - "Testing History of Requests in mobile end-to-end", kCompactWindowWidth, - (WidgetTester tester, helper) async { + apidashWidgetTest("Testing History of Requests in mobile end-to-end", + WindowWidth.compact.value, (WidgetTester tester, helper) async { await tester.pumpUntilFound(find.byType(DashApp)); await Future.delayed(const Duration(seconds: 1)); diff --git a/integration_test/mobile/req_editor_test.dart b/integration_test/mobile/req_editor_test.dart index 738d2fc4..245e7e6c 100644 --- a/integration_test/mobile/req_editor_test.dart +++ b/integration_test/mobile/req_editor_test.dart @@ -1,3 +1,4 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:spot/spot.dart'; @@ -24,7 +25,7 @@ Future runMobileReqIntegrationTest() async { }'''; apidashWidgetTest( - "Testing Request Editor in mobile end-to-end", kCompactWindowWidth, + "Testing Request Editor in mobile end-to-end", WindowWidth.compact.value, (WidgetTester tester, helper) async { await tester.pumpUntilFound(find.byType(DashApp)); await Future.delayed(const Duration(seconds: 1)); diff --git a/integration_test/test_helper.dart b/integration_test/test_helper.dart index c7ce0b0b..10bae0e3 100644 --- a/integration_test/test_helper.dart +++ b/integration_test/test_helper.dart @@ -101,7 +101,7 @@ class ApidashTestHelper { Future changeURIScheme(String scheme) async { await tester.tap(find.descendant( - of: find.byType(URIPopupMenu), + of: find.byType(DefaultUriSchemePopupMenu), matching: find.byIcon(Icons.unfold_more))); await tester.pumpAndSettle(); diff --git a/lib/app.dart b/lib/app.dart index ac6f708b..fcc83b50 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -8,7 +8,6 @@ import 'package:window_manager/window_manager.dart' hide WindowCaption; import 'widgets/widgets.dart' show WindowCaption, WorkspaceSelector; import 'providers/providers.dart'; import 'services/services.dart'; -import 'extensions/extensions.dart'; import 'screens/screens.dart'; import 'consts.dart'; diff --git a/lib/codegen/codegen.dart b/lib/codegen/codegen.dart index e8e9432a..ae224eaa 100644 --- a/lib/codegen/codegen.dart +++ b/lib/codegen/codegen.dart @@ -1,6 +1,7 @@ import 'package:apidash/consts.dart'; import 'package:apidash/models/models.dart'; import 'package:apidash/utils/utils.dart' show getNewUuid; +import 'package:apidash_core/apidash_core.dart'; import 'c/curl.dart'; import 'csharp/http_client.dart'; import 'csharp/rest_sharp.dart'; @@ -35,7 +36,7 @@ class Codegen { String? getCode( CodegenLanguage codegenLanguage, RequestModel requestModel, - String defaultUriScheme, { + SupportedUriSchemes defaultUriScheme, { String? boundary, }) { var httpRequestModel = requestModel.httpRequestModel; @@ -48,7 +49,7 @@ class Codegen { url = kDefaultUri; } if (!url.contains("://") && url.isNotEmpty) { - url = "$defaultUriScheme://$url"; + url = "${defaultUriScheme.name}://$url"; } var rM = httpRequestModel.copyWith(url: url); @@ -56,7 +57,7 @@ class Codegen { case CodegenLanguage.curl: return cURLCodeGen().getCode(rM); case CodegenLanguage.har: - return HARCodeGen().getCode(rM, defaultUriScheme, boundary: boundary); + return HARCodeGen().getCode(rM, boundary: boundary); case CodegenLanguage.dartHttp: return DartHttpCodeGen().getCode(rM); case CodegenLanguage.dartDio: diff --git a/lib/codegen/others/har.dart b/lib/codegen/others/har.dart index ad8c559b..932c9c84 100644 --- a/lib/codegen/others/har.dart +++ b/lib/codegen/others/har.dart @@ -3,14 +3,12 @@ import '../../utils/utils.dart'; class HARCodeGen { String? getCode( - HttpRequestModel requestModel, - String defaultUriScheme, { + HttpRequestModel requestModel, { String? boundary, }) { try { var harString = kJsonEncoder.convert(requestModelToHARJsonRequest( requestModel, - defaultUriScheme: defaultUriScheme, useEnabled: true, boundary: boundary, )); diff --git a/lib/consts.dart b/lib/consts.dart index e72c8f98..4bed3398 100644 --- a/lib/consts.dart +++ b/lib/consts.dart @@ -30,10 +30,6 @@ const kMinWindowSize = Size(320, 640); const kMinInitialWindowWidth = 1200.0; const kMinInitialWindowHeight = 800.0; const kMinRequestEditorDetailsCardPaneSize = 300.0; -const kCompactWindowWidth = 600.0; -const kMediumWindowWidth = 840.0; -const kExpandedWindowWidth = 1200.0; -const kLargeWindowWidth = 1600.0; final kHomeScaffoldKey = GlobalKey(); final kEnvScaffoldKey = GlobalKey(); diff --git a/lib/extensions/context_extensions.dart b/lib/extensions/context_extensions.dart deleted file mode 100644 index 69f97893..00000000 --- a/lib/extensions/context_extensions.dart +++ /dev/null @@ -1,22 +0,0 @@ -import 'package:apidash/consts.dart'; -import 'package:flutter/material.dart'; - -extension MediaQueryExtension on BuildContext { - bool get isCompactWindow => - MediaQuery.of(this).size.width < kCompactWindowWidth; - - bool get isMediumWindow => - MediaQuery.of(this).size.width < kMediumWindowWidth; - - bool get isExpandedWindow => - MediaQuery.of(this).size.width < kExpandedWindowWidth; - - bool get isLargeWindow => MediaQuery.of(this).size.width < kLargeWindowWidth; - - bool get isExtraLargeWindow => - MediaQuery.of(this).size.width > kLargeWindowWidth; - - double get width => MediaQuery.of(this).size.width; - - double get height => MediaQuery.of(this).size.height; -} diff --git a/lib/models/settings_model.dart b/lib/models/settings_model.dart index c2237a07..b2f443ca 100644 --- a/lib/models/settings_model.dart +++ b/lib/models/settings_model.dart @@ -22,7 +22,7 @@ class SettingsModel { final bool alwaysShowCollectionPaneScrollbar; final Size? size; final Offset? offset; - final String defaultUriScheme; + final SupportedUriSchemes defaultUriScheme; final CodegenLanguage defaultCodeGenLang; final bool saveResponses; final bool promptBeforeClosing; @@ -35,7 +35,7 @@ class SettingsModel { bool? alwaysShowCollectionPaneScrollbar, Size? size, Offset? offset, - String? defaultUriScheme, + SupportedUriSchemes? defaultUriScheme, CodegenLanguage? defaultCodeGenLang, bool? saveResponses, bool? promptBeforeClosing, @@ -94,7 +94,16 @@ class SettingsModel { if (dx != null && dy != null) { offset = Offset(dx, dy); } - final defaultUriScheme = data["defaultUriScheme"] as String?; + final defaultUriSchemeStr = data["defaultUriScheme"] as String?; + SupportedUriSchemes? defaultUriScheme; + if (defaultUriSchemeStr != null) { + try { + defaultUriScheme = + SupportedUriSchemes.values.byName(defaultUriSchemeStr); + } catch (e) { + // pass + } + } final defaultCodeGenLangStr = data["defaultCodeGenLang"] as String?; CodegenLanguage? defaultCodeGenLang; if (defaultCodeGenLangStr != null) { @@ -146,7 +155,7 @@ class SettingsModel { "height": size?.height, "dx": offset?.dx, "dy": offset?.dy, - "defaultUriScheme": defaultUriScheme, + "defaultUriScheme": defaultUriScheme.name, "defaultCodeGenLang": defaultCodeGenLang.name, "saveResponses": saveResponses, "promptBeforeClosing": promptBeforeClosing, diff --git a/lib/providers/environment_providers.dart b/lib/providers/environment_providers.dart index 8a117632..0f29cb2d 100644 --- a/lib/providers/environment_providers.dart +++ b/lib/providers/environment_providers.dart @@ -35,15 +35,15 @@ final availableEnvironmentVariablesStateProvider = return result; }); -final StateNotifierProvider?> environmentsStateNotifierProvider = - StateNotifierProvider((ref) => EnvironmentsStateNotifier(ref, hiveHandler)); - final environmentSequenceProvider = StateProvider>((ref) { var ids = hiveHandler.getEnvironmentIds(); return ids ?? [kGlobalEnvironmentId]; }); +final StateNotifierProvider?> environmentsStateNotifierProvider = + StateNotifierProvider((ref) => EnvironmentsStateNotifier(ref, hiveHandler)); + class EnvironmentsStateNotifier extends StateNotifier?> { EnvironmentsStateNotifier(this.ref, this.hiveHandler) : super(null) { @@ -65,14 +65,13 @@ class EnvironmentsStateNotifier bool loadEnvironments() { List? environmentIds = hiveHandler.getEnvironmentIds(); if (environmentIds == null || environmentIds.isEmpty) { - String globalId = kGlobalEnvironmentId; const globalEnvironment = EnvironmentModel( id: kGlobalEnvironmentId, name: "Global", values: [], ); state = { - globalId: globalEnvironment, + kGlobalEnvironmentId: globalEnvironment, }; return false; } else { @@ -108,7 +107,7 @@ class EnvironmentsStateNotifier }; ref .read(environmentSequenceProvider.notifier) - .update((state) => [id, ...state]); + .update((state) => [...state, id]); ref.read(selectedEnvironmentIdStateProvider.notifier).state = newEnvironmentModel.id; ref.read(hasUnsavedChangesProvider.notifier).state = true; diff --git a/lib/providers/settings_providers.dart b/lib/providers/settings_providers.dart index 43256ab3..f6b4392f 100644 --- a/lib/providers/settings_providers.dart +++ b/lib/providers/settings_providers.dart @@ -1,3 +1,4 @@ +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../models/models.dart'; @@ -24,7 +25,7 @@ class ThemeStateNotifier extends StateNotifier { bool? alwaysShowCollectionPaneScrollbar, Size? size, Offset? offset, - String? defaultUriScheme, + SupportedUriSchemes? defaultUriScheme, CodegenLanguage? defaultCodeGenLang, bool? saveResponses, bool? promptBeforeClosing, diff --git a/lib/screens/common_widgets/environment_dropdown.dart b/lib/screens/common_widgets/environment_dropdown.dart index fc45febd..f0b8a845 100644 --- a/lib/screens/common_widgets/environment_dropdown.dart +++ b/lib/screens/common_widgets/environment_dropdown.dart @@ -1,9 +1,8 @@ -import 'package:apidash_design_system/apidash_design_system.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/widgets.dart'; -import 'package:apidash/consts.dart'; class EnvironmentDropdown extends ConsumerWidget { const EnvironmentDropdown({super.key}); @@ -11,28 +10,25 @@ class EnvironmentDropdown extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { final environments = ref.watch(environmentsStateNotifierProvider); - final environmentsList = environments?.values.toList(); - environmentsList - ?.removeWhere((element) => element.id == kGlobalEnvironmentId); + final environmentSequence = ref.watch(environmentSequenceProvider); + final environmentsList = environmentSequence + .map((e) => environments?[e]) + .whereNotNull() + .toList(); + final activeEnvironment = ref.watch(activeEnvironmentIdStateProvider); - return Container( - decoration: BoxDecoration( - border: Border.all( - color: Theme.of(context).colorScheme.outlineVariant, - ), - borderRadius: kBorderRadius8, - ), - child: EnvironmentPopupMenu( - value: environments?[activeEnvironment], - items: environmentsList, - onChanged: (value) { - ref.read(activeEnvironmentIdStateProvider.notifier).state = - value?.id; - ref - .read(settingsProvider.notifier) - .update(activeEnvironmentId: value?.id); - ref.read(hasUnsavedChangesProvider.notifier).state = true; - }, - )); + return EnvironmentPopupMenu( + value: environments?[activeEnvironment], + options: environmentsList, + onChanged: (value) { + if (value != null) { + ref.read(activeEnvironmentIdStateProvider.notifier).state = value.id; + ref + .read(settingsProvider.notifier) + .update(activeEnvironmentId: value.id); + ref.read(hasUnsavedChangesProvider.notifier).state = true; + } + }, + ); } } diff --git a/lib/screens/common_widgets/sidebar_header.dart b/lib/screens/common_widgets/sidebar_header.dart index 2bf472be..2da3aebf 100644 --- a/lib/screens/common_widgets/sidebar_header.dart +++ b/lib/screens/common_widgets/sidebar_header.dart @@ -2,7 +2,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:apidash/providers/providers.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/consts.dart'; import 'sidebar_save_button.dart'; diff --git a/lib/screens/envvar/editor_pane/variables_tabs.dart b/lib/screens/envvar/editor_pane/variables_tabs.dart index 073d74f1..d6f27992 100644 --- a/lib/screens/envvar/editor_pane/variables_tabs.dart +++ b/lib/screens/envvar/editor_pane/variables_tabs.dart @@ -2,7 +2,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/utils/utils.dart'; diff --git a/lib/screens/envvar/environment_editor.dart b/lib/screens/envvar/environment_editor.dart index f46ca464..4ca07b57 100644 --- a/lib/screens/envvar/environment_editor.dart +++ b/lib/screens/envvar/environment_editor.dart @@ -2,7 +2,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:apidash/providers/providers.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/consts.dart'; import '../common_widgets/common_widgets.dart'; diff --git a/lib/screens/envvar/environment_page.dart b/lib/screens/envvar/environment_page.dart index 360b4551..4f81a0ed 100644 --- a/lib/screens/envvar/environment_page.dart +++ b/lib/screens/envvar/environment_page.dart @@ -1,7 +1,7 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/widgets/widgets.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/utils/utils.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/screens/envvar/environments_pane.dart b/lib/screens/envvar/environments_pane.dart index 7939fbc0..18bd2053 100644 --- a/lib/screens/envvar/environments_pane.dart +++ b/lib/screens/envvar/environments_pane.dart @@ -2,7 +2,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/models/environment_model.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/widgets.dart'; @@ -17,9 +16,7 @@ class EnvironmentsPane extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { return Padding( - padding: (!context.isMediumWindow && kIsMacOS - ? kP24CollectionPane - : kP8CollectionPane) + + padding: (!context.isMediumWindow && kIsMacOS ? kPt24l4 : kPt8l4) + (context.isMediumWindow ? kPb70 : EdgeInsets.zero), child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/screens/history/history_details.dart b/lib/screens/history/history_details.dart index 196e4a33..43a0e8f5 100644 --- a/lib/screens/history/history_details.dart +++ b/lib/screens/history/history_details.dart @@ -29,7 +29,7 @@ class _HistoryDetailsState extends ConsumerState return selectedHistoryRequest != null ? LayoutBuilder( builder: (context, constraints) { - final isCompact = constraints.maxWidth < kMediumWindowWidth; + final isCompact = constraints.maxWidth < WindowWidth.medium.value; return Column( children: [ kVSpacer5, diff --git a/lib/screens/history/history_page.dart b/lib/screens/history/history_page.dart index d56c90f7..37ca2c5e 100644 --- a/lib/screens/history/history_page.dart +++ b/lib/screens/history/history_page.dart @@ -1,7 +1,7 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/widgets/widgets.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/utils/utils.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/screens/history/history_pane.dart b/lib/screens/history/history_pane.dart index 45f0abce..95cbb559 100644 --- a/lib/screens/history/history_pane.dart +++ b/lib/screens/history/history_pane.dart @@ -2,7 +2,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/models/models.dart'; diff --git a/lib/screens/history/history_viewer.dart b/lib/screens/history/history_viewer.dart index d9a240d5..9f5de4be 100644 --- a/lib/screens/history/history_viewer.dart +++ b/lib/screens/history/history_viewer.dart @@ -1,6 +1,5 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/consts.dart'; import 'history_details.dart'; diff --git a/lib/screens/history/history_widgets/his_bottombar.dart b/lib/screens/history/history_widgets/his_bottombar.dart index 4cc0e8a7..12aceacb 100644 --- a/lib/screens/history/history_widgets/his_bottombar.dart +++ b/lib/screens/history/history_widgets/his_bottombar.dart @@ -1,7 +1,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/utils/utils.dart'; import '../history_requests.dart'; diff --git a/lib/screens/history/history_widgets/his_sidebar_header.dart b/lib/screens/history/history_widgets/his_sidebar_header.dart index c7d33cc0..9f929e40 100644 --- a/lib/screens/history/history_widgets/his_sidebar_header.dart +++ b/lib/screens/history/history_widgets/his_sidebar_header.dart @@ -1,7 +1,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/consts.dart'; diff --git a/lib/screens/history/history_widgets/his_url_card.dart b/lib/screens/history/history_widgets/his_url_card.dart index 80d9a946..7ce5833c 100644 --- a/lib/screens/history/history_widgets/his_url_card.dart +++ b/lib/screens/history/history_widgets/his_url_card.dart @@ -22,7 +22,7 @@ class HistoryURLCard extends StatelessWidget { return LayoutBuilder(builder: (context, constraints) { final isCompact = constraints.maxWidth <= kMinWindowSize.width; - final isExpanded = constraints.maxWidth >= kMediumWindowWidth - 8; + final isExpanded = constraints.maxWidth >= WindowWidth.medium.value - 8; return Card( color: kColorTransparent, surfaceTintColor: kColorTransparent, diff --git a/lib/screens/home_page/collection_pane.dart b/lib/screens/home_page/collection_pane.dart index aaffe9bc..bfac27a8 100644 --- a/lib/screens/home_page/collection_pane.dart +++ b/lib/screens/home_page/collection_pane.dart @@ -3,7 +3,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/importer/import_dialog.dart'; import 'package:apidash/providers/providers.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/widgets/widgets.dart'; import 'package:apidash/models/models.dart'; import 'package:apidash/consts.dart'; @@ -24,9 +23,7 @@ class CollectionPane extends ConsumerWidget { ); } return Padding( - padding: (!context.isMediumWindow && kIsMacOS - ? kP24CollectionPane - : kP8CollectionPane) + + padding: (!context.isMediumWindow && kIsMacOS ? kPt24l4 : kPt8l4) + (context.isMediumWindow ? kPb70 : EdgeInsets.zero), child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, diff --git a/lib/screens/home_page/editor_pane/editor_request.dart b/lib/screens/home_page/editor_pane/editor_request.dart index 7e1a39bf..902e5151 100644 --- a/lib/screens/home_page/editor_pane/editor_request.dart +++ b/lib/screens/home_page/editor_pane/editor_request.dart @@ -1,6 +1,5 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/consts.dart'; import 'details_card/details_card.dart'; import 'details_card/request_pane/request_pane.dart'; diff --git a/lib/screens/home_page/editor_pane/url_card.dart b/lib/screens/home_page/editor_pane/url_card.dart index 0ccee814..cd6c00c4 100644 --- a/lib/screens/home_page/editor_pane/url_card.dart +++ b/lib/screens/home_page/editor_pane/url_card.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/widgets.dart'; -import 'package:apidash/extensions/extensions.dart'; import '../../common_widgets/common_widgets.dart'; class EditorPaneRequestURLCard extends StatelessWidget { diff --git a/lib/screens/home_page/home_page.dart b/lib/screens/home_page/home_page.dart index 76509a08..a93698dd 100644 --- a/lib/screens/home_page/home_page.dart +++ b/lib/screens/home_page/home_page.dart @@ -1,6 +1,6 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/widgets/widgets.dart'; -import 'package:apidash/extensions/extensions.dart'; import '../mobile/requests_page/requests_page.dart'; import 'editor_pane/editor_pane.dart'; import 'collection_pane.dart'; diff --git a/lib/screens/mobile/dashboard.dart b/lib/screens/mobile/dashboard.dart index 0cef40ab..4e4cbd1f 100644 --- a/lib/screens/mobile/dashboard.dart +++ b/lib/screens/mobile/dashboard.dart @@ -1,8 +1,8 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flex_color_scheme/flex_color_scheme.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'requests_page/requests_page.dart'; import '../envvar/environment_page.dart'; diff --git a/lib/screens/mobile/widgets/page_base.dart b/lib/screens/mobile/widgets/page_base.dart index fb4e98b1..ebd3ff4c 100644 --- a/lib/screens/mobile/widgets/page_base.dart +++ b/lib/screens/mobile/widgets/page_base.dart @@ -2,7 +2,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:apidash/consts.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/providers/providers.dart'; import 'package:apidash/widgets/window_caption.dart'; diff --git a/lib/screens/settings_page.dart b/lib/screens/settings_page.dart index 6ff675fe..74890a7f 100644 --- a/lib/screens/settings_page.dart +++ b/lib/screens/settings_page.dart @@ -1,13 +1,11 @@ -import 'package:apidash_core/apidash_core.dart'; -import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; +import 'package:apidash_design_system/apidash_design_system.dart'; import '../providers/providers.dart'; import '../services/services.dart'; import '../utils/utils.dart'; import '../widgets/widgets.dart'; import '../consts.dart'; -import '../extensions/extensions.dart'; class SettingsPage extends ConsumerWidget { const SettingsPage({super.key}); @@ -68,43 +66,25 @@ class SettingsPage extends ConsumerWidget { title: const Text('Default URI Scheme'), subtitle: Text( '$kDefaultUri → ${settings.defaultUriScheme}://$kDefaultUri'), - trailing: Container( - decoration: BoxDecoration( - border: Border.all( - color: Theme.of(context).colorScheme.onSurface, - ), - borderRadius: kBorderRadius8, - ), - child: URIPopupMenu( - value: settings.defaultUriScheme, - onChanged: (value) { - ref - .read(settingsProvider.notifier) - .update(defaultUriScheme: value); - }, - items: kSupportedUriSchemes, - ), + trailing: DefaultUriSchemePopupMenu( + value: settings.defaultUriScheme, + onChanged: (value) { + ref + .read(settingsProvider.notifier) + .update(defaultUriScheme: value); + }, ), ), ListTile( hoverColor: kColorTransparent, title: const Text('Default Code Generator'), - trailing: Container( - decoration: BoxDecoration( - border: Border.all( - color: Theme.of(context).colorScheme.onSurface, - ), - borderRadius: kBorderRadius8, - ), - child: CodegenPopupMenu( - value: settings.defaultCodeGenLang, - onChanged: (value) { - ref - .read(settingsProvider.notifier) - .update(defaultCodeGenLang: value); - }, - items: CodegenLanguage.values, - ), + trailing: CodegenPopupMenu( + value: settings.defaultCodeGenLang, + onChanged: (value) { + ref + .read(settingsProvider.notifier) + .update(defaultCodeGenLang: value); + }, ), ), CheckboxListTile( @@ -153,22 +133,13 @@ class SettingsPage extends ConsumerWidget { title: const Text('History Retention Period'), subtitle: Text( 'Your request history will be retained${settings.historyRetentionPeriod == HistoryRetentionPeriod.forever ? "" : " for"} ${settings.historyRetentionPeriod.label}'), - trailing: Container( - decoration: BoxDecoration( - border: Border.all( - color: Theme.of(context).colorScheme.onSurface, - ), - borderRadius: kBorderRadius8, - ), - child: HistoryRetentionPopupMenu( - value: settings.historyRetentionPeriod, - onChanged: (value) { - ref - .read(settingsProvider.notifier) - .update(historyRetentionPeriod: value); - }, - items: HistoryRetentionPeriod.values, - ), + trailing: HistoryRetentionPopupMenu( + value: settings.historyRetentionPeriod, + onChanged: (value) { + ref + .read(settingsProvider.notifier) + .update(historyRetentionPeriod: value); + }, ), ), ListTile( diff --git a/lib/utils/har_utils.dart b/lib/utils/har_utils.dart index 5f74f819..31c466ce 100644 --- a/lib/utils/har_utils.dart +++ b/lib/utils/har_utils.dart @@ -78,7 +78,7 @@ Map entryToHAR(RequestModel requestModel) { Map requestModelToHARJsonRequest( HttpRequestModel? requestModel, { - defaultUriScheme = kDefaultUriScheme, + SupportedUriSchemes defaultUriScheme = kDefaultUriScheme, bool exportMode = false, bool useEnabled = false, String? boundary, diff --git a/lib/widgets/dropdown_http_method.dart b/lib/widgets/dropdown_http_method.dart index 044752aa..4d175de3 100644 --- a/lib/widgets/dropdown_http_method.dart +++ b/lib/widgets/dropdown_http_method.dart @@ -2,7 +2,6 @@ import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:apidash/utils/utils.dart'; -import 'package:apidash/extensions/extensions.dart'; class DropdownButtonHttpMethod extends StatelessWidget { const DropdownButtonHttpMethod({ diff --git a/lib/widgets/popup_menu_codegen.dart b/lib/widgets/popup_menu_codegen.dart index a978d906..0788d9ec 100644 --- a/lib/widgets/popup_menu_codegen.dart +++ b/lib/widgets/popup_menu_codegen.dart @@ -1,6 +1,5 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/consts.dart'; class CodegenPopupMenu extends StatelessWidget { @@ -8,50 +7,21 @@ class CodegenPopupMenu extends StatelessWidget { super.key, required this.value, this.onChanged, - this.items, }); final CodegenLanguage value; final void Function(CodegenLanguage? value)? onChanged; - final List? items; + @override Widget build(BuildContext context) { - final double boxLength = context.isCompactWindow ? 150 : 220; - return PopupMenuButton( + final double width = context.isCompactWindow ? 150 : 220; + return ADPopupMenu( + value: value.label, + values: CodegenLanguage.values.map((e) => (e, e.label)), + width: width, tooltip: "Select Code Generation Language", - surfaceTintColor: kColorTransparent, - constraints: BoxConstraints(minWidth: boxLength), - itemBuilder: (BuildContext context) => items! - .map((item) => PopupMenuItem( - value: item, - child: Text( - item.label, - style: kTextStylePopupMenuItem, - ), - )) - .toList(), - onSelected: onChanged, - child: Container( - width: boxLength, - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - value.label, - style: kTextStylePopupMenuItem, - softWrap: false, - overflow: TextOverflow.ellipsis, - ), - ), - const Icon( - Icons.unfold_more, - size: 16, - ) - ], - ), - ), + onChanged: onChanged, + isOutlined: true, ); } } diff --git a/lib/widgets/popup_menu_env.dart b/lib/widgets/popup_menu_env.dart index 0a58ef58..1ee1022d 100644 --- a/lib/widgets/popup_menu_env.dart +++ b/lib/widgets/popup_menu_env.dart @@ -1,73 +1,41 @@ import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/models/models.dart'; import 'package:apidash/utils/utils.dart'; +import '../consts.dart'; class EnvironmentPopupMenu extends StatelessWidget { const EnvironmentPopupMenu({ super.key, this.value, + this.options, this.onChanged, - this.items, }); final EnvironmentModel? value; final void Function(EnvironmentModel? value)? onChanged; - final List? items; - final EnvironmentModel? noneEnvironmentModel = null; + final List? options; + @override Widget build(BuildContext context) { - final valueName = getEnvironmentTitle(value?.name); - final double boxLength = context.isCompactWindow ? 100 : 130; - return PopupMenuButton( + final double width = context.isCompactWindow ? 100 : 130; + + return ADPopupMenu( + value: (value == null || value?.id == kGlobalEnvironmentId) + ? "None" + : getEnvironmentTitle(value?.name), + values: options?.map((e) => ( + e, + (e.id == kGlobalEnvironmentId) + ? "None" + : getEnvironmentTitle(e.name).clip(30) + )) ?? + [], + width: width, tooltip: "Select Environment", - surfaceTintColor: kColorTransparent, - constraints: BoxConstraints(minWidth: boxLength), - itemBuilder: (BuildContext context) { - return [ - PopupMenuItem( - value: noneEnvironmentModel, - onTap: () { - onChanged?.call(null); - }, - child: const Text("None"), - ), - ...items!.map((EnvironmentModel environment) { - final name = getEnvironmentTitle(environment.name).clip(30); - return PopupMenuItem( - value: environment, - child: Text( - name, - softWrap: false, - overflow: TextOverflow.ellipsis, - ), - ); - }) - ]; - }, - onSelected: onChanged, - child: Container( - width: boxLength, - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - value == null ? "None" : valueName, - softWrap: false, - overflow: TextOverflow.ellipsis, - ), - ), - const Icon( - Icons.unfold_more, - size: 16, - ) - ], - ), - ), + onChanged: onChanged, + isOutlined: true, ); } } diff --git a/lib/widgets/popup_menu_history.dart b/lib/widgets/popup_menu_history.dart index fd8a9c4f..16a3ee55 100644 --- a/lib/widgets/popup_menu_history.dart +++ b/lib/widgets/popup_menu_history.dart @@ -5,57 +5,23 @@ import 'package:apidash/consts.dart'; class HistoryRetentionPopupMenu extends StatelessWidget { const HistoryRetentionPopupMenu({ super.key, - required this.value, - required this.onChanged, - this.items, + this.value, + this.onChanged, }); - final HistoryRetentionPeriod value; - final void Function(HistoryRetentionPeriod value) onChanged; - final List? items; + final HistoryRetentionPeriod? value; + final void Function(HistoryRetentionPeriod? value)? onChanged; + @override Widget build(BuildContext context) { - const double boxLength = 120; - return PopupMenuButton( + const double width = 120; + return ADPopupMenu( + value: value?.label, + values: HistoryRetentionPeriod.values.map((e) => (e, e.label)), + width: width, tooltip: "Select retention period", - surfaceTintColor: kColorTransparent, - constraints: const BoxConstraints(minWidth: boxLength), - itemBuilder: (BuildContext context) { - return [ - ...items!.map((period) { - return PopupMenuItem( - value: period, - child: Text( - period.label, - softWrap: false, - overflow: TextOverflow.ellipsis, - ), - ); - }) - ]; - }, - onSelected: onChanged, - child: Container( - width: boxLength, - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - value.label, - style: kTextStylePopupMenuItem, - softWrap: false, - overflow: TextOverflow.ellipsis, - ), - ), - const Icon( - Icons.unfold_more, - size: 16, - ) - ], - ), - ), + onChanged: onChanged, + isOutlined: true, ); } } diff --git a/lib/widgets/popup_menu_uri.dart b/lib/widgets/popup_menu_uri.dart index c485c0fc..898bd7d4 100644 --- a/lib/widgets/popup_menu_uri.dart +++ b/lib/widgets/popup_menu_uri.dart @@ -1,56 +1,27 @@ +import 'package:apidash_core/apidash_core.dart'; import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; -import 'package:apidash/extensions/extensions.dart'; -class URIPopupMenu extends StatelessWidget { - const URIPopupMenu({ +class DefaultUriSchemePopupMenu extends StatelessWidget { + const DefaultUriSchemePopupMenu({ super.key, - required this.value, + this.value, this.onChanged, - this.items, }); - final String value; - final void Function(String? value)? onChanged; - final List? items; + final SupportedUriSchemes? value; + final void Function(SupportedUriSchemes? value)? onChanged; + @override Widget build(BuildContext context) { - final double boxLength = context.isCompactWindow ? 90 : 110; - return PopupMenuButton( - tooltip: "Select URI Scheme", - surfaceTintColor: kColorTransparent, - constraints: BoxConstraints(minWidth: boxLength), - itemBuilder: (BuildContext context) => items! - .map((item) => PopupMenuItem( - value: item, - child: Text( - item, - style: kTextStylePopupMenuItem, - ), - )) - .toList(), - onSelected: onChanged, - child: Container( - width: boxLength, - padding: const EdgeInsets.all(8.0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Expanded( - child: Text( - value, - style: kTextStylePopupMenuItem, - softWrap: false, - overflow: TextOverflow.ellipsis, - ), - ), - const Icon( - Icons.unfold_more, - size: 16, - ) - ], - ), - ), + final double width = context.isCompactWindow ? 90 : 110; + return ADPopupMenu( + value: value?.name, + values: SupportedUriSchemes.values.map((e) => (e, e.name)), + width: width, + tooltip: "Select Default URI Scheme", + onChanged: onChanged, + isOutlined: true, ); } } diff --git a/lib/widgets/request_widgets.dart b/lib/widgets/request_widgets.dart index 1b2bf00d..638c1f7a 100644 --- a/lib/widgets/request_widgets.dart +++ b/lib/widgets/request_widgets.dart @@ -1,7 +1,6 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/consts.dart'; import 'tabs.dart'; diff --git a/lib/widgets/splitview_drawer.dart b/lib/widgets/splitview_drawer.dart index 210d2788..d3744e4b 100644 --- a/lib/widgets/splitview_drawer.dart +++ b/lib/widgets/splitview_drawer.dart @@ -1,6 +1,5 @@ import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; -import 'package:apidash/extensions/extensions.dart'; import 'package:apidash/consts.dart'; class DrawerSplitView extends StatelessWidget { diff --git a/packages/apidash_core/lib/consts.dart b/packages/apidash_core/lib/consts.dart index 93a7acea..44253288 100644 --- a/packages/apidash_core/lib/consts.dart +++ b/packages/apidash_core/lib/consts.dart @@ -13,7 +13,7 @@ enum SupportedUriSchemes { https, http } final kSupportedUriSchemes = SupportedUriSchemes.values.map((i) => i.name).toList(); -const kDefaultUriScheme = "https"; +const kDefaultUriScheme = SupportedUriSchemes.https; final kLocalhostRegex = RegExp(r'^localhost(:\d+)?(/.*)?$'); const kMethodsWithBody = [ diff --git a/packages/apidash_core/lib/services/http_service.dart b/packages/apidash_core/lib/services/http_service.dart index a92648d8..1e6eb53f 100644 --- a/packages/apidash_core/lib/services/http_service.dart +++ b/packages/apidash_core/lib/services/http_service.dart @@ -12,7 +12,7 @@ typedef HttpResponse = http.Response; Future<(HttpResponse?, Duration?, String?)> request( HttpRequestModel requestModel, { - String defaultUriScheme = kDefaultUriScheme, + SupportedUriSchemes defaultUriScheme = kDefaultUriScheme, String? requestId, }) async { final clientManager = HttpClientManager(); diff --git a/packages/apidash_core/lib/utils/uri_utils.dart b/packages/apidash_core/lib/utils/uri_utils.dart index 8776926d..b111a2e0 100644 --- a/packages/apidash_core/lib/utils/uri_utils.dart +++ b/packages/apidash_core/lib/utils/uri_utils.dart @@ -5,7 +5,7 @@ import 'http_request_utils.dart'; (String?, bool) getUriScheme(Uri uri) { if (uri.hasScheme) { - if (kSupportedUriSchemes.contains(uri.scheme)) { + if (kSupportedUriSchemes.contains(uri.scheme.toLowerCase())) { return (uri.scheme, true); } return (uri.scheme, false); @@ -24,7 +24,7 @@ String stripUrlParams(String url) { (Uri?, String?) getValidRequestUri( String? url, List? requestParams, - {String defaultUriScheme = kDefaultUriScheme}) { + {SupportedUriSchemes defaultUriScheme = kDefaultUriScheme}) { url = url?.trim(); if (url == null || url == "") { return (null, "URL is missing!"); @@ -44,7 +44,7 @@ String stripUrlParams(String url) { return (null, "Unsupported URL Scheme (${urlScheme.$1})"); } } else { - url = "$defaultUriScheme://$url"; + url = "${defaultUriScheme.name}://$url"; } uri = Uri.parse(url); diff --git a/packages/apidash_design_system/lib/apidash_design_system.dart b/packages/apidash_design_system/lib/apidash_design_system.dart index c8d6ff3e..dde9cd60 100644 --- a/packages/apidash_design_system/lib/apidash_design_system.dart +++ b/packages/apidash_design_system/lib/apidash_design_system.dart @@ -1,5 +1,6 @@ library apidash_design_system; export 'package:google_fonts/google_fonts.dart'; +export 'extensions/extensions.dart'; +export 'tokens/tokens.dart'; export 'widgets/widgets.dart'; -export 'consts.dart'; diff --git a/packages/apidash_design_system/lib/extensions/context_extensions.dart b/packages/apidash_design_system/lib/extensions/context_extensions.dart new file mode 100644 index 00000000..a8486b09 --- /dev/null +++ b/packages/apidash_design_system/lib/extensions/context_extensions.dart @@ -0,0 +1,23 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; +import 'package:flutter/material.dart'; + +extension MediaQueryExtension on BuildContext { + bool get isCompactWindow => + MediaQuery.of(this).size.width < WindowWidth.compact.value; + + bool get isMediumWindow => + MediaQuery.of(this).size.width < WindowWidth.medium.value; + + bool get isExpandedWindow => + MediaQuery.of(this).size.width < WindowWidth.expanded.value; + + bool get isLargeWindow => + MediaQuery.of(this).size.width < WindowWidth.large.value; + + bool get isExtraLargeWindow => + MediaQuery.of(this).size.width > WindowWidth.large.value; + + double get width => MediaQuery.of(this).size.width; + + double get height => MediaQuery.of(this).size.height; +} diff --git a/lib/extensions/extensions.dart b/packages/apidash_design_system/lib/extensions/extensions.dart similarity index 100% rename from lib/extensions/extensions.dart rename to packages/apidash_design_system/lib/extensions/extensions.dart diff --git a/packages/apidash_design_system/lib/tokens/colors.dart b/packages/apidash_design_system/lib/tokens/colors.dart new file mode 100644 index 00000000..287b70b6 --- /dev/null +++ b/packages/apidash_design_system/lib/tokens/colors.dart @@ -0,0 +1,30 @@ +import 'package:flutter/material.dart'; + +final kColorTransparentState = + WidgetStateProperty.all(Colors.transparent); +const kColorTransparent = Colors.transparent; +const kColorWhite = Colors.white; +const kColorBlack = Colors.black; +const kColorRed = Colors.red; +final kColorLightDanger = Colors.red.withOpacity(0.9); +const kColorDarkDanger = Color(0xffcf6679); + +const kColorSchemeSeed = Colors.blue; + +final kColorStatusCodeDefault = Colors.grey.shade700; +final kColorStatusCode200 = Colors.green.shade800; +final kColorStatusCode300 = Colors.blue.shade800; +final kColorStatusCode400 = Colors.red.shade800; +final kColorStatusCode500 = Colors.amber.shade900; + +final kColorHttpMethodGet = Colors.green.shade800; +final kColorHttpMethodHead = kColorHttpMethodGet; +final kColorHttpMethodPost = Colors.blue.shade800; +final kColorHttpMethodPut = Colors.amber.shade900; +final kColorHttpMethodPatch = kColorHttpMethodPut; +final kColorHttpMethodDelete = Colors.red.shade800; + +const kHintOpacity = 0.6; +const kForegroundOpacity = 0.05; +const kOverlayBackgroundOpacity = 0.5; +const kOpacityDarkModeBlend = 0.4; diff --git a/packages/apidash_design_system/lib/tokens/measurements.dart b/packages/apidash_design_system/lib/tokens/measurements.dart new file mode 100644 index 00000000..7a535cab --- /dev/null +++ b/packages/apidash_design_system/lib/tokens/measurements.dart @@ -0,0 +1,94 @@ +import 'package:flutter/material.dart'; + +enum WindowWidth { + compact(600.0), + medium(840.0), + expanded(1200.0), + large(1600.0); + + const WindowWidth(this.value); + final double value; +} + +const kBorderRadius4 = BorderRadius.all(Radius.circular(4)); +const kBorderRadius6 = BorderRadius.all(Radius.circular(6)); +const kBorderRadius8 = BorderRadius.all(Radius.circular(8)); +final kBorderRadius10 = BorderRadius.circular(10); +const kBorderRadius12 = BorderRadius.all(Radius.circular(12)); +const kBorderRadius20 = BorderRadius.all(Radius.circular(20)); + +const kP1 = EdgeInsets.all(1); +const kP4 = EdgeInsets.all(4); +const kP5 = EdgeInsets.all(5); +const kP6 = EdgeInsets.all(6); +const kP8 = EdgeInsets.all(8); +const kPs8 = EdgeInsets.only(left: 8); +const kPs2 = EdgeInsets.only(left: 2); +const kPe4 = EdgeInsets.only(right: 4); +const kPe8 = EdgeInsets.only(right: 8); +const kPh20v5 = EdgeInsets.symmetric(horizontal: 20, vertical: 5); +const kPh20v10 = EdgeInsets.symmetric(horizontal: 20, vertical: 10); +const kP10 = EdgeInsets.all(10); +const kPv2 = EdgeInsets.symmetric(vertical: 2); +const kPv6 = EdgeInsets.symmetric(vertical: 6); +const kPv8 = EdgeInsets.symmetric(vertical: 8); +const kPv10 = EdgeInsets.symmetric(vertical: 10); +const kPv20 = EdgeInsets.symmetric(vertical: 20); +const kPh2 = EdgeInsets.symmetric(horizontal: 2); +const kPt28o8 = EdgeInsets.only(top: 28, left: 8.0, right: 8.0, bottom: 8.0); +const kPt5o10 = + EdgeInsets.only(left: 10.0, right: 10.0, top: 5.0, bottom: 10.0); +const kPh4 = EdgeInsets.symmetric(horizontal: 4); +const kPh8 = EdgeInsets.symmetric(horizontal: 8); +const kPh12 = EdgeInsets.symmetric(horizontal: 12); +const kPh20 = EdgeInsets.symmetric(horizontal: 20); +const kPh24 = EdgeInsets.symmetric(horizontal: 24); +const kPh20t40 = EdgeInsets.only( + left: 20, + right: 20, + top: 40, +); +const kPs0o6 = EdgeInsets.only( + left: 0, + top: 6, + right: 6, + bottom: 6, +); +const kPh60 = EdgeInsets.symmetric(horizontal: 60); +const kPh60v60 = EdgeInsets.symmetric(vertical: 60, horizontal: 60); +const kPt24l4 = EdgeInsets.only( + top: 24, + left: 4.0, + //right: 4.0, + // bottom: 8.0, +); +const kPt8l4 = EdgeInsets.only( + top: 8.0, + left: 4.0, + //right: 4.0, + // bottom: 8.0, +); +const kPt8 = EdgeInsets.only(top: 8); +const kPt20 = EdgeInsets.only(top: 20); +const kPt24 = EdgeInsets.only(top: 24); +const kPt28 = EdgeInsets.only(top: 28); +const kPt32 = EdgeInsets.only(top: 32); +const kPb10 = EdgeInsets.only(bottom: 10); +const kPb15 = EdgeInsets.only(bottom: 15); +const kPb70 = EdgeInsets.only(bottom: 70); +const kSizedBoxEmpty = SizedBox(); +const kHSpacer2 = SizedBox(width: 2); +const kHSpacer4 = SizedBox(width: 4); +const kHSpacer5 = SizedBox(width: 5); +const kHSpacer10 = SizedBox(width: 10); +const kHSpacer12 = SizedBox(width: 12); +const kHSpacer20 = SizedBox(width: 20); +const kHSpacer40 = SizedBox(width: 40); +const kVSpacer5 = SizedBox(height: 5); +const kVSpacer8 = SizedBox(height: 8); +const kVSpacer10 = SizedBox(height: 10); +const kVSpacer16 = SizedBox(height: 16); +const kVSpacer20 = SizedBox(height: 20); +const kVSpacer40 = SizedBox(height: 40); + +final kButtonSidebarStyle = ElevatedButton.styleFrom(padding: kPh12); diff --git a/packages/apidash_design_system/lib/consts.dart b/packages/apidash_design_system/lib/tokens/themes.dart similarity index 50% rename from packages/apidash_design_system/lib/consts.dart rename to packages/apidash_design_system/lib/tokens/themes.dart index 043bf2e6..b323d0ca 100644 --- a/packages/apidash_design_system/lib/consts.dart +++ b/packages/apidash_design_system/lib/tokens/themes.dart @@ -1,22 +1,6 @@ -import 'dart:io'; -import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; -import 'package:google_fonts/google_fonts.dart'; - -final kColorTransparentState = - WidgetStateProperty.all(Colors.transparent); -const kColorTransparent = Colors.transparent; -const kColorWhite = Colors.white; -const kColorBlack = Colors.black; -const kColorRed = Colors.red; -final kColorLightDanger = Colors.red.withOpacity(0.9); -const kColorDarkDanger = Color(0xffcf6679); - -const kColorSchemeSeed = Colors.blue; -final kFontFamily = GoogleFonts.openSans().fontFamily; -final kFontFamilyFallback = !kIsWeb && (Platform.isIOS || Platform.isMacOS) - ? null - : [GoogleFonts.notoColorEmoji().fontFamily!]; +import 'colors.dart'; +import 'typography.dart'; final kLightMaterialAppTheme = ThemeData( fontFamily: kFontFamily, @@ -42,123 +26,6 @@ final kDarkMaterialAppTheme = ThemeData( ), ); -final kCodeStyle = TextStyle( - fontFamily: GoogleFonts.sourceCodePro().fontFamily, - fontFamilyFallback: kFontFamilyFallback, -); - -const kHintOpacity = 0.6; -const kForegroundOpacity = 0.05; -const kOverlayBackgroundOpacity = 0.5; - -const kTextStyleButton = TextStyle(fontWeight: FontWeight.bold); -const kTextStyleTab = TextStyle(fontSize: 14); -const kTextStyleButtonSmall = TextStyle(fontSize: 12); -const kFormDataButtonLabelTextStyle = TextStyle( - fontSize: 12, - fontWeight: FontWeight.w600, -); -const kTextStylePopupMenuItem = TextStyle(fontSize: 14); - -final kButtonSidebarStyle = ElevatedButton.styleFrom(padding: kPh12); - -const kBorderRadius4 = BorderRadius.all(Radius.circular(4)); -const kBorderRadius6 = BorderRadius.all(Radius.circular(6)); -const kBorderRadius8 = BorderRadius.all(Radius.circular(8)); -final kBorderRadius10 = BorderRadius.circular(10); -const kBorderRadius12 = BorderRadius.all(Radius.circular(12)); -const kBorderRadius20 = BorderRadius.all(Radius.circular(20)); - -const kP1 = EdgeInsets.all(1); -const kP4 = EdgeInsets.all(4); -const kP5 = EdgeInsets.all(5); -const kP6 = EdgeInsets.all(6); -const kP8 = EdgeInsets.all(8); -const kPs8 = EdgeInsets.only(left: 8); -const kPs2 = EdgeInsets.only(left: 2); -const kPe4 = EdgeInsets.only(right: 4); -const kPe8 = EdgeInsets.only(right: 8); -const kPh20v5 = EdgeInsets.symmetric(horizontal: 20, vertical: 5); -const kPh20v10 = EdgeInsets.symmetric(horizontal: 20, vertical: 10); -const kP10 = EdgeInsets.all(10); -const kPv2 = EdgeInsets.symmetric(vertical: 2); -const kPv6 = EdgeInsets.symmetric(vertical: 6); -const kPv8 = EdgeInsets.symmetric(vertical: 8); -const kPv10 = EdgeInsets.symmetric(vertical: 10); -const kPv20 = EdgeInsets.symmetric(vertical: 20); -const kPh2 = EdgeInsets.symmetric(horizontal: 2); -const kPt28o8 = EdgeInsets.only(top: 28, left: 8.0, right: 8.0, bottom: 8.0); -const kPt5o10 = - EdgeInsets.only(left: 10.0, right: 10.0, top: 5.0, bottom: 10.0); -const kPh4 = EdgeInsets.symmetric(horizontal: 4); -const kPh8 = EdgeInsets.symmetric(horizontal: 8); -const kPh12 = EdgeInsets.symmetric(horizontal: 12); -const kPh20 = EdgeInsets.symmetric(horizontal: 20); -const kPh24 = EdgeInsets.symmetric(horizontal: 24); -const kPh20t40 = EdgeInsets.only( - left: 20, - right: 20, - top: 40, -); -const kPs0o6 = EdgeInsets.only( - left: 0, - top: 6, - right: 6, - bottom: 6, -); -const kPh60 = EdgeInsets.symmetric(horizontal: 60); -const kPh60v60 = EdgeInsets.symmetric(vertical: 60, horizontal: 60); -const kP24CollectionPane = EdgeInsets.only( - top: 24, - left: 4.0, - //right: 4.0, - // bottom: 8.0, -); -const kP8CollectionPane = EdgeInsets.only( - top: 8.0, - left: 4.0, - //right: 4.0, - // bottom: 8.0, -); -const kPt8 = EdgeInsets.only( - top: 8, -); -const kPt20 = EdgeInsets.only( - top: 20, -); -const kPt24 = EdgeInsets.only( - top: 24, -); -const kPt28 = EdgeInsets.only( - top: 28, -); -const kPt32 = EdgeInsets.only( - top: 32, -); -const kPb10 = EdgeInsets.only( - bottom: 10, -); -const kPb15 = EdgeInsets.only( - bottom: 15, -); -const kPb70 = EdgeInsets.only( - bottom: 70, -); -const kSizedBoxEmpty = SizedBox(); -const kHSpacer2 = SizedBox(width: 2); -const kHSpacer4 = SizedBox(width: 4); -const kHSpacer5 = SizedBox(width: 5); -const kHSpacer10 = SizedBox(width: 10); -const kHSpacer12 = SizedBox(width: 12); -const kHSpacer20 = SizedBox(width: 20); -const kHSpacer40 = SizedBox(width: 40); -const kVSpacer5 = SizedBox(height: 5); -const kVSpacer8 = SizedBox(height: 8); -const kVSpacer10 = SizedBox(height: 10); -const kVSpacer16 = SizedBox(height: 16); -const kVSpacer20 = SizedBox(height: 20); -const kVSpacer40 = SizedBox(height: 40); - const kLightCodeTheme = { 'root': TextStyle(backgroundColor: Color(0xffffffff), color: Color(0xff000000)), @@ -245,17 +112,3 @@ const kDarkCodeTheme = { 'type': TextStyle(color: Color(0xff82aaff)), 'variable': TextStyle(color: Color(0xffaddb67)), }; - -final kColorStatusCodeDefault = Colors.grey.shade700; -final kColorStatusCode200 = Colors.green.shade800; -final kColorStatusCode300 = Colors.blue.shade800; -final kColorStatusCode400 = Colors.red.shade800; -final kColorStatusCode500 = Colors.amber.shade900; -const kOpacityDarkModeBlend = 0.4; - -final kColorHttpMethodGet = Colors.green.shade800; -final kColorHttpMethodHead = kColorHttpMethodGet; -final kColorHttpMethodPost = Colors.blue.shade800; -final kColorHttpMethodPut = Colors.amber.shade900; -final kColorHttpMethodPatch = kColorHttpMethodPut; -final kColorHttpMethodDelete = Colors.red.shade800; diff --git a/packages/apidash_design_system/lib/tokens/tokens.dart b/packages/apidash_design_system/lib/tokens/tokens.dart new file mode 100644 index 00000000..21eb57f8 --- /dev/null +++ b/packages/apidash_design_system/lib/tokens/tokens.dart @@ -0,0 +1,4 @@ +export 'colors.dart'; +export 'measurements.dart'; +export 'themes.dart'; +export 'typography.dart'; diff --git a/packages/apidash_design_system/lib/tokens/typography.dart b/packages/apidash_design_system/lib/tokens/typography.dart new file mode 100644 index 00000000..304f91d0 --- /dev/null +++ b/packages/apidash_design_system/lib/tokens/typography.dart @@ -0,0 +1,23 @@ +import 'dart:io'; +import 'package:flutter/material.dart'; +import 'package:flutter/foundation.dart'; +import 'package:google_fonts/google_fonts.dart'; + +final kFontFamily = GoogleFonts.openSans().fontFamily; +final kFontFamilyFallback = !kIsWeb && (Platform.isIOS || Platform.isMacOS) + ? null + : [GoogleFonts.notoColorEmoji().fontFamily!]; + +final kCodeStyle = TextStyle( + fontFamily: GoogleFonts.sourceCodePro().fontFamily, + fontFamilyFallback: kFontFamilyFallback, +); + +const kTextStyleButton = TextStyle(fontWeight: FontWeight.bold); +const kTextStyleTab = TextStyle(fontSize: 14); +const kTextStyleButtonSmall = TextStyle(fontSize: 12); +const kFormDataButtonLabelTextStyle = TextStyle( + fontSize: 12, + fontWeight: FontWeight.w600, +); +const kTextStylePopupMenuItem = TextStyle(fontSize: 14); diff --git a/packages/apidash_design_system/lib/widgets/dropdown.dart b/packages/apidash_design_system/lib/widgets/dropdown.dart index ffe9834c..8aa90590 100644 --- a/packages/apidash_design_system/lib/widgets/dropdown.dart +++ b/packages/apidash_design_system/lib/widgets/dropdown.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../consts.dart'; +import '../tokens/tokens.dart'; class ADDropdownButton extends StatelessWidget { const ADDropdownButton({ diff --git a/packages/apidash_design_system/lib/widgets/popup_menu.dart b/packages/apidash_design_system/lib/widgets/popup_menu.dart new file mode 100644 index 00000000..06adea10 --- /dev/null +++ b/packages/apidash_design_system/lib/widgets/popup_menu.dart @@ -0,0 +1,74 @@ +import 'package:flutter/material.dart'; +import '../tokens/tokens.dart'; + +class ADPopupMenu extends StatelessWidget { + const ADPopupMenu({ + super.key, + this.value, + required this.values, + this.onChanged, + this.tooltip, + this.width, + this.isOutlined = false, + }); + + final String? value; + final Iterable<(T, String?)> values; + final void Function(T? value)? onChanged; + final String? tooltip; + final double? width; + final bool isOutlined; + + @override + Widget build(BuildContext context) { + final double containerWidth = width ?? 220; + var popup = PopupMenuButton( + tooltip: tooltip, + surfaceTintColor: kColorTransparent, + constraints: BoxConstraints(minWidth: containerWidth), + itemBuilder: (BuildContext context) => values + .map((item) => PopupMenuItem( + value: item.$1, + child: Text( + item.$2 ?? "", + style: kTextStylePopupMenuItem, + ), + )) + .toList(), + onSelected: onChanged, + child: Container( + width: containerWidth, + padding: kP8, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Text( + value ?? "", + style: kTextStylePopupMenuItem, + softWrap: false, + overflow: TextOverflow.ellipsis, + ), + ), + const Icon( + Icons.unfold_more, + size: 16, + ) + ], + ), + ), + ); + if (isOutlined) { + return Container( + decoration: BoxDecoration( + border: Border.all( + color: Theme.of(context).colorScheme.onSurface, + ), + borderRadius: kBorderRadius8, + ), + child: popup, + ); + } + return popup; + } +} diff --git a/packages/apidash_design_system/lib/widgets/textfield_outlined.dart b/packages/apidash_design_system/lib/widgets/textfield_outlined.dart index a160b141..60e450c6 100644 --- a/packages/apidash_design_system/lib/widgets/textfield_outlined.dart +++ b/packages/apidash_design_system/lib/widgets/textfield_outlined.dart @@ -1,5 +1,5 @@ import 'package:flutter/material.dart'; -import '../consts.dart'; +import '../tokens/tokens.dart'; class ADOutlinedTextField extends StatelessWidget { const ADOutlinedTextField({ diff --git a/packages/apidash_design_system/lib/widgets/widgets.dart b/packages/apidash_design_system/lib/widgets/widgets.dart index dca4466f..7b1f06a3 100644 --- a/packages/apidash_design_system/lib/widgets/widgets.dart +++ b/packages/apidash_design_system/lib/widgets/widgets.dart @@ -1,6 +1,7 @@ export 'button_icon.dart'; export 'checkbox.dart'; export 'dropdown.dart'; +export 'popup_menu.dart'; export 'snackbar.dart'; export 'textfield_outlined.dart'; export 'textfield_raw.dart'; diff --git a/test/extensions/context_extensions_test.dart b/packages/apidash_design_system/test/extensions/context_extensions_test.dart similarity index 84% rename from test/extensions/context_extensions_test.dart rename to packages/apidash_design_system/test/extensions/context_extensions_test.dart index 6b305b07..c49cf713 100644 --- a/test/extensions/context_extensions_test.dart +++ b/packages/apidash_design_system/test/extensions/context_extensions_test.dart @@ -1,7 +1,6 @@ +import 'package:apidash_design_system/apidash_design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:apidash/consts.dart'; -import 'package:apidash/extensions/context_extensions.dart'; void main() { group('Testing MediaQueryExtension', () { @@ -9,7 +8,7 @@ void main() { (tester) async { await tester.pumpWidget( MediaQuery( - data: const MediaQueryData(size: Size(kCompactWindowWidth - 1, 800)), + data: MediaQueryData(size: Size(WindowWidth.compact.value - 1, 800)), child: Builder( builder: (context) { expect(context.isCompactWindow, isTrue); @@ -24,7 +23,7 @@ void main() { (tester) async { await tester.pumpWidget( MediaQuery( - data: const MediaQueryData(size: Size(kMediumWindowWidth - 1, 800)), + data: MediaQueryData(size: Size(WindowWidth.medium.value - 1, 800)), child: Builder( builder: (context) { expect(context.isMediumWindow, isTrue); @@ -39,7 +38,7 @@ void main() { (tester) async { await tester.pumpWidget( MediaQuery( - data: const MediaQueryData(size: Size(kExpandedWindowWidth - 1, 800)), + data: MediaQueryData(size: Size(WindowWidth.expanded.value - 1, 800)), child: Builder( builder: (context) { expect(context.isExpandedWindow, isTrue); @@ -54,7 +53,7 @@ void main() { (tester) async { await tester.pumpWidget( MediaQuery( - data: const MediaQueryData(size: Size(kLargeWindowWidth - 1, 800)), + data: MediaQueryData(size: Size(WindowWidth.large.value - 1, 800)), child: Builder( builder: (context) { expect(context.isLargeWindow, isTrue); @@ -69,7 +68,7 @@ void main() { (tester) async { await tester.pumpWidget( MediaQuery( - data: const MediaQueryData(size: Size(kLargeWindowWidth + 1, 800)), + data: MediaQueryData(size: Size(WindowWidth.large.value + 1, 800)), child: Builder( builder: (context) { expect(context.isExtraLargeWindow, isTrue); diff --git a/packages/apidash_design_system/test/checkbox_test.dart b/packages/apidash_design_system/test/widgets/checkbox_test.dart similarity index 100% rename from packages/apidash_design_system/test/checkbox_test.dart rename to packages/apidash_design_system/test/widgets/checkbox_test.dart diff --git a/pubspec.lock b/pubspec.lock index 31f020bf..986829c5 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1213,10 +1213,10 @@ packages: dependency: "direct main" description: name: printing - sha256: de1889f30b34029fc46e5de6a9841498850b23d32942a9ee810ca36b0cb1b234 + sha256: b535d177fc6e8f8908e19b0ff5c1d4a87e3c4d0bf675e05aa2562af1b7853906 url: "https://pub.dev" source: hosted - version: "5.13.2" + version: "5.13.4" process: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 10e93a01..9e2b7b8e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,7 +54,7 @@ dependencies: package_info_plus: ^8.0.2 path: ^1.8.3 path_provider: ^2.1.2 - printing: ^5.13.2 + printing: ^5.13.4 provider: ^6.1.2 riverpod: ^2.5.1 scrollable_positioned_list: ^0.3.8 diff --git a/test/codegen/c_curl_codegen_test.dart b/test/codegen/c_curl_codegen_test.dart index c8e7e607..3ca5cfc5 100644 --- a/test/codegen/c_curl_codegen_test.dart +++ b/test/codegen/c_curl_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -54,7 +55,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet1, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -105,7 +109,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet2, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -156,7 +163,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet3, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -207,7 +217,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet4, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -263,7 +276,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet5, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -319,7 +335,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet6, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -370,7 +389,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet7, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -426,7 +448,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet8, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -477,7 +502,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet9, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -535,7 +563,7 @@ int main() { codeGen.getCode( CodegenLanguage.cCurlCodeGen, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -592,7 +620,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet11, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -643,7 +674,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelGet12, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -697,7 +731,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelHead1, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -749,7 +786,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelHead2, "http"), + CodegenLanguage.cCurlCodeGen, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -811,7 +851,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost1, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -871,7 +914,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost2, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -932,7 +978,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost3, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1003,7 +1052,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost4, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1079,7 +1131,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost5, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1145,7 +1200,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost6, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1211,7 +1269,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost7, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1282,7 +1343,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost8, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1354,7 +1418,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPost9, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1417,7 +1484,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPut1, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1480,7 +1550,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelPatch1, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1534,7 +1607,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelDelete1, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1595,7 +1671,10 @@ int main() { }"""; expect( codeGen.getCode( - CodegenLanguage.cCurlCodeGen, requestModelDelete2, "https"), + CodegenLanguage.cCurlCodeGen, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/csharp_http_client_codegen_test.dart b/test/codegen/csharp_http_client_codegen_test.dart index 39f3d4f9..64aa4bc9 100644 --- a/test/codegen/csharp_http_client_codegen_test.dart +++ b/test/codegen/csharp_http_client_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -24,7 +25,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet1, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -45,7 +49,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet2, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -66,7 +73,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet3, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -87,7 +97,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet4, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -110,7 +123,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet5, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -133,7 +149,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet6, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -154,7 +173,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet7, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -177,7 +199,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet8, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -198,7 +223,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet9, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -221,7 +249,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet10, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -244,7 +275,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet11, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -265,7 +299,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Get, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelGet12, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -288,7 +325,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Head, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelHead1, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -309,7 +349,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Head, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelHead2, "http"), + CodegenLanguage.cSharpHttpClient, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -340,7 +383,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost1, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -374,7 +420,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost2, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -405,7 +454,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost3, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -435,7 +487,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost4, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -467,7 +522,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost5, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -500,7 +558,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost6, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -533,7 +594,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost7, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -563,7 +627,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost8, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -599,7 +666,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Post, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPost9, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -631,7 +701,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Put, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPut1, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -663,7 +736,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Patch, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelPatch1, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -686,7 +762,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Delete, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelDelete1, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -716,7 +795,10 @@ using (var request = new HttpRequestMessage(HttpMethod.Delete, uri)) '''; expect( codeGen.getCode( - CodegenLanguage.cSharpHttpClient, requestModelDelete2, "https"), + CodegenLanguage.cSharpHttpClient, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/csharp_rest_sharp_codgen_test.dart b/test/codegen/csharp_rest_sharp_codgen_test.dart index df16f928..0615aac0 100644 --- a/test/codegen/csharp_rest_sharp_codgen_test.dart +++ b/test/codegen/csharp_rest_sharp_codgen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/consts.dart'; import 'package:apidash/screens/common_widgets/common_widgets.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter_test/flutter_test.dart'; import '../models/request_models.dart'; @@ -32,7 +33,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet1, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -66,7 +70,10 @@ class Program expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet2, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -100,7 +107,10 @@ class Program expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet3, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -138,7 +148,10 @@ class Program expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet4, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -172,7 +185,10 @@ class Program expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet5, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -208,7 +224,10 @@ class Program expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet6, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -240,7 +259,10 @@ class Program expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet7, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -275,7 +297,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet8, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -309,7 +334,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet9, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -342,7 +370,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet10, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -378,7 +409,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet11, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -409,7 +443,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelGet12, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -442,7 +479,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelHead1, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -473,7 +513,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelHead2, "http"), + CodegenLanguage.cSharpRestSharp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -511,7 +554,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost1, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 2", () { @@ -553,7 +599,10 @@ arr = "[null, true, false, null]" """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost2, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 3", () { @@ -591,7 +640,10 @@ text = "I LOVE Flutter" """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost3, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 4", () { @@ -626,7 +678,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost4, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 5", () { @@ -663,7 +718,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost5, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 6", () { @@ -701,7 +759,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost6, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 7", () { @@ -739,7 +800,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost7, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 8", () { @@ -777,7 +841,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost8, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test("Post 9", () { @@ -821,7 +888,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPost9, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -862,7 +932,10 @@ job = "zion resident" """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPut1, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -903,7 +976,10 @@ job = "accountant" """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelPatch1, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -936,7 +1012,10 @@ class Program """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelDelete1, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test("Delete 2", () { @@ -974,7 +1053,10 @@ job = "accountant" """; expect( codegen.getCode( - CodegenLanguage.cSharpRestSharp, requestModelDelete2, "https"), + CodegenLanguage.cSharpRestSharp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/curl_codegen_test.dart b/test/codegen/curl_codegen_test.dart index faa6ac78..c4f37465 100644 --- a/test/codegen/curl_codegen_test.dart +++ b/test/codegen/curl_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -9,28 +10,48 @@ void main() { group('GET Request', () { test('GET 1', () { const expectedCode = r"""curl --url 'https://api.apidash.dev'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 2', () { const expectedCode = r"""curl --url 'https://api.apidash.dev/country/data?code=US'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet2, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 3', () { const expectedCode = r"""curl --url 'https://api.apidash.dev/country/data?code=IND'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet3, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 4', () { const expectedCode = r"""curl --url 'https://api.apidash.dev/humanize/social?num=8700000&digits=3&system=SS&add_space=true&trailing_zeros=true'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet4, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -38,7 +59,12 @@ void main() { const expectedCode = r"""curl --url 'https://api.github.com/repos/foss42/apidash' \ --header 'User-Agent: Test Agent'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet5, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -46,13 +72,23 @@ void main() { const expectedCode = r"""curl --url 'https://api.github.com/repos/foss42/apidash?raw=true' \ --header 'User-Agent: Test Agent'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet6, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 7', () { const expectedCode = r"""curl --url 'https://api.apidash.dev'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet7, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -60,14 +96,24 @@ void main() { const expectedCode = r"""curl --url 'https://api.github.com/repos/foss42/apidash?raw=true' \ --header 'User-Agent: Test Agent'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet8, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 9', () { const expectedCode = r"""curl --url 'https://api.apidash.dev/humanize/social?num=8700000&add_space=true'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet9, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -79,7 +125,7 @@ void main() { codeGen.getCode( CodegenLanguage.curl, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -88,14 +134,24 @@ void main() { const expectedCode = r"""curl --url 'https://api.apidash.dev/humanize/social?num=8700000&digits=3' \ --header 'User-Agent: Test Agent'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet11, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 12', () { const expectedCode = r"""curl --url 'https://api.apidash.dev/humanize/social'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelGet12, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -103,13 +159,23 @@ void main() { group('HEAD Request', () { test('HEAD 1', () { const expectedCode = r"""curl --head --url 'https://api.apidash.dev'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelHead1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); test('HEAD 2', () { const expectedCode = r"""curl --head --url 'http://api.apidash.dev'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelHead2, "http"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -122,7 +188,12 @@ void main() { --data '{ "text": "I LOVE Flutter" }'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -138,7 +209,12 @@ void main() { "no": 1.2, "arr": ["null", "true", "false", null] }'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost2, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -150,7 +226,12 @@ void main() { --data '{ "text": "I LOVE Flutter" }'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost3, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -160,7 +241,12 @@ void main() { --form 'text=API' \ --form 'sep=|' \ --form 'times=3'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost4, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -171,7 +257,12 @@ void main() { --form 'text=API' \ --form 'sep=|' \ --form 'times=3'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost5, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -180,7 +271,12 @@ void main() { --url 'https://api.apidash.dev/io/img' \ --form 'token=xyz' \ --form 'imfile=@/Documents/up/1.png'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost6, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -189,7 +285,12 @@ void main() { --url 'https://api.apidash.dev/io/img' \ --form 'token=xyz' \ --form 'imfile=@/Documents/up/1.png'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost7, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -199,7 +300,12 @@ void main() { --form 'text=API' \ --form 'sep=|' \ --form 'times=3'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost8, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -210,7 +316,12 @@ void main() { --header 'Keep-Alive: true' \ --form 'token=xyz' \ --form 'imfile=@/Documents/up/1.png'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPost9, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -224,7 +335,12 @@ void main() { "name": "morpheus", "job": "zion resident" }'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPut1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -238,7 +354,12 @@ void main() { "name": "marfeus", "job": "accountant" }'"""; - expect(codeGen.getCode(CodegenLanguage.curl, requestModelPatch1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.curl, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -248,7 +369,11 @@ void main() { const expectedCode = r"""curl --request DELETE \ --url 'https://reqres.in/api/users/2'"""; expect( - codeGen.getCode(CodegenLanguage.curl, requestModelDelete1, "https"), + codeGen.getCode( + CodegenLanguage.curl, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -261,7 +386,11 @@ void main() { "job": "accountant" }'"""; expect( - codeGen.getCode(CodegenLanguage.curl, requestModelDelete2, "https"), + codeGen.getCode( + CodegenLanguage.curl, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/dart_dio_codegen_test.dart b/test/codegen/dart_dio_codegen_test.dart index f57a7470..a12426e4 100644 --- a/test/codegen/dart_dio_codegen_test.dart +++ b/test/codegen/dart_dio_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -26,7 +27,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -53,7 +58,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -80,7 +89,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -113,7 +126,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -140,7 +157,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -169,7 +190,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -192,7 +217,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -221,7 +250,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -251,7 +284,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -281,7 +318,7 @@ void main() async { codeGen.getCode( CodegenLanguage.dartDio, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -314,7 +351,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -337,7 +378,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -362,7 +407,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -385,7 +434,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -416,7 +469,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -451,7 +508,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -483,7 +544,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -531,7 +596,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost4, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -582,7 +651,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost5, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -634,7 +707,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost6, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -686,7 +763,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost7, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -740,7 +821,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost8, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -802,7 +887,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPost9, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -834,7 +923,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -867,7 +960,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartDio, requestModelPatch1, "https"), + codeGen.getCode( + CodegenLanguage.dartDio, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -893,7 +990,10 @@ void main() async { """; expect( codeGen.getCode( - CodegenLanguage.dartDio, requestModelDelete1, "https"), + CodegenLanguage.dartDio, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -925,7 +1025,10 @@ void main() async { """; expect( codeGen.getCode( - CodegenLanguage.dartDio, requestModelDelete2, "https"), + CodegenLanguage.dartDio, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/dart_http_codegen_test.dart b/test/codegen/dart_http_codegen_test.dart index 0a631746..77ebc200 100644 --- a/test/codegen/dart_http_codegen_test.dart +++ b/test/codegen/dart_http_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -26,7 +27,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -53,7 +58,11 @@ void main() async { """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -81,7 +90,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -113,7 +126,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -141,7 +158,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -172,7 +193,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -195,7 +220,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -226,7 +255,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -255,7 +288,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -286,7 +323,7 @@ void main() async { codeGen.getCode( CodegenLanguage.dartHttp, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -321,7 +358,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -344,7 +385,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -369,7 +414,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -392,7 +441,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -427,7 +480,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -465,7 +522,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -501,7 +562,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -558,7 +623,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost4, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 5', () { @@ -618,7 +687,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost5, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 6', () { @@ -674,7 +747,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost6, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 7', () { @@ -730,7 +807,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost7, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 8', () { @@ -793,7 +874,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost8, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 9', () { @@ -861,7 +946,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPost9, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -897,7 +986,11 @@ void main() async { } """; expect( - codeGen.getCode(CodegenLanguage.dartHttp, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.dartHttp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -934,7 +1027,10 @@ void main() async { """; expect( codeGen.getCode( - CodegenLanguage.dartHttp, requestModelPatch1, "https"), + CodegenLanguage.dartHttp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -960,7 +1056,10 @@ void main() async { """; expect( codeGen.getCode( - CodegenLanguage.dartHttp, requestModelDelete1, "https"), + CodegenLanguage.dartHttp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -995,7 +1094,10 @@ void main() async { """; expect( codeGen.getCode( - CodegenLanguage.dartHttp, requestModelDelete2, "https"), + CodegenLanguage.dartHttp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/go_http_codegen_test.dart b/test/codegen/go_http_codegen_test.dart index 89e4c010..d9b47eef 100644 --- a/test/codegen/go_http_codegen_test.dart +++ b/test/codegen/go_http_codegen_test.dart @@ -1,6 +1,7 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; import 'package:apidash/screens/common_widgets/common_widgets.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -34,7 +35,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -69,7 +75,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet2, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -104,7 +115,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet3, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -143,7 +159,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet4, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -175,7 +196,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet5, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -212,7 +238,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet6, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -242,7 +273,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet7, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -279,7 +315,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet8, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -315,7 +356,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelGet9, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -351,7 +397,7 @@ func main() { codegen.getCode( CodegenLanguage.goHttp, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -391,7 +437,11 @@ func main() { fmt.Println("Response body:", string(body)) }"""; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -422,7 +472,11 @@ func main() { fmt.Println("Response body:", string(body)) }"""; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -455,7 +509,11 @@ func main() { fmt.Println("Response body:", string(body)) }"""; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -485,7 +543,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }"""; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelHead2, "http"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -524,7 +587,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -566,7 +633,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -604,7 +675,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -646,7 +721,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelPost4, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -690,7 +769,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelPost5, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -740,7 +823,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }'''; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelPost6, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test("POST 7", () { @@ -788,7 +876,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }'''; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelPost7, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test("POST 8", () { @@ -834,7 +927,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }'''; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelPost8, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test("POST 9", () { @@ -891,7 +989,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }'''; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelPost9, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -929,7 +1032,12 @@ func main() { body, _ := io.ReadAll(response.Body) fmt.Println("Response body:", string(body)) }'''; - expect(codeGen.getCode(CodegenLanguage.goHttp, requestModelPut1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -969,7 +1077,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelPatch1, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1002,7 +1114,11 @@ func main() { fmt.Println("Response body:", string(body)) }"""; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelDelete1, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1040,7 +1156,11 @@ func main() { fmt.Println("Response body:", string(body)) }'''; expect( - codeGen.getCode(CodegenLanguage.goHttp, requestModelDelete2, "https"), + codeGen.getCode( + CodegenLanguage.goHttp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/har_codegen_test.dart b/test/codegen/har_codegen_test.dart index ac9c246d..74311853 100644 --- a/test/codegen/har_codegen_test.dart +++ b/test/codegen/har_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -15,7 +16,12 @@ void main() { "queryString": [], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -32,7 +38,12 @@ void main() { ], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet2, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -49,7 +60,12 @@ void main() { ], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet3, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -82,7 +98,12 @@ void main() { ], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet4, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -99,7 +120,12 @@ void main() { } ] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet5, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -121,7 +147,12 @@ void main() { } ] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet6, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -133,7 +164,12 @@ void main() { "queryString": [], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet7, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -155,7 +191,12 @@ void main() { } ] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet8, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -176,7 +217,12 @@ void main() { ], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet9, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -197,7 +243,7 @@ void main() { codeGen.getCode( CodegenLanguage.har, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -224,7 +270,12 @@ void main() { } ] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet11, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -236,7 +287,12 @@ void main() { "queryString": [], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelGet12, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -250,7 +306,12 @@ void main() { "queryString": [], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelHead1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -262,7 +323,12 @@ void main() { "queryString": [], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelHead2, "http"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -285,7 +351,12 @@ void main() { "text": "{\n\"text\": \"I LOVE Flutter\"\n}" } }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelPost1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -306,7 +377,12 @@ void main() { "text": "{\n\"text\": \"I LOVE Flutter\",\n\"flag\": null,\n\"male\": true,\n\"female\": false,\n\"no\": 1.2,\n\"arr\": [\"null\", \"true\", \"false\", null]\n}" } }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelPost2, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -331,7 +407,12 @@ void main() { "text": "{\n\"text\": \"I LOVE Flutter\"\n}" } }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelPost3, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -366,7 +447,8 @@ void main() { } }"""; expect( - codeGen.getCode(CodegenLanguage.har, requestModelPost4, "https", + codeGen.getCode( + CodegenLanguage.har, requestModelPost4, SupportedUriSchemes.https, boundary: "d43e2510-a25e-1f08-b0a5-591aeb704467"), expectedCode); }); @@ -406,7 +488,8 @@ void main() { } }"""; expect( - codeGen.getCode(CodegenLanguage.har, requestModelPost5, "https", + codeGen.getCode( + CodegenLanguage.har, requestModelPost5, SupportedUriSchemes.https, boundary: "ce268b20-a3e6-1f08-b0a5-591aeb704467"), expectedCode); }); @@ -438,7 +521,8 @@ void main() { } }"""; expect( - codeGen.getCode(CodegenLanguage.har, requestModelPost6, "https", + codeGen.getCode( + CodegenLanguage.har, requestModelPost6, SupportedUriSchemes.https, boundary: "c90d21a0-a44d-1f08-b0a5-591aeb704467"), expectedCode); }); @@ -470,7 +554,8 @@ void main() { } }"""; expect( - codeGen.getCode(CodegenLanguage.har, requestModelPost7, "https", + codeGen.getCode( + CodegenLanguage.har, requestModelPost7, SupportedUriSchemes.https, boundary: "4ac86770-a4dc-1f08-b0a5-591aeb704467"), expectedCode); }); @@ -515,7 +600,8 @@ void main() { } }"""; expect( - codeGen.getCode(CodegenLanguage.har, requestModelPost8, "https", + codeGen.getCode( + CodegenLanguage.har, requestModelPost8, SupportedUriSchemes.https, boundary: "78403a20-a54a-1f08-b0a5-591aeb704467"), expectedCode); }); @@ -564,7 +650,8 @@ void main() { } }"""; expect( - codeGen.getCode(CodegenLanguage.har, requestModelPost9, "https", + codeGen.getCode( + CodegenLanguage.har, requestModelPost9, SupportedUriSchemes.https, boundary: "2d9cd390-a593-1f08-b0a5-591aeb704467"), expectedCode); }); @@ -588,7 +675,12 @@ void main() { "text": "{\n\"name\": \"morpheus\",\n\"job\": \"zion resident\"\n}" } }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelPut1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -611,7 +703,12 @@ void main() { "text": "{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}" } }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelPatch1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -625,7 +722,12 @@ void main() { "queryString": [], "headers": [] }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelDelete1, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -646,7 +748,12 @@ void main() { "text": "{\n\"name\": \"marfeus\",\n\"job\": \"accountant\"\n}" } }"""; - expect(codeGen.getCode(CodegenLanguage.har, requestModelDelete2, "https"), + expect( + codeGen.getCode( + CodegenLanguage.har, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/java_async_http_client_codegen.dart b/test/codegen/java_async_http_client_codegen.dart index 5adf8f69..9de7a119 100644 --- a/test/codegen/java_async_http_client_codegen.dart +++ b/test/codegen/java_async_http_client_codegen.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -36,7 +37,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet1, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -71,7 +75,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet2, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -106,7 +113,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet3, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -145,7 +155,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet4, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -180,7 +193,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet5, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -217,7 +233,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet6, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -250,7 +269,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet7, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -287,7 +309,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet8, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -323,7 +348,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet9, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -358,7 +386,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet10, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -396,7 +427,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet11, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -429,7 +463,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelGet12, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -464,7 +501,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelHead1, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -497,7 +537,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelHead2, "http"), + CodegenLanguage.javaAsyncHttpClient, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -539,7 +582,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost1, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -584,7 +630,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost2, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -625,7 +674,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost3, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -677,7 +729,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost4, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -731,7 +786,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost5, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -799,7 +857,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost6, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -867,7 +928,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost7, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -922,7 +986,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost8, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -996,7 +1063,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPost9, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1039,7 +1109,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPut1, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1082,7 +1155,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaAsyncHttpClient, requestModelPatch1, "https"), + CodegenLanguage.javaAsyncHttpClient, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1116,8 +1192,11 @@ public class Main { } """; expect( - codeGen.getCode(CodegenLanguage.javaAsyncHttpClient, - requestModelDelete1, "https"), + codeGen.getCode( + CodegenLanguage.javaAsyncHttpClient, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1157,8 +1236,11 @@ public class Main { } '''; expect( - codeGen.getCode(CodegenLanguage.javaAsyncHttpClient, - requestModelDelete2, "https"), + codeGen.getCode( + CodegenLanguage.javaAsyncHttpClient, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/java_httpclient_codegen_test.dart b/test/codegen/java_httpclient_codegen_test.dart index d23fb48c..5374a703 100644 --- a/test/codegen/java_httpclient_codegen_test.dart +++ b/test/codegen/java_httpclient_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -33,7 +34,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet1, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET2', () { @@ -62,7 +66,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet2, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET3', () { @@ -91,7 +98,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet3, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET4', () { @@ -120,7 +130,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet4, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET5', () { @@ -152,7 +165,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet5, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET6', () { @@ -184,7 +200,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet6, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET7', () { @@ -213,7 +232,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet7, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET8', () { @@ -245,7 +267,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet8, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET9', () { @@ -274,7 +299,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet9, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET10', () { @@ -306,7 +334,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet10, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET11', () { @@ -338,7 +369,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet11, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET12', () { @@ -367,7 +401,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelGet12, "https"), + CodegenLanguage.javaHttpClient, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -399,7 +436,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelHead1, "https"), + CodegenLanguage.javaHttpClient, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); test('HEAD2', () { @@ -428,7 +468,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelHead2, "http"), + CodegenLanguage.javaHttpClient, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -466,7 +509,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost1, "https"), + CodegenLanguage.javaHttpClient, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST2', () { @@ -506,7 +552,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost2, "https"), + CodegenLanguage.javaHttpClient, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST3', () { @@ -542,7 +591,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost3, "https"), + CodegenLanguage.javaHttpClient, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST4', () { @@ -609,8 +661,8 @@ public class Main { } }'''; expect( - codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost4, "https", + codeGen.getCode(CodegenLanguage.javaHttpClient, requestModelPost4, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -679,8 +731,8 @@ public class Main { } }'''; expect( - codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost5, "https", + codeGen.getCode(CodegenLanguage.javaHttpClient, requestModelPost5, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -747,8 +799,8 @@ public class Main { } }'''; expect( - codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost6, "https", + codeGen.getCode(CodegenLanguage.javaHttpClient, requestModelPost6, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -815,8 +867,8 @@ public class Main { } }'''; expect( - codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost7, "https", + codeGen.getCode(CodegenLanguage.javaHttpClient, requestModelPost7, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -884,8 +936,8 @@ public class Main { } }'''; expect( - codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost8, "https", + codeGen.getCode(CodegenLanguage.javaHttpClient, requestModelPost8, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -954,8 +1006,8 @@ public class Main { } }'''; expect( - codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPost9, "https", + codeGen.getCode(CodegenLanguage.javaHttpClient, requestModelPost9, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -995,7 +1047,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPut1, "https"), + CodegenLanguage.javaHttpClient, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1034,7 +1089,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelPatch1, "https"), + CodegenLanguage.javaHttpClient, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1066,7 +1124,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelDelete1, "https"), + CodegenLanguage.javaHttpClient, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test('DELETE2', () { @@ -1102,7 +1163,10 @@ public class Main { }'''; expect( codeGen.getCode( - CodegenLanguage.javaHttpClient, requestModelDelete2, "https"), + CodegenLanguage.javaHttpClient, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/java_okhttp_codegen_test.dart b/test/codegen/java_okhttp_codegen_test.dart index de159c29..e83d8b82 100644 --- a/test/codegen/java_okhttp_codegen_test.dart +++ b/test/codegen/java_okhttp_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -38,7 +39,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet1, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -76,7 +80,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet2, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -114,7 +121,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet3, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -156,7 +166,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet4, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -192,7 +205,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet5, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -231,7 +247,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet6, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -266,7 +285,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet7, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -305,7 +327,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet8, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -344,7 +369,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet9, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -380,7 +408,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet10, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -420,7 +451,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet11, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -455,7 +489,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelGet12, "https"), + CodegenLanguage.javaOkHttp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -492,7 +529,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelHead1, "https"), + CodegenLanguage.javaOkHttp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -527,7 +567,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelHead2, "http"), + CodegenLanguage.javaOkHttp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -570,7 +613,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost1, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -611,7 +657,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost2, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -653,7 +702,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost3, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -695,7 +747,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost4, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -738,7 +793,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost5, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -779,7 +837,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost6, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -820,7 +881,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost7, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -866,7 +930,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost8, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -913,7 +980,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPost9, "https"), + CodegenLanguage.javaOkHttp, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -956,7 +1026,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPut1, "https"), + CodegenLanguage.javaOkHttp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -999,7 +1072,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelPatch1, "https"), + CodegenLanguage.javaOkHttp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1036,7 +1112,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelDelete1, "https"), + CodegenLanguage.javaOkHttp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1077,7 +1156,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaOkHttp, requestModelDelete2, "https"), + CodegenLanguage.javaOkHttp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/java_unirest_codegen_test.dart b/test/codegen/java_unirest_codegen_test.dart index c7567486..a0acf5e4 100644 --- a/test/codegen/java_unirest_codegen_test.dart +++ b/test/codegen/java_unirest_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -23,7 +24,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet1, "https"), + CodegenLanguage.javaUnirest, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -44,7 +48,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet2, "https"), + CodegenLanguage.javaUnirest, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -65,7 +72,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet3, "https"), + CodegenLanguage.javaUnirest, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -90,7 +100,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet4, "https"), + CodegenLanguage.javaUnirest, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -111,7 +124,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet5, "https"), + CodegenLanguage.javaUnirest, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -133,7 +149,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet6, "https"), + CodegenLanguage.javaUnirest, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -153,7 +172,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet7, "https"), + CodegenLanguage.javaUnirest, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -175,7 +197,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet8, "https"), + CodegenLanguage.javaUnirest, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -197,7 +222,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet9, "https"), + CodegenLanguage.javaUnirest, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -220,7 +248,7 @@ public class Main { codeGen.getCode( CodegenLanguage.javaUnirest, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -244,7 +272,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet11, "https"), + CodegenLanguage.javaUnirest, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -264,7 +295,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelGet12, "https"), + CodegenLanguage.javaUnirest, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -286,7 +320,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelHead1, "https"), + CodegenLanguage.javaUnirest, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -306,7 +343,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelHead2, "http"), + CodegenLanguage.javaUnirest, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -334,7 +374,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost1, "https"), + CodegenLanguage.javaUnirest, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -365,7 +408,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost2, "https"), + CodegenLanguage.javaUnirest, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -392,7 +438,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost3, "https"), + CodegenLanguage.javaUnirest, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -416,7 +465,7 @@ public class Main { codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -443,7 +492,7 @@ public class Main { codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPost5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -467,7 +516,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost6, "https"), + CodegenLanguage.javaUnirest, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 7', () { @@ -490,7 +542,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost7, "https"), + CodegenLanguage.javaUnirest, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 8', () { @@ -516,7 +571,7 @@ public class Main { codeGen.getCode( CodegenLanguage.javaUnirest, requestModelPost8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -544,7 +599,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPost9, "https"), + CodegenLanguage.javaUnirest, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -573,7 +631,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPut1, "https"), + CodegenLanguage.javaUnirest, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -602,7 +663,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelPatch1, "https"), + CodegenLanguage.javaUnirest, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -624,7 +688,10 @@ public class Main { """; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelDelete1, "https"), + CodegenLanguage.javaUnirest, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -651,7 +718,10 @@ public class Main { '''; expect( codeGen.getCode( - CodegenLanguage.javaUnirest, requestModelDelete2, "https"), + CodegenLanguage.javaUnirest, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/js_axios_codegen_test.dart b/test/codegen/js_axios_codegen_test.dart index 3ec4b913..647b3d2d 100644 --- a/test/codegen/js_axios_codegen_test.dart +++ b/test/codegen/js_axios_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -23,7 +24,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -46,7 +51,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -69,7 +78,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -96,7 +109,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -119,7 +136,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -145,7 +166,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -165,7 +190,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -191,7 +220,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -215,7 +248,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -241,7 +278,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -269,7 +306,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -289,7 +330,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -311,7 +356,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -331,7 +380,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -357,7 +410,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -381,7 +438,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -406,7 +467,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -436,7 +501,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -469,7 +534,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelPost5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -502,7 +567,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelPost6, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -535,7 +600,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelPost7, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -570,7 +635,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelPost8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -609,7 +674,7 @@ axios(config) codeGen.getCode( CodegenLanguage.jsAxios, requestModelPost9, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -636,7 +701,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -662,7 +731,11 @@ axios(config) }); """; expect( - codeGen.getCode(CodegenLanguage.jsAxios, requestModelPatch1, "https"), + codeGen.getCode( + CodegenLanguage.jsAxios, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -685,7 +758,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.jsAxios, requestModelDelete1, "https"), + CodegenLanguage.jsAxios, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -710,7 +786,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.jsAxios, requestModelDelete2, "https"), + CodegenLanguage.jsAxios, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/js_fetch_codegen_test.dart b/test/codegen/js_fetch_codegen_test.dart index 7d809623..7235d483 100644 --- a/test/codegen/js_fetch_codegen_test.dart +++ b/test/codegen/js_fetch_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -27,7 +28,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -52,7 +57,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -77,7 +86,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -102,7 +115,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -130,7 +147,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -158,7 +179,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -182,7 +207,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -210,7 +239,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -235,7 +268,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -266,7 +303,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -295,7 +332,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -320,7 +361,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -346,7 +391,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -370,7 +419,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -400,7 +453,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -428,7 +485,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -457,7 +518,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -489,7 +554,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -526,7 +591,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelPost5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -561,7 +626,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelPost6, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -596,7 +661,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelPost7, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -629,7 +694,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelPost8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -668,7 +733,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.jsFetch, requestModelPost9, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -699,7 +764,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -729,7 +798,11 @@ fetch(url, options) }); """; expect( - codeGen.getCode(CodegenLanguage.jsFetch, requestModelPatch1, "https"), + codeGen.getCode( + CodegenLanguage.jsFetch, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -756,7 +829,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.jsFetch, requestModelDelete1, "https"), + CodegenLanguage.jsFetch, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -785,7 +861,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.jsFetch, requestModelDelete2, "https"), + CodegenLanguage.jsFetch, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/julia_http_codegen_test.dart b/test/codegen/julia_http_codegen_test.dart index 062a182a..ef4c3896 100644 --- a/test/codegen/julia_http_codegen_test.dart +++ b/test/codegen/julia_http_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -18,7 +19,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 2', () { @@ -36,7 +41,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 3', () { @@ -54,7 +63,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 4', () { @@ -76,7 +89,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -95,7 +112,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -118,7 +139,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -133,7 +158,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -156,7 +185,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -176,7 +209,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -196,7 +233,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelGet10, "https"), + CodegenLanguage.juliaHttp, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -221,7 +261,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelGet11, "https"), + CodegenLanguage.juliaHttp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -237,7 +280,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelGet12, "https"), + CodegenLanguage.juliaHttp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -255,7 +301,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelHead1, "https"), + CodegenLanguage.juliaHttp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -270,7 +319,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") """; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -296,7 +349,10 @@ println("Response Body: \n$(String(response.body))") '''; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost1, "https"), + CodegenLanguage.juliaHttp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -325,7 +381,10 @@ println("Response Body: \n$(String(response.body))") '''; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost2, "https"), + CodegenLanguage.juliaHttp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 3', () { @@ -349,7 +408,10 @@ println("Response Body: \n$(String(response.body))") '''; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost3, "https"), + CodegenLanguage.juliaHttp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -373,7 +435,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost4, "https"), + CodegenLanguage.juliaHttp, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -401,7 +466,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost5, "https"), + CodegenLanguage.juliaHttp, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 6', () { @@ -423,7 +491,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost6, "https"), + CodegenLanguage.juliaHttp, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 7', () { @@ -445,7 +516,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost7, "https"), + CodegenLanguage.juliaHttp, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 8', () { @@ -473,7 +547,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost8, "https"), + CodegenLanguage.juliaHttp, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 9', () { @@ -505,7 +582,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPost9, "https"), + CodegenLanguage.juliaHttp, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -530,7 +610,11 @@ println("Status Code: $(response.status) $(HTTP.StatusCodes.statustext(response. println("Response Body: \n$(String(response.body))") '''; expect( - codeGen.getCode(CodegenLanguage.juliaHttp, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.juliaHttp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -556,7 +640,10 @@ println("Response Body: \n$(String(response.body))") '''; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelPatch1, "https"), + CodegenLanguage.juliaHttp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -573,7 +660,10 @@ println("Response Body: \n$(String(response.body))") """; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelDelete1, "https"), + CodegenLanguage.juliaHttp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test('DELETE 2', () { @@ -597,7 +687,10 @@ println("Response Body: \n$(String(response.body))") '''; expect( codeGen.getCode( - CodegenLanguage.juliaHttp, requestModelDelete2, "https"), + CodegenLanguage.juliaHttp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/kotlin_okhttp_codegen_test.dart b/test/codegen/kotlin_okhttp_codegen_test.dart index 292e5f35..cc9871bb 100644 --- a/test/codegen/kotlin_okhttp_codegen_test.dart +++ b/test/codegen/kotlin_okhttp_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -29,7 +30,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet1, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -58,7 +62,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet2, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -87,7 +94,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet3, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -120,7 +130,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet4, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -147,7 +160,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet5, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -177,7 +193,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet6, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -203,7 +222,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet7, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -233,7 +255,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet8, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -263,7 +288,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet9, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -292,7 +320,7 @@ fun main() { codeGen.getCode( CodegenLanguage.kotlinOkHttp, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -324,7 +352,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet11, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -350,7 +381,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelGet12, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -378,7 +412,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelHead1, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -404,7 +441,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelHead2, "http"), + CodegenLanguage.kotlinOkHttp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -440,7 +480,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost1, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -479,7 +522,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost2, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -514,7 +560,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost3, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -543,7 +592,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost4, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -574,7 +626,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost5, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 6', () { @@ -606,7 +661,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost6, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 7', () { @@ -638,7 +696,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost7, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 8', () { @@ -671,7 +732,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost8, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 9', () { @@ -709,7 +773,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPost9, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -746,7 +813,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPut1, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -783,7 +853,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelPatch1, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -811,7 +884,10 @@ fun main() { """; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelDelete1, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -846,7 +922,10 @@ fun main() { '''; expect( codeGen.getCode( - CodegenLanguage.kotlinOkHttp, requestModelDelete2, "https"), + CodegenLanguage.kotlinOkHttp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/nodejs_axios_codegen_test.dart b/test/codegen/nodejs_axios_codegen_test.dart index e1b2b460..3237072a 100644 --- a/test/codegen/nodejs_axios_codegen_test.dart +++ b/test/codegen/nodejs_axios_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -26,7 +27,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet1, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -52,7 +56,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet2, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -78,7 +85,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet3, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -108,7 +118,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet4, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -134,7 +147,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet5, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -163,7 +179,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet6, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -186,7 +205,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet7, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -215,7 +237,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet8, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -242,7 +267,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet9, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -270,7 +298,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -301,7 +329,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet11, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -324,7 +355,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelGet12, "https"), + CodegenLanguage.nodejsAxios, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -349,7 +383,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelHead1, "https"), + CodegenLanguage.nodejsAxios, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -372,7 +409,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelHead2, "http"), + CodegenLanguage.nodejsAxios, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -401,7 +441,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelPost1, "https"), + CodegenLanguage.nodejsAxios, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -428,7 +471,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelPost2, "https"), + CodegenLanguage.nodejsAxios, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -456,7 +502,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelPost3, "https"), + CodegenLanguage.nodejsAxios, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -488,7 +537,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -523,7 +572,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelPost5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -556,7 +605,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelPost6, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -589,7 +638,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelPost7, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -626,7 +675,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelPost8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -665,7 +714,7 @@ axios(config) codeGen.getCode( CodegenLanguage.nodejsAxios, requestModelPost9, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -695,7 +744,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelPut1, "https"), + CodegenLanguage.nodejsAxios, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -724,7 +776,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelPatch1, "https"), + CodegenLanguage.nodejsAxios, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -749,7 +804,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelDelete1, "https"), + CodegenLanguage.nodejsAxios, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -776,7 +834,10 @@ axios(config) """; expect( codeGen.getCode( - CodegenLanguage.nodejsAxios, requestModelDelete2, "https"), + CodegenLanguage.nodejsAxios, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/nodejs_fetch_codegen_test.dart b/test/codegen/nodejs_fetch_codegen_test.dart index 974d73fb..4dea18ff 100644 --- a/test/codegen/nodejs_fetch_codegen_test.dart +++ b/test/codegen/nodejs_fetch_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -30,7 +31,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet1, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -57,7 +61,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet2, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -84,7 +91,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet3, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -111,7 +121,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet4, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -141,7 +154,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet5, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -171,7 +187,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet6, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -198,7 +217,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet7, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -228,7 +250,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet8, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -255,7 +280,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet9, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -287,7 +315,7 @@ fetch(url, options) codeGen.getCode( CodegenLanguage.nodejsFetch, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -318,7 +346,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet11, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -345,7 +376,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelGet12, "https"), + CodegenLanguage.nodejsFetch, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -374,7 +408,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelHead1, "https"), + CodegenLanguage.nodejsFetch, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -401,7 +438,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelHead2, "http"), + CodegenLanguage.nodejsFetch, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -434,7 +474,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost1, "https"), + CodegenLanguage.nodejsFetch, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -465,7 +508,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost2, "https"), + CodegenLanguage.nodejsFetch, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -497,7 +543,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost3, "https"), + CodegenLanguage.nodejsFetch, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -529,8 +578,8 @@ fetch(url, options) }); """; expect( - codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost4, "https", + codeGen.getCode(CodegenLanguage.nodejsFetch, requestModelPost4, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -567,8 +616,8 @@ fetch(url, options) }); """; expect( - codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost5, "https", + codeGen.getCode(CodegenLanguage.nodejsFetch, requestModelPost5, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -600,8 +649,8 @@ fetch(url, options) }); """; expect( - codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost6, "https", + codeGen.getCode(CodegenLanguage.nodejsFetch, requestModelPost6, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -633,8 +682,8 @@ fetch(url, options) }); """; expect( - codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost7, "https", + codeGen.getCode(CodegenLanguage.nodejsFetch, requestModelPost7, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -667,8 +716,8 @@ fetch(url, options) }); """; expect( - codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost8, "https", + codeGen.getCode(CodegenLanguage.nodejsFetch, requestModelPost8, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -704,8 +753,8 @@ fetch(url, options) }); """; expect( - codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPost9, "https", + codeGen.getCode(CodegenLanguage.nodejsFetch, requestModelPost9, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -739,7 +788,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPut1, "https"), + CodegenLanguage.nodejsFetch, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -772,7 +824,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelPatch1, "https"), + CodegenLanguage.nodejsFetch, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -801,7 +856,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelDelete1, "https"), + CodegenLanguage.nodejsFetch, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -832,7 +890,10 @@ fetch(url, options) """; expect( codeGen.getCode( - CodegenLanguage.nodejsFetch, requestModelDelete2, "https"), + CodegenLanguage.nodejsFetch, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/php_curl_codegen_test.dart b/test/codegen/php_curl_codegen_test.dart index 69c78cce..d9917f48 100644 --- a/test/codegen/php_curl_codegen_test.dart +++ b/test/codegen/php_curl_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -29,7 +30,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet1, 'https'), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 2', () { @@ -59,7 +64,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet2, 'https'), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 3', () { @@ -89,7 +98,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET 4', () { @@ -123,7 +136,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -154,7 +171,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet5, 'https'), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -190,7 +211,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -216,7 +241,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -252,7 +281,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -284,7 +317,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -315,7 +352,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet10, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -352,7 +393,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -378,7 +423,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -406,7 +455,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -432,7 +485,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -470,7 +527,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -511,7 +572,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 3', () { @@ -547,7 +612,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -580,7 +649,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost4, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -618,7 +691,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost5, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 6', () { @@ -649,7 +726,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost6, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 7', () { @@ -680,7 +761,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost7, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 8', () { @@ -718,7 +803,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost8, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 9', () { @@ -761,7 +850,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPost9, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -799,7 +892,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -837,7 +934,11 @@ echo "Status Code: " . $httpCode . "\n"; echo $response . "\n"; '''; expect( - codeGen.getCode(CodegenLanguage.phpCurl, requestModelPatch1, "https"), + codeGen.getCode( + CodegenLanguage.phpCurl, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -865,7 +966,10 @@ echo $response . "\n"; '''; expect( codeGen.getCode( - CodegenLanguage.phpCurl, requestModelDelete1, "https"), + CodegenLanguage.phpCurl, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test('DELETE 2', () { @@ -902,7 +1006,10 @@ echo $response . "\n"; '''; expect( codeGen.getCode( - CodegenLanguage.phpCurl, requestModelDelete2, "https"), + CodegenLanguage.phpCurl, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/php_guzzle_codegen_test.dart b/test/codegen/php_guzzle_codegen_test.dart index f7765cd4..8f64782e 100644 --- a/test/codegen/php_guzzle_codegen_test.dart +++ b/test/codegen/php_guzzle_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -24,7 +25,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -50,7 +55,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -76,7 +85,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -106,7 +119,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -131,7 +148,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -161,7 +182,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -182,7 +207,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -212,7 +241,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -239,7 +272,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -267,7 +304,7 @@ echo $res->getBody(); codeGen.getCode( CodegenLanguage.phpGuzzle, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -300,7 +337,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelGet11, "https"), + CodegenLanguage.phpGuzzle, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -322,7 +362,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelGet12, "https"), + CodegenLanguage.phpGuzzle, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -346,7 +389,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelHead1, "https"), + CodegenLanguage.phpGuzzle, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -367,7 +413,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -401,7 +451,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost1, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -438,7 +491,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost2, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -471,7 +527,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost3, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -512,7 +571,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost4, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -554,7 +616,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost5, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -591,7 +656,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost6, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -628,7 +696,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost7, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -675,7 +746,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost8, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -720,7 +794,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPost9, "https"), + CodegenLanguage.phpGuzzle, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -754,7 +831,11 @@ echo $res->getStatusCode() . "\n"; echo $res->getBody(); """; expect( - codeGen.getCode(CodegenLanguage.phpGuzzle, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.phpGuzzle, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -789,7 +870,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelPatch1, "https"), + CodegenLanguage.phpGuzzle, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -813,7 +897,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelDelete1, "https"), + CodegenLanguage.phpGuzzle, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -846,7 +933,10 @@ echo $res->getBody(); """; expect( codeGen.getCode( - CodegenLanguage.phpGuzzle, requestModelDelete2, "https"), + CodegenLanguage.phpGuzzle, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/php_http_plug_codegen_test.dart b/test/codegen/php_http_plug_codegen_test.dart index 2fef5b78..1c9f4d6d 100644 --- a/test/codegen/php_http_plug_codegen_test.dart +++ b/test/codegen/php_http_plug_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -26,7 +27,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet1, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET2', () { @@ -52,7 +56,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet2, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET3', () { @@ -78,7 +85,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet3, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET4', () { @@ -108,7 +118,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet4, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET5', () { @@ -136,7 +149,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet5, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET6', () { @@ -168,7 +184,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet6, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET7', () { @@ -190,7 +209,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet7, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET8', () { @@ -222,7 +244,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet8, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET9', () { @@ -249,7 +274,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet9, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET10', () { @@ -277,7 +305,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet10, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET11', () { @@ -310,7 +341,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet11, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET12', () { @@ -332,7 +366,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelGet12, "https"), + CodegenLanguage.phpHttpPlug, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -357,7 +394,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelHead1, "https"), + CodegenLanguage.phpHttpPlug, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); test('HEAD2', () { @@ -379,7 +419,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelHead2, "http"), + CodegenLanguage.phpHttpPlug, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -417,7 +460,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost1, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST2', () { @@ -457,7 +503,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost2, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST3', () { @@ -493,7 +542,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost3, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST4', () { @@ -527,7 +579,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost4, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST5', () { @@ -562,7 +617,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost5, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST6', () { @@ -596,7 +654,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost6, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST7', () { @@ -630,7 +691,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost7, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST8', () { @@ -669,7 +733,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost8, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST9', () { @@ -710,7 +777,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPost9, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -749,7 +819,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPut1, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -788,7 +861,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelPatch1, "https"), + CodegenLanguage.phpHttpPlug, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -813,7 +889,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelDelete1, "https"), + CodegenLanguage.phpHttpPlug, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test('DELETE2', () { @@ -849,7 +928,10 @@ echo $response->getBody(); '''; expect( codeGen.getCode( - CodegenLanguage.phpHttpPlug, requestModelDelete2, "https"), + CodegenLanguage.phpHttpPlug, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/python_http_client_codegen_test.dart b/test/codegen/python_http_client_codegen_test.dart index 8e2bbe17..3dc6068b 100644 --- a/test/codegen/python_http_client_codegen_test.dart +++ b/test/codegen/python_http_client_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -20,7 +21,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet1, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -43,7 +47,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet2, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -66,7 +73,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet3, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -93,7 +103,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet4, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -115,7 +128,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet5, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -143,7 +159,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet6, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -160,7 +179,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet7, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -188,7 +210,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet8, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -212,7 +237,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet9, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -236,7 +264,7 @@ print(data.decode("utf-8")) codeGen.getCode( CodegenLanguage.pythonHttpClient, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -266,7 +294,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet11, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -283,7 +314,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelGet12, "https"), + CodegenLanguage.pythonHttpClient, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -302,7 +336,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelHead1, "https"), + CodegenLanguage.pythonHttpClient, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -319,7 +356,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelHead2, "http"), + CodegenLanguage.pythonHttpClient, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -348,7 +388,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost1, "https"), + CodegenLanguage.pythonHttpClient, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -380,7 +423,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost2, "https"), + CodegenLanguage.pythonHttpClient, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -408,7 +454,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost3, "https"), + CodegenLanguage.pythonHttpClient, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -455,8 +504,8 @@ data = res.read() print(data.decode("utf-8")) """; expect( - codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost4, "https", + codeGen.getCode(CodegenLanguage.pythonHttpClient, requestModelPost4, + SupportedUriSchemes.https, boundary: "b9826c20-773c-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -505,8 +554,8 @@ data = res.read() print(data.decode("utf-8")) """; expect( - codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost5, "https", + codeGen.getCode(CodegenLanguage.pythonHttpClient, requestModelPost5, + SupportedUriSchemes.https, boundary: "929dc910-7714-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -554,8 +603,8 @@ data = res.read() print(data.decode("utf-8")) """; expect( - codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost6, "https", + codeGen.getCode(CodegenLanguage.pythonHttpClient, requestModelPost6, + SupportedUriSchemes.https, boundary: "9b1374c0-76e0-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -603,8 +652,8 @@ data = res.read() print(data.decode("utf-8")) """; expect( - codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost7, "https", + codeGen.getCode(CodegenLanguage.pythonHttpClient, requestModelPost7, + SupportedUriSchemes.https, boundary: "defdf240-76b4-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -659,8 +708,8 @@ data = res.read() print(data.decode("utf-8")) """; expect( - codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost8, "https", + codeGen.getCode(CodegenLanguage.pythonHttpClient, requestModelPost8, + SupportedUriSchemes.https, boundary: "a990b150-7683-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -717,8 +766,8 @@ data = res.read() print(data.decode("utf-8")) """; expect( - codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPost9, "https", + codeGen.getCode(CodegenLanguage.pythonHttpClient, requestModelPost9, + SupportedUriSchemes.https, boundary: "79088e00-75ec-1f0c-814d-a1b3d90cd6b3"), expectedCode); }); @@ -749,7 +798,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPut1, "https"), + CodegenLanguage.pythonHttpClient, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -779,7 +831,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelPatch1, "https"), + CodegenLanguage.pythonHttpClient, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -798,7 +853,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelDelete1, "https"), + CodegenLanguage.pythonHttpClient, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -826,7 +884,10 @@ print(data.decode("utf-8")) """; expect( codeGen.getCode( - CodegenLanguage.pythonHttpClient, requestModelDelete2, "https"), + CodegenLanguage.pythonHttpClient, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/python_requests_codegen_test.dart b/test/codegen/python_requests_codegen_test.dart index 994da3ad..11b11428 100644 --- a/test/codegen/python_requests_codegen_test.dart +++ b/test/codegen/python_requests_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -19,7 +20,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet1, "https"), + CodegenLanguage.pythonRequests, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -39,7 +43,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet2, "https"), + CodegenLanguage.pythonRequests, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -59,7 +66,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet3, "https"), + CodegenLanguage.pythonRequests, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -83,7 +93,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet4, "https"), + CodegenLanguage.pythonRequests, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -103,7 +116,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet5, "https"), + CodegenLanguage.pythonRequests, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -127,7 +143,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet6, "https"), + CodegenLanguage.pythonRequests, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -143,7 +162,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet7, "https"), + CodegenLanguage.pythonRequests, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -167,7 +189,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet8, "https"), + CodegenLanguage.pythonRequests, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -188,7 +213,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet9, "https"), + CodegenLanguage.pythonRequests, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -210,7 +238,7 @@ print('Response Body:', response.text) codeGen.getCode( CodegenLanguage.pythonRequests, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -236,7 +264,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet11, "https"), + CodegenLanguage.pythonRequests, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -252,7 +283,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelGet12, "https"), + CodegenLanguage.pythonRequests, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -270,7 +304,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelHead1, "https"), + CodegenLanguage.pythonRequests, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -286,7 +323,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelHead2, "http"), + CodegenLanguage.pythonRequests, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -312,7 +352,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost1, "https"), + CodegenLanguage.pythonRequests, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -337,7 +380,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost2, "https"), + CodegenLanguage.pythonRequests, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -361,7 +407,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost3, "https"), + CodegenLanguage.pythonRequests, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -388,7 +437,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost4, "https"), + CodegenLanguage.pythonRequests, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -416,7 +468,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost5, "https"), + CodegenLanguage.pythonRequests, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -442,7 +497,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost6, "https"), + CodegenLanguage.pythonRequests, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -468,7 +526,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost7, "https"), + CodegenLanguage.pythonRequests, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -500,7 +561,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost8, "https"), + CodegenLanguage.pythonRequests, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -533,7 +597,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPost9, "https"), + CodegenLanguage.pythonRequests, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -556,7 +623,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPut1, "https"), + CodegenLanguage.pythonRequests, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -579,7 +649,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelPatch1, "https"), + CodegenLanguage.pythonRequests, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -597,7 +670,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelDelete1, "https"), + CodegenLanguage.pythonRequests, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -618,7 +694,10 @@ print('Response Body:', response.text) """; expect( codeGen.getCode( - CodegenLanguage.pythonRequests, requestModelDelete2, "https"), + CodegenLanguage.pythonRequests, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/ruby_faraday_codegen_test.dart b/test/codegen/ruby_faraday_codegen_test.dart index 28e95ffe..e34f1d40 100644 --- a/test/codegen/ruby_faraday_codegen_test.dart +++ b/test/codegen/ruby_faraday_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -25,7 +26,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet1, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -50,7 +54,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet2, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -75,7 +82,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet3, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -104,7 +114,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet4, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -129,7 +142,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet5, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -157,7 +173,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet6, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -179,7 +198,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet7, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -207,7 +229,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet8, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -233,7 +258,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet9, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -260,7 +288,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyFaraday, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -290,7 +318,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet11, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -312,7 +343,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelGet12, "https"), + CodegenLanguage.rubyFaraday, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -336,7 +370,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelHead1, "https"), + CodegenLanguage.rubyFaraday, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -358,7 +395,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelHead2, "http"), + CodegenLanguage.rubyFaraday, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -391,7 +431,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost1, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -427,7 +470,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost2, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -459,7 +505,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost3, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -489,7 +538,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyFaraday, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -520,7 +569,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost5, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 6', () { @@ -548,7 +600,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost6, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 7', () { @@ -576,7 +631,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost7, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 8', () { @@ -607,7 +665,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost8, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 9', () { @@ -643,7 +704,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPost9, "https"), + CodegenLanguage.rubyFaraday, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -677,7 +741,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPut1, "https"), + CodegenLanguage.rubyFaraday, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -711,7 +778,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelPatch1, "https"), + CodegenLanguage.rubyFaraday, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -735,7 +805,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelDelete1, "https"), + CodegenLanguage.rubyFaraday, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -768,7 +841,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyFaraday, requestModelDelete2, "https"), + CodegenLanguage.rubyFaraday, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/ruby_net_http_codegen_test.dart b/test/codegen/ruby_net_http_codegen_test.dart index 199e6f6e..33f85424 100644 --- a/test/codegen/ruby_net_http_codegen_test.dart +++ b/test/codegen/ruby_net_http_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -22,7 +23,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet1, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -41,7 +45,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet2, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -60,7 +67,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet3, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -79,7 +89,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet4, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -99,7 +112,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet5, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -119,7 +135,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet6, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -138,7 +157,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet7, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -158,7 +180,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet8, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -177,7 +202,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet9, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -199,7 +227,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -220,7 +248,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet11, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -239,7 +270,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelGet12, "https"), + CodegenLanguage.rubyNetHttp, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -260,7 +294,10 @@ puts "Response Body: #{response.to_hash}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelHead1, "https"), + CodegenLanguage.rubyNetHttp, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -279,7 +316,10 @@ puts "Response Body: #{response.to_hash}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelHead2, "http"), + CodegenLanguage.rubyNetHttp, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -307,7 +347,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelPost1, "https"), + CodegenLanguage.rubyNetHttp, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -338,7 +381,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelPost2, "https"), + CodegenLanguage.rubyNetHttp, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -365,7 +411,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelPost3, "https"), + CodegenLanguage.rubyNetHttp, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -387,7 +436,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -412,7 +461,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelPost5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -435,7 +484,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelPost6, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -458,7 +507,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelPost7, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -481,7 +530,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelPost8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -506,7 +555,7 @@ puts "Response Body: #{response.body}" codeGen.getCode( CodegenLanguage.rubyNetHttp, requestModelPost9, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -536,7 +585,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelPut1, "https"), + CodegenLanguage.rubyNetHttp, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -565,7 +617,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelPatch1, "https"), + CodegenLanguage.rubyNetHttp, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -586,7 +641,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelDelete1, "https"), + CodegenLanguage.rubyNetHttp, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -613,7 +671,10 @@ puts "Response Body: #{response.body}" """; expect( codeGen.getCode( - CodegenLanguage.rubyNetHttp, requestModelDelete2, "https"), + CodegenLanguage.rubyNetHttp, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/rust_actix_codegen_test.dart b/test/codegen/rust_actix_codegen_test.dart index f9506ca8..730296ad 100644 --- a/test/codegen/rust_actix_codegen_test.dart +++ b/test/codegen/rust_actix_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -28,7 +29,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -55,7 +60,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -82,7 +91,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -109,7 +122,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -135,7 +152,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -163,7 +184,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -188,7 +213,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -216,7 +245,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -243,7 +276,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -272,7 +309,7 @@ async fn main() -> Result<(), Box> { codeGen.getCode( CodegenLanguage.rustActix, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -302,7 +339,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelGet11, "https"), + CodegenLanguage.rustActix, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -328,7 +368,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelGet12, "https"), + CodegenLanguage.rustActix, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -356,7 +399,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelHead1, "https"), + CodegenLanguage.rustActix, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -381,7 +427,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -414,7 +464,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelPost1, "https"), + CodegenLanguage.rustActix, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -449,7 +502,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelPost2, "https"), + CodegenLanguage.rustActix, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -480,7 +536,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelPost3, "https"), + CodegenLanguage.rustActix, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -564,7 +623,7 @@ async fn main() -> Result<(), Box> { codeGen.getCode( CodegenLanguage.rustActix, requestModelPost4, - "https", + SupportedUriSchemes.https, boundary: "test", ), expectedCode); @@ -647,7 +706,8 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelPost5, "https", + codeGen.getCode(CodegenLanguage.rustActix, requestModelPost5, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -723,7 +783,8 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelPost6, "https", + codeGen.getCode(CodegenLanguage.rustActix, requestModelPost6, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -799,7 +860,8 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelPost7, "https", + codeGen.getCode(CodegenLanguage.rustActix, requestModelPost7, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -882,7 +944,8 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelPost8, "https", + codeGen.getCode(CodegenLanguage.rustActix, requestModelPost8, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -962,7 +1025,8 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelPost9, "https", + codeGen.getCode(CodegenLanguage.rustActix, requestModelPost9, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -995,7 +1059,11 @@ async fn main() -> Result<(), Box> { } """; expect( - codeGen.getCode(CodegenLanguage.rustActix, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.rustActix, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1028,7 +1096,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelPatch1, "https"), + CodegenLanguage.rustActix, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -1056,7 +1127,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelDelete1, "https"), + CodegenLanguage.rustActix, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1087,7 +1161,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustActix, requestModelDelete2, "https"), + CodegenLanguage.rustActix, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/rust_curl_codegen_test.dart b/test/codegen/rust_curl_codegen_test.dart index 26250882..f9002830 100644 --- a/test/codegen/rust_curl_codegen_test.dart +++ b/test/codegen/rust_curl_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -32,7 +33,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET2', () { @@ -60,7 +65,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET3', () { @@ -88,7 +97,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET4', () { @@ -116,7 +129,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET5', () { @@ -149,7 +166,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET6', () { @@ -182,7 +203,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET7', () { @@ -210,7 +235,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET8', () { @@ -243,7 +272,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET9', () { @@ -271,7 +304,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET10', () { @@ -304,7 +341,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet10, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET11', () { @@ -337,7 +378,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET12', () { @@ -365,7 +410,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -396,7 +445,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); test('HEAD2', () { @@ -424,7 +477,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelHead2, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelHead2, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -464,7 +521,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST2', () { @@ -507,7 +568,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST3', () { @@ -546,7 +611,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST4', () { @@ -589,7 +658,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost4, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST5', () { @@ -637,7 +710,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost5, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST6', () { @@ -676,7 +753,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost6, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST7', () { @@ -715,7 +796,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost7, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST8', () { @@ -758,7 +843,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost8, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST9', () { @@ -803,7 +892,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPost9, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -845,7 +938,11 @@ fn main() { println!("Response code: {}", easy.response_code().unwrap()); }"""; expect( - codeGen.getCode(CodegenLanguage.rustCurl, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.rustCurl, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -888,7 +985,10 @@ fn main() { }"""; expect( codeGen.getCode( - CodegenLanguage.rustCurl, requestModelPatch1, "https"), + CodegenLanguage.rustCurl, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -920,7 +1020,10 @@ fn main() { }"""; expect( codeGen.getCode( - CodegenLanguage.rustCurl, requestModelDelete1, "https"), + CodegenLanguage.rustCurl, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test('DELETE2', () { @@ -960,7 +1063,10 @@ fn main() { }"""; expect( codeGen.getCode( - CodegenLanguage.rustCurl, requestModelDelete2, "https"), + CodegenLanguage.rustCurl, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/rust_hyper_codegen_test.dart b/test/codegen/rust_hyper_codegen_test.dart index 6c70173e..f252bdce 100644 --- a/test/codegen/rust_hyper_codegen_test.dart +++ b/test/codegen/rust_hyper_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -35,7 +36,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET2', () { @@ -67,7 +72,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -100,7 +109,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -133,7 +146,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -168,7 +185,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -203,7 +224,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -236,7 +261,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -271,7 +300,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); test('GET9', () { @@ -303,7 +336,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -339,7 +376,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelGet10, "https"), + CodegenLanguage.rustHyper, + requestModelGet10, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -375,7 +415,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelGet11, "https"), + CodegenLanguage.rustHyper, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -409,7 +452,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelGet12, "https"), + CodegenLanguage.rustHyper, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -445,7 +491,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelHead1, "https"), + CodegenLanguage.rustHyper, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -478,7 +527,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -515,7 +568,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost1, "https"), + CodegenLanguage.rustHyper, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST2', () { @@ -555,7 +611,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost2, "https"), + CodegenLanguage.rustHyper, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST3', () { @@ -592,7 +651,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost3, "https"), + CodegenLanguage.rustHyper, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST4', () { @@ -633,7 +695,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost4, "https"), + CodegenLanguage.rustHyper, + requestModelPost4, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST5', () { @@ -676,7 +741,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost5, "https"), + CodegenLanguage.rustHyper, + requestModelPost5, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST6', () { @@ -716,7 +784,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost6, "https"), + CodegenLanguage.rustHyper, + requestModelPost6, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST7', () { @@ -756,7 +827,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost7, "https"), + CodegenLanguage.rustHyper, + requestModelPost7, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST8', () { @@ -797,7 +871,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost8, "https"), + CodegenLanguage.rustHyper, + requestModelPost8, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST9', () { @@ -841,7 +918,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPost9, "https"), + CodegenLanguage.rustHyper, + requestModelPost9, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -879,7 +959,11 @@ async fn main() -> Result<(), Box> { """; expect( - codeGen.getCode(CodegenLanguage.rustHyper, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.rustHyper, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -918,7 +1002,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelPatch1, "https"), + CodegenLanguage.rustHyper, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -954,7 +1041,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelDelete1, "https"), + CodegenLanguage.rustHyper, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); test('DELETE2', () { @@ -990,7 +1080,10 @@ async fn main() -> Result<(), Box> { """; expect( codeGen.getCode( - CodegenLanguage.rustHyper, requestModelDelete2, "https"), + CodegenLanguage.rustHyper, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/rust_reqwest_codegen_test.dart b/test/codegen/rust_reqwest_codegen_test.dart index b8a4b904..0f2a19ee 100644 --- a/test/codegen/rust_reqwest_codegen_test.dart +++ b/test/codegen/rust_reqwest_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -25,7 +26,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet1, "https"), + CodegenLanguage.rustReqwest, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -48,7 +52,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet2, "https"), + CodegenLanguage.rustReqwest, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -71,7 +78,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet3, "https"), + CodegenLanguage.rustReqwest, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -94,7 +104,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet4, "https"), + CodegenLanguage.rustReqwest, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -117,7 +130,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet5, "https"), + CodegenLanguage.rustReqwest, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -141,7 +157,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet6, "https"), + CodegenLanguage.rustReqwest, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -163,7 +182,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet7, "https"), + CodegenLanguage.rustReqwest, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -187,7 +209,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet8, "https"), + CodegenLanguage.rustReqwest, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -210,7 +235,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet9, "https"), + CodegenLanguage.rustReqwest, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -235,7 +263,7 @@ void main() { codeGen.getCode( CodegenLanguage.rustReqwest, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -260,7 +288,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet11, "https"), + CodegenLanguage.rustReqwest, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -282,7 +313,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelGet12, "https"), + CodegenLanguage.rustReqwest, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -306,7 +340,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelHead1, "https"), + CodegenLanguage.rustReqwest, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -328,7 +365,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelHead2, "http"), + CodegenLanguage.rustReqwest, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -358,7 +398,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost1, "https"), + CodegenLanguage.rustReqwest, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -390,7 +433,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost2, "https"), + CodegenLanguage.rustReqwest, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -418,7 +464,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost3, "https"), + CodegenLanguage.rustReqwest, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); test('POST 4', () { @@ -475,7 +524,7 @@ void main() { codeGen.getCode( CodegenLanguage.rustReqwest, requestModelPost4, - "https", + SupportedUriSchemes.https, boundary: "test", ), expectedCode); @@ -532,8 +581,8 @@ void main() { } """; expect( - codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost5, "https", + codeGen.getCode(CodegenLanguage.rustReqwest, requestModelPost5, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -583,8 +632,8 @@ void main() { } """; expect( - codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost6, "https", + codeGen.getCode(CodegenLanguage.rustReqwest, requestModelPost6, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -634,8 +683,8 @@ void main() { } """; expect( - codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost7, "https", + codeGen.getCode(CodegenLanguage.rustReqwest, requestModelPost7, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -691,8 +740,8 @@ void main() { } """; expect( - codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost8, "https", + codeGen.getCode(CodegenLanguage.rustReqwest, requestModelPost8, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -745,8 +794,8 @@ void main() { } """; expect( - codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPost9, "https", + codeGen.getCode(CodegenLanguage.rustReqwest, requestModelPost9, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -777,7 +826,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPut1, "https"), + CodegenLanguage.rustReqwest, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -807,7 +859,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelPatch1, "https"), + CodegenLanguage.rustReqwest, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -831,7 +886,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelDelete1, "https"), + CodegenLanguage.rustReqwest, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -859,7 +917,10 @@ void main() { """; expect( codeGen.getCode( - CodegenLanguage.rustReqwest, requestModelDelete2, "https"), + CodegenLanguage.rustReqwest, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/rust_ureq_codegen_test.dart b/test/codegen/rust_ureq_codegen_test.dart index 3a31294d..8ef0cb69 100644 --- a/test/codegen/rust_ureq_codegen_test.dart +++ b/test/codegen/rust_ureq_codegen_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -20,7 +21,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet1, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -38,7 +43,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet2, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -56,7 +65,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet3, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -78,7 +91,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet4, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet4, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -96,7 +113,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet5, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet5, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -115,7 +136,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet6, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet6, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -132,7 +157,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet7, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet7, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -151,7 +180,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet8, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet8, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -170,7 +203,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet9, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet9, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -191,7 +228,7 @@ void main() { codeGen.getCode( CodegenLanguage.rustUreq, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -212,7 +249,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet11, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet11, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -229,7 +270,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelGet12, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelGet12, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -248,7 +293,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelHead1, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelHead1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -265,7 +314,11 @@ void main() { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelHead2, "http"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelHead2, + SupportedUriSchemes.http, + ), expectedCode); }); }); @@ -289,7 +342,11 @@ void main() { } '''; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost1, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelPost1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -315,7 +372,11 @@ void main() { } '''; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost2, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelPost2, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -337,7 +398,11 @@ void main() { } '''; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost3, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelPost3, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -413,7 +478,7 @@ fn main() -> Result<(), ureq::Error> { codeGen.getCode( CodegenLanguage.rustUreq, requestModelPost4, - "https", + SupportedUriSchemes.https, boundary: "test", ), expectedCode); @@ -488,7 +553,8 @@ fn main() -> Result<(), ureq::Error> { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost5, "https", + codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost5, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -556,7 +622,8 @@ fn main() -> Result<(), ureq::Error> { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost6, "https", + codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost6, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -624,7 +691,8 @@ fn main() -> Result<(), ureq::Error> { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost7, "https", + codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost7, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -699,7 +767,8 @@ fn main() -> Result<(), ureq::Error> { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost8, "https", + codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost8, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -771,7 +840,8 @@ fn main() -> Result<(), ureq::Error> { } """; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost9, "https", + codeGen.getCode(CodegenLanguage.rustUreq, requestModelPost9, + SupportedUriSchemes.https, boundary: "test"), expectedCode); }); @@ -796,7 +866,11 @@ fn main() -> Result<(), ureq::Error> { } '''; expect( - codeGen.getCode(CodegenLanguage.rustUreq, requestModelPut1, "https"), + codeGen.getCode( + CodegenLanguage.rustUreq, + requestModelPut1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -821,7 +895,10 @@ fn main() -> Result<(), ureq::Error> { '''; expect( codeGen.getCode( - CodegenLanguage.rustUreq, requestModelPatch1, "https"), + CodegenLanguage.rustUreq, + requestModelPatch1, + SupportedUriSchemes.https, + ), expectedCode); }); }); @@ -841,7 +918,10 @@ fn main() -> Result<(), ureq::Error> { """; expect( codeGen.getCode( - CodegenLanguage.rustUreq, requestModelDelete1, "https"), + CodegenLanguage.rustUreq, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -864,7 +944,10 @@ fn main() -> Result<(), ureq::Error> { '''; expect( codeGen.getCode( - CodegenLanguage.rustUreq, requestModelDelete2, "https"), + CodegenLanguage.rustUreq, + requestModelDelete2, + SupportedUriSchemes.https, + ), expectedCode); }); }); diff --git a/test/codegen/swift_urlsession_test.dart b/test/codegen/swift_urlsession_test.dart index a3238f67..d99983bb 100644 --- a/test/codegen/swift_urlsession_test.dart +++ b/test/codegen/swift_urlsession_test.dart @@ -1,5 +1,6 @@ import 'package:apidash/codegen/codegen.dart'; import 'package:apidash/consts.dart'; +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import '../models/request_models.dart'; @@ -31,7 +32,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet1, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -56,7 +57,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet2, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -81,7 +82,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet3, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -106,7 +107,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -134,7 +135,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -162,7 +163,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet6, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -187,7 +188,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet7, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -214,7 +215,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -239,7 +240,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet9, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -267,7 +268,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -295,7 +296,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet11, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -320,7 +321,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelGet12, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -350,7 +351,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelHead1, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -375,7 +376,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelHead2, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -413,7 +414,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost1, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -444,7 +445,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost2, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -478,7 +479,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost3, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -557,7 +558,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost4, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -637,7 +638,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost5, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -709,7 +710,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost6, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -781,7 +782,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost7, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -859,7 +860,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost8, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -935,7 +936,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost9, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -966,7 +967,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPost10, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -1004,7 +1005,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPut1, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -1042,7 +1043,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelPatch1, - "https", + SupportedUriSchemes.https, ), expectedCode); }); @@ -1071,7 +1072,10 @@ task.resume() expect( codeGen.getCode( - CodegenLanguage.swiftUrlSession, requestModelDelete1, "https"), + CodegenLanguage.swiftUrlSession, + requestModelDelete1, + SupportedUriSchemes.https, + ), expectedCode); }); @@ -1102,7 +1106,7 @@ task.resume() codeGen.getCode( CodegenLanguage.swiftUrlSession, requestModelDelete2, - "https", + SupportedUriSchemes.https, ), expectedCode); }); diff --git a/test/models/settings_model_test.dart b/test/models/settings_model_test.dart index 0a1a33a9..bb24de2b 100644 --- a/test/models/settings_model_test.dart +++ b/test/models/settings_model_test.dart @@ -1,3 +1,4 @@ +import 'package:apidash_core/apidash_core.dart'; import 'package:test/test.dart'; import 'package:flutter/material.dart'; import 'package:apidash/models/settings_model.dart'; @@ -9,7 +10,7 @@ void main() { alwaysShowCollectionPaneScrollbar: true, size: Size(300, 200), offset: Offset(100, 150), - defaultUriScheme: "http", + defaultUriScheme: SupportedUriSchemes.http, defaultCodeGenLang: CodegenLanguage.curl, saveResponses: true, promptBeforeClosing: true, @@ -62,7 +63,7 @@ void main() { alwaysShowCollectionPaneScrollbar: true, size: Size(300, 200), offset: Offset(100, 150), - defaultUriScheme: "http", + defaultUriScheme: SupportedUriSchemes.http, defaultCodeGenLang: CodegenLanguage.curl, saveResponses: false, promptBeforeClosing: true, diff --git a/test/widgets/popup_menu_codegen_test.dart b/test/widgets/popup_menu_codegen_test.dart index b613c686..6d865f30 100644 --- a/test/widgets/popup_menu_codegen_test.dart +++ b/test/widgets/popup_menu_codegen_test.dart @@ -13,7 +13,6 @@ void main() { home: Scaffold( body: CodegenPopupMenu( value: codegenLanguage, - items: [codegenLanguage], ), ), ), @@ -31,7 +30,6 @@ void main() { const MaterialApp( home: Scaffold( body: CodegenPopupMenu( - items: [codegenLanguage1, codegenLanguage2], value: codegenLanguage1, ), ), @@ -48,7 +46,7 @@ void main() { testWidgets('CodegenPopupMenu calls onChanged when an item is selected', (WidgetTester tester) async { const codegenLanguage1 = CodegenLanguage.dartDio; - const codegenLanguage2 = CodegenLanguage.pythonRequests; + const codegenLanguage2 = CodegenLanguage.cCurlCodeGen; CodegenLanguage? selectedLanguage; await tester.pumpWidget( @@ -56,7 +54,6 @@ void main() { home: Scaffold( body: CodegenPopupMenu( value: codegenLanguage1, - items: const [codegenLanguage1, codegenLanguage2], onChanged: (value) { selectedLanguage = value; }, diff --git a/test/widgets/popup_menu_env_test.dart b/test/widgets/popup_menu_env_test.dart index cbb3b5f5..4c11df39 100644 --- a/test/widgets/popup_menu_env_test.dart +++ b/test/widgets/popup_menu_env_test.dart @@ -1,3 +1,4 @@ +import 'package:apidash/consts.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:apidash/models/models.dart'; @@ -13,7 +14,7 @@ void main() { home: Scaffold( body: EnvironmentPopupMenu( value: environment, - items: [environment], + options: [environment], ), ), ), @@ -24,11 +25,16 @@ void main() { testWidgets('EnvironmentPopupMenu displays "None" when no value is provided', (WidgetTester tester) async { + const environment = EnvironmentModel( + name: 'Global', + id: kGlobalEnvironmentId, + ); await tester.pumpWidget( const MaterialApp( home: Scaffold( body: EnvironmentPopupMenu( - items: [], + value: environment, + options: [environment], ), ), ), @@ -39,14 +45,25 @@ void main() { testWidgets('EnvironmentPopupMenu displays popup menu items', (WidgetTester tester) async { - const environment1 = EnvironmentModel(name: 'Production', id: 'prod'); - const environment2 = EnvironmentModel(name: 'Development', id: 'dev'); + const environment = EnvironmentModel( + name: 'Global', + id: kGlobalEnvironmentId, + ); + const environment1 = EnvironmentModel( + name: 'Production', + id: 'prod', + ); + const environment2 = EnvironmentModel( + name: 'Development', + id: 'dev', + ); await tester.pumpWidget( const MaterialApp( home: Scaffold( body: EnvironmentPopupMenu( - items: [environment1, environment2], + value: environment, + options: [environment, environment1, environment2], ), ), ), @@ -70,7 +87,7 @@ void main() { MaterialApp( home: Scaffold( body: EnvironmentPopupMenu( - items: const [environment1, environment2], + options: const [environment1, environment2], onChanged: (value) { selectedEnvironment = value; }, @@ -91,14 +108,22 @@ void main() { testWidgets( 'EnvironmentPopupMenu calls onChanged with null when "None" is selected', (WidgetTester tester) async { - const environment = EnvironmentModel(name: 'Production', id: 'prod'); - EnvironmentModel? selectedEnvironment = environment; + const environment = EnvironmentModel( + name: 'Global', + id: kGlobalEnvironmentId, + ); + const environment1 = EnvironmentModel( + name: 'Production', + id: 'prod', + ); + EnvironmentModel? selectedEnvironment = environment1; await tester.pumpWidget( MaterialApp( home: Scaffold( body: EnvironmentPopupMenu( - items: const [environment], + value: environment1, + options: const [environment, environment1], onChanged: (value) { selectedEnvironment = value; }, @@ -113,6 +138,6 @@ void main() { await tester.tap(find.text('None').last); await tester.pumpAndSettle(); - expect(selectedEnvironment, isNull); + expect(selectedEnvironment, environment); }); } diff --git a/test/widgets/popup_menu_history_test.dart b/test/widgets/popup_menu_history_test.dart index 97ffae4f..6d391fc4 100644 --- a/test/widgets/popup_menu_history_test.dart +++ b/test/widgets/popup_menu_history_test.dart @@ -19,7 +19,6 @@ void main() { onChanged: (value) { selectedValue = value; }, - items: const [historyPeriod1, historyPeriod2], ), ), ), diff --git a/test/widgets/popup_menu_uri_test.dart b/test/widgets/popup_menu_uri_test.dart index f27432ee..dc5c817d 100644 --- a/test/widgets/popup_menu_uri_test.dart +++ b/test/widgets/popup_menu_uri_test.dart @@ -1,36 +1,35 @@ +import 'package:apidash_core/apidash_core.dart'; import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; import 'package:apidash/widgets/popup_menu_uri.dart'; void main() { - testWidgets('URIPopupMenu displays initial value', + testWidgets('DefaultUriSchemePopupMenu displays initial value', (WidgetTester tester) async { - const uriScheme = 'https'; + const uriScheme = SupportedUriSchemes.https; await tester.pumpWidget( const MaterialApp( home: Scaffold( - body: URIPopupMenu( + body: DefaultUriSchemePopupMenu( value: uriScheme, - items: [uriScheme], ), ), ), ); - expect(find.text(uriScheme), findsOneWidget); + expect(find.text(uriScheme.name), findsOneWidget); }); - testWidgets('URIPopupMenu displays popup menu items', + testWidgets('DefaultUriSchemePopupMenu displays popup menu items', (WidgetTester tester) async { - const uriScheme1 = 'https'; - const uriScheme2 = 'http'; + const uriScheme1 = SupportedUriSchemes.https; + const uriScheme2 = SupportedUriSchemes.http; await tester.pumpWidget( const MaterialApp( home: Scaffold( - body: URIPopupMenu( - items: [uriScheme1, uriScheme2], + body: DefaultUriSchemePopupMenu( value: uriScheme1, ), ), @@ -40,22 +39,22 @@ void main() { await tester.tap(find.byIcon(Icons.unfold_more)); await tester.pumpAndSettle(); - expect(find.text(uriScheme1), findsExactly(2)); - expect(find.text(uriScheme2), findsOneWidget); + expect(find.text(uriScheme1.name), findsExactly(2)); + expect(find.text(uriScheme2.name), findsOneWidget); }); - testWidgets('URIPopupMenu calls onChanged when an item is selected', + testWidgets( + 'DefaultUriSchemePopupMenu calls onChanged when an item is selected', (WidgetTester tester) async { - const uriScheme1 = 'https'; - const uriScheme2 = 'http'; - String? selectedScheme; + const uriScheme1 = SupportedUriSchemes.https; + const uriScheme2 = SupportedUriSchemes.http; + SupportedUriSchemes? selectedScheme; await tester.pumpWidget( MaterialApp( home: Scaffold( - body: URIPopupMenu( + body: DefaultUriSchemePopupMenu( value: uriScheme1, - items: const [uriScheme1, uriScheme2], onChanged: (value) { selectedScheme = value; }, @@ -67,7 +66,7 @@ void main() { await tester.tap(find.byIcon(Icons.unfold_more)); await tester.pumpAndSettle(); - await tester.tap(find.text(uriScheme2).last); + await tester.tap(find.text(uriScheme2.name).last); await tester.pumpAndSettle(); expect(selectedScheme, uriScheme2);