From 89179842ff7260b1bc299f96d0dda9ddf6afcd2e Mon Sep 17 00:00:00 2001 From: Peter Thomas Date: Mon, 16 Nov 2020 11:02:16 +0530 Subject: [PATCH] [rewrite] #1281 cleaning up packages esp test folders --- .../src/main/java/com/intuit/karate/Http.java | 4 +- .../java/com/intuit/karate/JsonUtils.java | 2 +- .../src/main/java/com/intuit/karate/Main.java | 2 +- .../main/java/com/intuit/karate/PerfHook.java | 2 +- .../main/java/com/intuit/karate/Runner.java | 6 +-- .../com/intuit/karate/ScenarioActions.java | 2 +- .../java/com/intuit/karate/SuiteRuntime.java | 6 +-- .../intuit/karate/cli/CliExecutionHook.java | 6 +-- .../karate/{runtime => core}/Config.java | 2 +- .../com/intuit/karate/core/FeatureResult.java | 1 - .../{runtime => core}/FeatureRuntime.java | 2 +- .../intuit/karate/core/HtmlFeatureReport.java | 1 - .../intuit/karate/core/HtmlTagsReport.java | 1 - .../karate/{runtime => core}/MockHandler.java | 2 +- .../karate/{runtime => core}/MockServer.java | 2 +- .../com/intuit/karate/core/PluginFactory.java | 1 - .../karate/{runtime => core}/RuntimeHook.java | 2 +- .../{runtime => core}/RuntimeHookFactory.java | 2 +- .../java/com/intuit/karate/core/Scenario.java | 1 - .../{runtime => core}/ScenarioBridge.java | 2 +- .../{runtime => core}/ScenarioCall.java | 2 +- .../{runtime => core}/ScenarioEngine.java | 8 +--- .../{runtime => core}/ScenarioFileReader.java | 2 +- .../{runtime => core}/ScenarioGenerator.java | 2 +- .../{runtime => core}/ScenarioListener.java | 2 +- .../intuit/karate/core/ScenarioResult.java | 1 - .../{runtime => core}/ScenarioRuntime.java | 2 +- .../karate/{runtime => core}/StepRuntime.java | 2 +- .../intuit/karate/{runtime => core}/Tags.java | 2 +- .../karate/{runtime => core}/Variable.java | 2 +- .../intuit/karate/debug/DapServerHandler.java | 8 ++-- .../com/intuit/karate/debug/DebugThread.java | 6 +-- .../com/intuit/karate/debug/StackFrame.java | 2 +- .../intuit/karate/driver/DevToolsDriver.java | 6 +-- .../intuit/karate/driver/DevToolsMessage.java | 2 +- .../java/com/intuit/karate/driver/Driver.java | 2 +- .../intuit/karate/driver/DriverOptions.java | 4 +- .../com/intuit/karate/driver/WebDriver.java | 2 +- .../intuit/karate/http/ApacheHttpClient.java | 4 +- .../intuit/karate/http/ArmeriaHttpClient.java | 2 +- .../com/intuit/karate/http/HttpClient.java | 2 +- .../intuit/karate/http/HttpClientFactory.java | 2 +- .../com/intuit/karate/http/HttpLogger.java | 4 +- .../com/intuit/karate/http/ServerConfig.java | 2 +- .../com/intuit/karate/job/JobExecutor.java | 2 +- .../java/com/intuit/karate/FileUtilsTest.java | 7 ++- .../intuit/karate/{data => }/JsonTest.java | 4 +- .../karate/{data => }/JsonUtilsTest.java | 10 ++-- .../karate/core/AllKarateFeaturesTest.java | 30 ------------ .../intuit/karate/{runtime => core}/Cat.java | 2 +- .../karate/{runtime => core}/ComplexPojo.java | 2 +- .../karate/{runtime => core}/DummyClient.java | 2 +- .../{runtime => core}/FeatureBuilder.java | 6 +-- .../{runtime => core}/FeatureFailRunner.java | 4 +- .../FeatureRuntimeRunner.java | 5 +- .../{runtime => core}/FeatureRuntimeTest.java | 9 ++-- .../HttpMockHandlerRunner.java | 2 +- .../HttpMockHandlerTest.java | 4 +- .../KarateHttpMockHandlerTest.java | 4 +- .../KarateMockHandlerTest.java | 4 +- .../karate/{runtime => core}/MockClient.java | 2 +- .../{runtime => core}/MockHandlerTest.java | 4 +- .../karate/{runtime => core}/MockUtils.java | 2 +- .../{runtime => core}/PerfHookTest.java | 7 ++- .../{runtime => core}/RuntimeUtils.java | 6 +-- .../{runtime => core}/ScenarioEngineTest.java | 5 +- .../ScenarioRuntimeTest.java | 20 ++++---- .../karate/{runtime => core}/SimplePojo.java | 2 +- .../karate/{runtime => core}/StaticUtils.java | 2 +- .../karate/{runtime => core}/TagsTest.java | 3 +- .../{runtime => core}/VariableTest.java | 6 +-- .../karate/{runtime => core}/abort.feature | 0 .../call-by-tag-called.feature | 0 .../{runtime => core}/call-by-tag.feature | 0 .../call-feature-called.feature | 0 .../{runtime => core}/call-feature.feature | 0 .../{runtime => core}/call-js-called.feature | 0 .../karate/{runtime => core}/call-js.feature | 0 .../karate/{runtime => core}/called1.feature | 0 .../karate/{runtime => core}/called2.feature | 0 .../callonce-bg-called.feature | 0 .../callonce-bg-outline.feature | 0 .../{runtime => core}/callonce-bg.feature | 0 .../callonce-global-called.feature | 0 .../{runtime => core}/callonce-global.feature | 0 .../{runtime => core}/configure-in-js.feature | 0 .../copy-called-nested.feature | 0 .../copy-called-overwrite.feature | 0 .../{runtime => core}/copy-called.feature | 0 .../karate/{runtime => core}/copy.feature | 0 .../intuit/karate/{runtime => core}/data.json | 0 .../karate/{runtime => core}/dummy.feature | 0 .../{runtime => core}/eval-and-set.feature | 0 .../karate/{runtime => core}/extract.feature | 0 .../karate/{runtime => core}/extract.html | 0 .../karate/{runtime => core}/fail-api.feature | 0 .../karate/{runtime => core}/fail-js.feature | 0 .../karate/{runtime => core}/fail1.feature | 0 .../{runtime => core}/fork-listener.feature | 0 .../karate/{runtime => core}/fork.feature | 0 .../karate/{runtime => core}/increment.js | 0 .../{runtime => core}/js-map-repeat.feature | 0 .../karate/{runtime => core}/js-read.feature | 0 .../karate/{runtime => core}/js-read.json | 0 .../{runtime => core}/karate-config-dev.js | 0 .../karate-config-fn.feature | 0 .../karate-config-utils.feature | 0 .../karate/{runtime => core}/karate-config.js | 2 +- .../karate/{runtime => core}/karate-logo.png | Bin .../match-each-magic-variables.feature | 0 .../{runtime => core}/mock/MockRunner.java | 4 +- .../{runtime => core}/mock/MockTest.java | 4 +- .../{runtime => core}/mock/_mock.feature | 0 .../{runtime => core}/mock/binary.feature | 0 .../{runtime => core}/mock/cookies.feature | 0 .../{runtime => core}/mock/delete.feature | 0 .../{runtime => core}/mock/download.feature | 0 .../{runtime => core}/mock/form.feature | 0 .../{runtime => core}/mock/german.feature | 0 .../{runtime => core}/mock/headers.feature | 0 .../mock/hello-data-driven.feature | 0 .../mock/hello-world.feature | 0 .../{runtime => core}/mock/karate-config.js | 0 .../{runtime => core}/mock/malformed.feature | 0 .../karate/{data => core/mock}/malformed.txt | 0 .../mock/multi-params.feature | 0 .../{runtime => core}/mock/no-headers.feature | 0 .../{runtime => core}/mock/no-match.feature | 0 .../mock/param-commas.feature | 0 .../{runtime => core}/mock/patch.feature | 0 .../{runtime => core}/mock/test.pdf.zip | Bin .../mock/url-encoding.feature | 0 .../mock/white-space.feature | 0 .../outline-generator.feature | 0 .../core/{ => parser}/FeatureParserTest.java | 23 ++++++---- .../core/{ => parser}/test-comments.feature | 0 .../{ => parser}/test-def-docstring.feature | 0 .../core/{ => parser}/test-edge-cases.feature | 0 .../test-empty-background.feature | 0 .../test-empty-first-line1.feature | 0 .../test-empty-first-line2.feature | 0 .../test-empty-first-line3.feature | 0 .../test-empty.feature.txt} | 0 .../core/{ => parser}/test-error.feature | 0 .../test-feature-header-only.feature} | 0 .../core/{ => parser}/test-hide.feature | 0 .../{ => parser}/test-ignore-feature.feature | 0 .../{ => parser}/test-ignore-scenario.feature | 0 .../{ => parser}/test-outline-dynamic.feature | 0 .../{ => parser}/test-outline-name.feature | 0 .../core/{ => parser}/test-set-table.feature | 0 .../test-simple-background.feature | 0 .../core/{ => parser}/test-simple.feature | 0 .../core/{ => parser}/test-table-pipe.feature | 0 .../{ => parser}/test-tags-multiline.feature | 0 .../{runtime => core}/perf-mock.feature | 0 .../karate/{runtime => core}/perf.feature | 0 .../karate/{runtime => core}/print.feature | 0 .../core/{ => runner}/FeatureEditTest.java | 8 +++- .../core/{ => runner}/FeatureResultTest.java | 10 ++-- .../core/{ => runner}/FeatureReuseTest.java | 9 ++-- .../core/{ => runner}/MandatoryTagHook.java | 11 +++-- .../karate/{ => core/runner}/RunnerTest.java | 43 ++++++++++-------- .../core/{ => runner}/ScenarioHookTest.java | 6 +-- .../core/{ => runner}/ScenarioResultTest.java | 8 +++- .../karate/core/{ => runner}/TagTest.java | 3 +- .../karate/core/{ => runner}/aborted.feature | 0 .../{ => core/runner}/called-arg-loop.feature | 0 .../{ => core/runner}/called-arg-null.feature | 0 .../runner}/called-arg-single.feature | 0 .../core/{ => runner}/called-shared.feature | 0 .../core/{ => runner}/called-shared2.feature | 0 .../karate/core/{ => runner}/called.feature | 0 .../karate/core/{ => runner}/called_2.feature | 0 .../{ => core/runner}/caller-arg.feature | 0 .../core/{ => runner}/caller-shared.feature | 0 .../caller-with-lambda-arg.feature | 2 +- .../karate/core/{ => runner}/caller.feature | 0 .../karate/core/{ => runner}/caller_2.feature | 0 .../karate/core/{ => runner}/failed.feature | 0 .../runner}/multi-scenario-fail.feature | 0 .../{ => core/runner}/multi-scenario.feature | 0 .../runner}/no-scenario-name.feature | 0 .../core/{ => runner}/notEqualMatch.feature | 0 .../karate/core/{ => runner}/outline.feature | 0 .../karate/core/{ => runner}/scenario.feature | 0 .../karate/{ => core/runner}/signin.feature | 0 .../karate/core/{ => runner}/simple1.feature | 0 .../karate/core/{ => runner}/simple1.json | 0 .../{ => runner}/stackoverflow-error.feature | 0 .../intuit/karate/core/runner/table.feature | 11 +++++ .../runner}/test-called-embedded-file.feature | 0 .../runner}/test-called-embedded.feature | 0 .../{ => core/runner}/test-called.feature | 0 .../test-hook-multiexample.feature | 0 .../{ => runner}/test-hook-notags.feature | 0 .../intuit/karate/{ => core/runner}/test.json | 0 .../intuit/karate/{ => core/runner}/test.xml | 0 .../karate/{runtime => core}/set-xml.feature | 0 .../karate/{runtime => core}/set.feature | 0 .../java/com/intuit/karate/core/table.feature | 13 ++---- .../karate/{runtime => core}/tags.feature | 0 .../{runtime => core}/to-bean-called.feature | 2 +- .../karate/{runtime => core}/to-bean.feature | 0 .../utils-reuse-common.feature | 0 .../{runtime => core}/utils-reuse.feature | 0 .../intuit/karate/{runtime => core}/uuid.js | 0 .../{runtime => core}/websocket.feature | 0 .../karate/driver/DriverElementTest.java | 2 +- .../karate/fatjar/FeatureProxyRunner.java | 2 +- .../karate/fatjar/FeatureServerRunner.java | 2 +- .../karate/fatjar/FeatureServerTest.java | 2 +- .../karate/fatjar/ProxyServerSslTest.java | 2 +- .../intuit/karate/fatjar/ProxyServerTest.java | 2 +- .../com/intuit/karate/graal/JsEngineTest.java | 5 +- .../test/java/com/intuit/karate/headers.js | 10 ---- .../karate/{runtime/mock => }/malformed.txt | 0 .../test/java/com/intuit/karate/mutation.yaml | 16 ------- .../com/intuit/karate/runtime/table.feature | 8 ---- .../src/test/java/com/intuit/karate/test.csv | 4 -- .../{test.feature => file-utils-test.feature} | 0 .../com/intuit/karate/tx-cat-json.feature | 12 ----- .../com/intuit/karate/tx-kit-json.feature | 9 ---- karate-core/src/test/java/test.json | 1 - .../src/test/java/driver/core/MockRunner.java | 2 +- .../driver/core/Test01ParallelRunner.java | 2 +- .../test/java/driver/core/Test01Runner.java | 2 +- .../test/java/driver/core/Test02Runner.java | 2 +- .../java/driver/core/Test03DockerRunner.java | 2 +- .../test/java/driver/core/Test04Runner.java | 2 +- .../mock/contract/ConsumerUsingMockTest.java | 2 +- .../contract/ConsumerUsingProxyHttpTest.java | 2 +- .../ConsumerUsingProxyRewriteSslTest.java | 2 +- .../ConsumerUsingProxyRewriteTest.java | 2 +- ...aymentServiceContractUsingMockSslTest.java | 2 +- .../PaymentServiceContractUsingMockTest.java | 2 +- .../mock/contract/PaymentServiceMockMain.java | 2 +- .../contract/PaymentServiceMockSslMain.java | 2 +- .../test/java/mock/micro/CatsMockRunner.java | 2 +- .../mock/proxy/DemoMockProceedRunner.java | 2 +- .../java/mock/proxy/DemoMockProxyRunner.java | 2 +- .../mock/proxy/DemoMockProxySslRunner.java | 2 +- .../test/java/mock/proxy/DemoMockRunner.java | 2 +- .../java/mock/proxy/DemoMockSslRunner.java | 2 +- .../test/java/mock/web/CatsMockStarter.java | 2 +- .../intuit/karate/gatling/KarateAction.scala | 1 - .../karate/gatling/KarateProtocol.scala | 2 +- .../src/test/scala/mock/MockUtils.java | 2 +- .../com/intuit/karate/junit4/JunitHook.java | 6 +-- .../java/com/intuit/karate/junit4/Karate.java | 2 +- .../com/intuit/karate/junit5/FeatureNode.java | 6 +-- .../karate/mock/servlet/MockHttpClient.java | 4 +- .../test/java/demo/MockSpringMvcServlet.java | 2 +- .../java/mock/jersey/MockJerseyServlet.java | 2 +- .../java/com/intuit/karate/robot/Element.java | 2 +- .../com/intuit/karate/robot/Location.java | 2 +- .../java/com/intuit/karate/robot/Region.java | 2 +- .../com/intuit/karate/robot/RobotBase.java | 6 +-- .../com/intuit/karate/robot/RobotFactory.java | 2 +- .../intuit/karate/robot/linux/LinuxRobot.java | 2 +- .../com/intuit/karate/robot/mac/MacRobot.java | 2 +- .../com/intuit/karate/robot/win/WinRobot.java | 2 +- .../java/robot/core/ChromeJavaRunner.java | 4 +- 263 files changed, 264 insertions(+), 343 deletions(-) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/Config.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/FeatureRuntime.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/MockHandler.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/MockServer.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/RuntimeHook.java (98%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/RuntimeHookFactory.java (97%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioBridge.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioCall.java (98%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioEngine.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioFileReader.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioGenerator.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioListener.java (98%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/ScenarioRuntime.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/StepRuntime.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/Tags.java (99%) rename karate-core/src/main/java/com/intuit/karate/{runtime => core}/Variable.java (99%) rename karate-core/src/test/java/com/intuit/karate/{data => }/JsonTest.java (97%) rename karate-core/src/test/java/com/intuit/karate/{data => }/JsonUtilsTest.java (92%) delete mode 100644 karate-core/src/test/java/com/intuit/karate/core/AllKarateFeaturesTest.java rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/Cat.java (95%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/ComplexPojo.java (95%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/DummyClient.java (95%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/FeatureBuilder.java (90%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/FeatureFailRunner.java (91%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/FeatureRuntimeRunner.java (92%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/FeatureRuntimeTest.java (96%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/HttpMockHandlerRunner.java (98%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/HttpMockHandlerTest.java (96%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/KarateHttpMockHandlerTest.java (94%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/KarateMockHandlerTest.java (98%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/MockClient.java (96%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/MockHandlerTest.java (98%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/MockUtils.java (82%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/PerfHookTest.java (85%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/RuntimeUtils.java (93%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/ScenarioEngineTest.java (99%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/ScenarioRuntimeTest.java (97%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/SimplePojo.java (91%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/StaticUtils.java (91%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/TagsTest.java (98%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/VariableTest.java (90%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/abort.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/call-by-tag-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/call-by-tag.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/call-feature-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/call-feature.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/call-js-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/call-js.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/called1.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/called2.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/callonce-bg-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/callonce-bg-outline.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/callonce-bg.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/callonce-global-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/callonce-global.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/configure-in-js.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/copy-called-nested.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/copy-called-overwrite.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/copy-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/copy.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/data.json (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/dummy.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/eval-and-set.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/extract.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/extract.html (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/fail-api.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/fail-js.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/fail1.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/fork-listener.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/fork.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/increment.js (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/js-map-repeat.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/js-read.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/js-read.json (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/karate-config-dev.js (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/karate-config-fn.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/karate-config-utils.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/karate-config.js (68%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/karate-logo.png (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/match-each-magic-variables.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/MockRunner.java (93%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/MockTest.java (93%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/_mock.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/binary.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/cookies.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/delete.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/download.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/form.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/german.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/headers.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/hello-data-driven.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/hello-world.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/karate-config.js (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/malformed.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{data => core/mock}/malformed.txt (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/multi-params.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/no-headers.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/no-match.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/param-commas.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/patch.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/test.pdf.zip (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/url-encoding.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/mock/white-space.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/outline-generator.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/FeatureParserTest.java (90%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-comments.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-def-docstring.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-edge-cases.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-empty-background.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-empty-first-line1.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-empty-first-line2.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-empty-first-line3.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{empty.feature.txt => parser/test-empty.feature.txt} (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-error.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{feature-header-only.feature => parser/test-feature-header-only.feature} (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-hide.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-ignore-feature.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-ignore-scenario.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-outline-dynamic.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-outline-name.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-set-table.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-simple-background.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-simple.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-table-pipe.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => parser}/test-tags-multiline.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/perf-mock.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/perf.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/print.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/FeatureEditTest.java (94%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/FeatureResultTest.java (94%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/FeatureReuseTest.java (84%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/MandatoryTagHook.java (81%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/RunnerTest.java (71%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/ScenarioHookTest.java (77%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/ScenarioResultTest.java (79%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/TagTest.java (93%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/aborted.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/called-arg-loop.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/called-arg-null.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/called-arg-single.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/called-shared.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/called-shared2.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/called_2.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/caller-arg.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/caller-shared.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/caller-with-lambda-arg.feature (97%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/caller.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/caller_2.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/failed.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/multi-scenario-fail.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/multi-scenario.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/no-scenario-name.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/notEqualMatch.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/outline.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/scenario.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/signin.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/simple1.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/simple1.json (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/stackoverflow-error.feature (100%) create mode 100644 karate-core/src/test/java/com/intuit/karate/core/runner/table.feature rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/test-called-embedded-file.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/test-called-embedded.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/test-called.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/test-hook-multiexample.feature (100%) rename karate-core/src/test/java/com/intuit/karate/core/{ => runner}/test-hook-notags.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/test.json (100%) rename karate-core/src/test/java/com/intuit/karate/{ => core/runner}/test.xml (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/set-xml.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/set.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/tags.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/to-bean-called.feature (82%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/to-bean.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/utils-reuse-common.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/utils-reuse.feature (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/uuid.js (100%) rename karate-core/src/test/java/com/intuit/karate/{runtime => core}/websocket.feature (100%) delete mode 100644 karate-core/src/test/java/com/intuit/karate/headers.js rename karate-core/src/test/java/com/intuit/karate/{runtime/mock => }/malformed.txt (100%) delete mode 100644 karate-core/src/test/java/com/intuit/karate/mutation.yaml delete mode 100644 karate-core/src/test/java/com/intuit/karate/runtime/table.feature delete mode 100644 karate-core/src/test/java/com/intuit/karate/test.csv rename karate-core/src/test/java/com/intuit/karate/test/{test.feature => file-utils-test.feature} (100%) delete mode 100644 karate-core/src/test/java/com/intuit/karate/tx-cat-json.feature delete mode 100644 karate-core/src/test/java/com/intuit/karate/tx-kit-json.feature delete mode 100644 karate-core/src/test/java/test.json diff --git a/karate-core/src/main/java/com/intuit/karate/Http.java b/karate-core/src/main/java/com/intuit/karate/Http.java index 5c8a5fdc6..cccaebc5c 100644 --- a/karate-core/src/main/java/com/intuit/karate/Http.java +++ b/karate-core/src/main/java/com/intuit/karate/Http.java @@ -23,8 +23,8 @@ */ package com.intuit.karate; -import com.intuit.karate.runtime.ScenarioEngine; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.ScenarioEngine; +import com.intuit.karate.core.Variable; import com.intuit.karate.http.HttpRequestBuilder; import com.intuit.karate.http.Response; import java.util.Map; diff --git a/karate-core/src/main/java/com/intuit/karate/JsonUtils.java b/karate-core/src/main/java/com/intuit/karate/JsonUtils.java index 0fab52ad8..5a1050f5d 100644 --- a/karate-core/src/main/java/com/intuit/karate/JsonUtils.java +++ b/karate-core/src/main/java/com/intuit/karate/JsonUtils.java @@ -24,7 +24,7 @@ package com.intuit.karate; import com.intuit.karate.FileUtils; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.Variable; import com.jayway.jsonpath.Configuration; import com.jayway.jsonpath.Option; import com.jayway.jsonpath.spi.json.JsonProvider; diff --git a/karate-core/src/main/java/com/intuit/karate/Main.java b/karate-core/src/main/java/com/intuit/karate/Main.java index 749b0f63b..b86db36f1 100644 --- a/karate-core/src/main/java/com/intuit/karate/Main.java +++ b/karate-core/src/main/java/com/intuit/karate/Main.java @@ -27,7 +27,7 @@ import com.intuit.karate.debug.DapServer; import com.intuit.karate.formats.PostmanConverter; import com.intuit.karate.job.JobExecutor; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import com.intuit.karate.http.SslContextFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/karate-core/src/main/java/com/intuit/karate/PerfHook.java b/karate-core/src/main/java/com/intuit/karate/PerfHook.java index c5d62cef9..599788d19 100644 --- a/karate-core/src/main/java/com/intuit/karate/PerfHook.java +++ b/karate-core/src/main/java/com/intuit/karate/PerfHook.java @@ -24,7 +24,7 @@ package com.intuit.karate; import com.intuit.karate.core.PerfEvent; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.ScenarioRuntime; import com.intuit.karate.http.HttpRequest; /** diff --git a/karate-core/src/main/java/com/intuit/karate/Runner.java b/karate-core/src/main/java/com/intuit/karate/Runner.java index 36866076a..dff0abd4b 100644 --- a/karate-core/src/main/java/com/intuit/karate/Runner.java +++ b/karate-core/src/main/java/com/intuit/karate/Runner.java @@ -32,9 +32,9 @@ import com.intuit.karate.core.HtmlSummaryReport; import com.intuit.karate.core.ParallelProcessor; import com.intuit.karate.core.Subscriber; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.RuntimeHookFactory; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.RuntimeHookFactory; import com.intuit.karate.http.HttpClientFactory; import java.io.File; import java.util.*; diff --git a/karate-core/src/main/java/com/intuit/karate/ScenarioActions.java b/karate-core/src/main/java/com/intuit/karate/ScenarioActions.java index fe7c5d3cb..9bb908278 100644 --- a/karate-core/src/main/java/com/intuit/karate/ScenarioActions.java +++ b/karate-core/src/main/java/com/intuit/karate/ScenarioActions.java @@ -26,7 +26,7 @@ import com.intuit.karate.core.AssignType; import com.intuit.karate.core.Action; import com.intuit.karate.match.MatchStep; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import cucumber.api.DataTable; import cucumber.api.java.en.When; import java.util.List; diff --git a/karate-core/src/main/java/com/intuit/karate/SuiteRuntime.java b/karate-core/src/main/java/com/intuit/karate/SuiteRuntime.java index 8fe0ffe87..52356b730 100644 --- a/karate-core/src/main/java/com/intuit/karate/SuiteRuntime.java +++ b/karate-core/src/main/java/com/intuit/karate/SuiteRuntime.java @@ -24,9 +24,9 @@ package com.intuit.karate; import com.intuit.karate.core.Feature; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.RuntimeHookFactory; -import com.intuit.karate.runtime.Tags; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.RuntimeHookFactory; +import com.intuit.karate.core.Tags; import com.intuit.karate.http.HttpClientFactory; import java.io.File; import java.util.Collection; diff --git a/karate-core/src/main/java/com/intuit/karate/cli/CliExecutionHook.java b/karate-core/src/main/java/com/intuit/karate/cli/CliExecutionHook.java index 01507577b..895bcfbe7 100644 --- a/karate-core/src/main/java/com/intuit/karate/cli/CliExecutionHook.java +++ b/karate-core/src/main/java/com/intuit/karate/cli/CliExecutionHook.java @@ -31,9 +31,9 @@ import com.intuit.karate.core.Scenario; import com.intuit.karate.core.Step; import com.intuit.karate.core.StepResult; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.ScenarioRuntime; import com.intuit.karate.SuiteRuntime; import java.nio.file.Path; import java.text.SimpleDateFormat; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/Config.java b/karate-core/src/main/java/com/intuit/karate/core/Config.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/Config.java rename to karate-core/src/main/java/com/intuit/karate/core/Config.java index 41e466f37..531b6dca7 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/Config.java +++ b/karate-core/src/main/java/com/intuit/karate/core/Config.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.FileUtils; import com.intuit.karate.StringUtils; diff --git a/karate-core/src/main/java/com/intuit/karate/core/FeatureResult.java b/karate-core/src/main/java/com/intuit/karate/core/FeatureResult.java index 91e0b3afc..02a396179 100644 --- a/karate-core/src/main/java/com/intuit/karate/core/FeatureResult.java +++ b/karate-core/src/main/java/com/intuit/karate/core/FeatureResult.java @@ -28,7 +28,6 @@ import com.intuit.karate.StringUtils; import com.intuit.karate.JsonUtils; import com.intuit.karate.KarateException; -import com.intuit.karate.runtime.Tags; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/FeatureRuntime.java b/karate-core/src/main/java/com/intuit/karate/core/FeatureRuntime.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/FeatureRuntime.java rename to karate-core/src/main/java/com/intuit/karate/core/FeatureRuntime.java index 734679e05..830ea9cdb 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/FeatureRuntime.java +++ b/karate-core/src/main/java/com/intuit/karate/core/FeatureRuntime.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.PerfHook; import com.intuit.karate.Resource; diff --git a/karate-core/src/main/java/com/intuit/karate/core/HtmlFeatureReport.java b/karate-core/src/main/java/com/intuit/karate/core/HtmlFeatureReport.java index b3ed95b11..e155858a7 100644 --- a/karate-core/src/main/java/com/intuit/karate/core/HtmlFeatureReport.java +++ b/karate-core/src/main/java/com/intuit/karate/core/HtmlFeatureReport.java @@ -24,7 +24,6 @@ package com.intuit.karate.core; import com.intuit.karate.XmlUtils; -import com.intuit.karate.runtime.Tags; import java.io.File; import java.util.Collections; import java.util.List; diff --git a/karate-core/src/main/java/com/intuit/karate/core/HtmlTagsReport.java b/karate-core/src/main/java/com/intuit/karate/core/HtmlTagsReport.java index 72813041c..8b7e2853e 100644 --- a/karate-core/src/main/java/com/intuit/karate/core/HtmlTagsReport.java +++ b/karate-core/src/main/java/com/intuit/karate/core/HtmlTagsReport.java @@ -23,7 +23,6 @@ */ package com.intuit.karate.core; -import com.intuit.karate.runtime.Tags; import java.io.File; import java.util.ArrayList; import java.util.Collection; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/MockHandler.java b/karate-core/src/main/java/com/intuit/karate/core/MockHandler.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/MockHandler.java rename to karate-core/src/main/java/com/intuit/karate/core/MockHandler.java index 961f0c852..747975d55 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/MockHandler.java +++ b/karate-core/src/main/java/com/intuit/karate/core/MockHandler.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.ScenarioActions; import com.intuit.karate.SuiteRuntime; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/MockServer.java b/karate-core/src/main/java/com/intuit/karate/core/MockServer.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/MockServer.java rename to karate-core/src/main/java/com/intuit/karate/core/MockServer.java index 8935445ac..a584c4418 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/MockServer.java +++ b/karate-core/src/main/java/com/intuit/karate/core/MockServer.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.core.Feature; import com.intuit.karate.core.FeatureParser; diff --git a/karate-core/src/main/java/com/intuit/karate/core/PluginFactory.java b/karate-core/src/main/java/com/intuit/karate/core/PluginFactory.java index 187bdc4af..aa2a7044e 100644 --- a/karate-core/src/main/java/com/intuit/karate/core/PluginFactory.java +++ b/karate-core/src/main/java/com/intuit/karate/core/PluginFactory.java @@ -23,7 +23,6 @@ */ package com.intuit.karate.core; -import com.intuit.karate.runtime.ScenarioEngine; import java.util.Map; /** diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/RuntimeHook.java b/karate-core/src/main/java/com/intuit/karate/core/RuntimeHook.java similarity index 98% rename from karate-core/src/main/java/com/intuit/karate/runtime/RuntimeHook.java rename to karate-core/src/main/java/com/intuit/karate/core/RuntimeHook.java index c29856697..f8d4b7e75 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/RuntimeHook.java +++ b/karate-core/src/main/java/com/intuit/karate/core/RuntimeHook.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.SuiteRuntime; import com.intuit.karate.core.Step; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/RuntimeHookFactory.java b/karate-core/src/main/java/com/intuit/karate/core/RuntimeHookFactory.java similarity index 97% rename from karate-core/src/main/java/com/intuit/karate/runtime/RuntimeHookFactory.java rename to karate-core/src/main/java/com/intuit/karate/core/RuntimeHookFactory.java index a83130a03..886e6a4cd 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/RuntimeHookFactory.java +++ b/karate-core/src/main/java/com/intuit/karate/core/RuntimeHookFactory.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; /** * diff --git a/karate-core/src/main/java/com/intuit/karate/core/Scenario.java b/karate-core/src/main/java/com/intuit/karate/core/Scenario.java index ed6ca7cc9..477f27e46 100644 --- a/karate-core/src/main/java/com/intuit/karate/core/Scenario.java +++ b/karate-core/src/main/java/com/intuit/karate/core/Scenario.java @@ -23,7 +23,6 @@ */ package com.intuit.karate.core; -import com.intuit.karate.runtime.Tags; import java.io.File; import java.net.URI; import java.util.ArrayList; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioBridge.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioBridge.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioBridge.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioBridge.java index cc0c69715..16589077d 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioBridge.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioBridge.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.FileUtils; import com.intuit.karate.PerfContext; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioCall.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioCall.java similarity index 98% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioCall.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioCall.java index dfb761dc5..1d7f215cd 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioCall.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioCall.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.core.Feature; import java.util.Map; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioEngine.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioEngine.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java index 0e89b1b44..cb7886fbe 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioEngine.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.core.AssignType; import com.intuit.karate.FileUtils; @@ -977,7 +977,7 @@ public void stop(StepResult lastStepResult) { //========================================================================== // - protected void init() { // not in constructor because it has to be on Runnable.run() thread + public void init() { // not in constructor because it has to be on Runnable.run() thread JS = JsEngine.local(); logger.trace("js context: {}", JS); attachVariables(); @@ -998,10 +998,6 @@ protected void init() { // not in constructor because it has to be on Runnable.r } } - protected boolean isInited() { - return JS != null; - } - private void attachVariables() { vars.forEach((k, v) -> { switch (v.type) { diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioFileReader.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioFileReader.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioFileReader.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioFileReader.java index af10a659f..2d9fd8e42 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioFileReader.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioFileReader.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.FileUtils; import com.intuit.karate.Resource; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioGenerator.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioGenerator.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioGenerator.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioGenerator.java index e102fc00f..8b3f147bf 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioGenerator.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioGenerator.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.core.FeatureSection; import com.intuit.karate.core.Scenario; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioListener.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioListener.java similarity index 98% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioListener.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioListener.java index b7856c900..52a336ede 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioListener.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioListener.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.graal.JsValue; import java.util.function.Consumer; diff --git a/karate-core/src/main/java/com/intuit/karate/core/ScenarioResult.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioResult.java index c63371838..19efe1877 100644 --- a/karate-core/src/main/java/com/intuit/karate/core/ScenarioResult.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioResult.java @@ -24,7 +24,6 @@ package com.intuit.karate.core; import com.intuit.karate.StringUtils; -import com.intuit.karate.runtime.Tags; import java.util.ArrayList; import java.util.HashMap; import java.util.List; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioRuntime.java b/karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/ScenarioRuntime.java rename to karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java index 1ae5fe86b..3e18c6b8e 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/ScenarioRuntime.java +++ b/karate-core/src/main/java/com/intuit/karate/core/ScenarioRuntime.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.ScenarioActions; import com.intuit.karate.FileUtils; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/StepRuntime.java b/karate-core/src/main/java/com/intuit/karate/core/StepRuntime.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/StepRuntime.java rename to karate-core/src/main/java/com/intuit/karate/core/StepRuntime.java index 6febeb150..156940328 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/StepRuntime.java +++ b/karate-core/src/main/java/com/intuit/karate/core/StepRuntime.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.ScenarioActions; import com.intuit.karate.Actions; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/Tags.java b/karate-core/src/main/java/com/intuit/karate/core/Tags.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/Tags.java rename to karate-core/src/main/java/com/intuit/karate/core/Tags.java index e9c4baf08..09dfaa1b1 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/Tags.java +++ b/karate-core/src/main/java/com/intuit/karate/core/Tags.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.StringUtils; import com.intuit.karate.core.Tag; diff --git a/karate-core/src/main/java/com/intuit/karate/runtime/Variable.java b/karate-core/src/main/java/com/intuit/karate/core/Variable.java similarity index 99% rename from karate-core/src/main/java/com/intuit/karate/runtime/Variable.java rename to karate-core/src/main/java/com/intuit/karate/core/Variable.java index 32e60c635..1da562b32 100644 --- a/karate-core/src/main/java/com/intuit/karate/runtime/Variable.java +++ b/karate-core/src/main/java/com/intuit/karate/core/Variable.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.FileUtils; import com.intuit.karate.XmlUtils; diff --git a/karate-core/src/main/java/com/intuit/karate/debug/DapServerHandler.java b/karate-core/src/main/java/com/intuit/karate/debug/DapServerHandler.java index 492e4b4dd..84dc10b74 100644 --- a/karate-core/src/main/java/com/intuit/karate/debug/DapServerHandler.java +++ b/karate-core/src/main/java/com/intuit/karate/debug/DapServerHandler.java @@ -28,10 +28,10 @@ import com.intuit.karate.StringUtils; import com.intuit.karate.core.Result; import com.intuit.karate.core.Step; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.RuntimeHookFactory; -import com.intuit.karate.runtime.ScenarioRuntime; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.RuntimeHookFactory; +import com.intuit.karate.core.ScenarioRuntime; +import com.intuit.karate.core.Variable; import io.netty.buffer.Unpooled; import io.netty.channel.Channel; import io.netty.channel.ChannelHandlerContext; diff --git a/karate-core/src/main/java/com/intuit/karate/debug/DebugThread.java b/karate-core/src/main/java/com/intuit/karate/debug/DebugThread.java index a9d8a7fc7..773cce3db 100644 --- a/karate-core/src/main/java/com/intuit/karate/debug/DebugThread.java +++ b/karate-core/src/main/java/com/intuit/karate/debug/DebugThread.java @@ -27,9 +27,9 @@ import com.intuit.karate.SuiteRuntime; import com.intuit.karate.core.Step; import com.intuit.karate.core.StepResult; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.ScenarioRuntime; import java.util.HashMap; import java.util.Map; import java.util.Stack; diff --git a/karate-core/src/main/java/com/intuit/karate/debug/StackFrame.java b/karate-core/src/main/java/com/intuit/karate/debug/StackFrame.java index a959ab07c..02dc3a2c7 100644 --- a/karate-core/src/main/java/com/intuit/karate/debug/StackFrame.java +++ b/karate-core/src/main/java/com/intuit/karate/debug/StackFrame.java @@ -25,7 +25,7 @@ import com.intuit.karate.core.Scenario; import com.intuit.karate.core.Step; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.ScenarioRuntime; import java.nio.file.Path; import java.util.HashMap; import java.util.Map; diff --git a/karate-core/src/main/java/com/intuit/karate/driver/DevToolsDriver.java b/karate-core/src/main/java/com/intuit/karate/driver/DevToolsDriver.java index ec5973517..e9c422c3a 100644 --- a/karate-core/src/main/java/com/intuit/karate/driver/DevToolsDriver.java +++ b/karate-core/src/main/java/com/intuit/karate/driver/DevToolsDriver.java @@ -31,9 +31,9 @@ import com.intuit.karate.JsonUtils; import com.intuit.karate.http.WebSocketClient; import com.intuit.karate.http.WebSocketOptions; -import com.intuit.karate.runtime.MockHandler; -import com.intuit.karate.runtime.ScenarioEngine; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.MockHandler; +import com.intuit.karate.core.ScenarioEngine; +import com.intuit.karate.core.Variable; import com.intuit.karate.http.HttpRequest; import com.intuit.karate.http.Response; import com.intuit.karate.shell.Command; diff --git a/karate-core/src/main/java/com/intuit/karate/driver/DevToolsMessage.java b/karate-core/src/main/java/com/intuit/karate/driver/DevToolsMessage.java index b6a8ca41f..4a468a6f2 100644 --- a/karate-core/src/main/java/com/intuit/karate/driver/DevToolsMessage.java +++ b/karate-core/src/main/java/com/intuit/karate/driver/DevToolsMessage.java @@ -24,7 +24,7 @@ package com.intuit.karate.driver; import com.intuit.karate.Json; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.Variable; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.List; diff --git a/karate-core/src/main/java/com/intuit/karate/driver/Driver.java b/karate-core/src/main/java/com/intuit/karate/driver/Driver.java index 9ec544938..1347e0834 100644 --- a/karate-core/src/main/java/com/intuit/karate/driver/Driver.java +++ b/karate-core/src/main/java/com/intuit/karate/driver/Driver.java @@ -25,7 +25,7 @@ import com.intuit.karate.core.AutoDef; import com.intuit.karate.core.Plugin; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import java.util.ArrayList; import java.util.Collections; diff --git a/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java b/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java index 63ddffc59..b52aee0a7 100644 --- a/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java +++ b/karate-core/src/main/java/com/intuit/karate/driver/DriverOptions.java @@ -40,8 +40,8 @@ import com.intuit.karate.driver.safari.SafariWebDriver; import com.intuit.karate.driver.microsoft.WinAppDriver; import com.intuit.karate.driver.playwright.PlaywrightDriver; -import com.intuit.karate.runtime.Config; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.Config; +import com.intuit.karate.core.ScenarioEngine; import com.intuit.karate.shell.Command; import java.io.File; diff --git a/karate-core/src/main/java/com/intuit/karate/driver/WebDriver.java b/karate-core/src/main/java/com/intuit/karate/driver/WebDriver.java index 424a5337b..2f8b055df 100644 --- a/karate-core/src/main/java/com/intuit/karate/driver/WebDriver.java +++ b/karate-core/src/main/java/com/intuit/karate/driver/WebDriver.java @@ -26,7 +26,7 @@ import com.intuit.karate.Http; import com.intuit.karate.Logger; import com.intuit.karate.Json; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.Variable; import com.intuit.karate.http.Response; import com.intuit.karate.shell.Command; import java.util.Base64; diff --git a/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java b/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java index df11c978b..b8de91824 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java +++ b/karate-core/src/main/java/com/intuit/karate/http/ApacheHttpClient.java @@ -25,8 +25,8 @@ import com.intuit.karate.FileUtils; import com.intuit.karate.Logger; -import com.intuit.karate.runtime.Config; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.Config; +import com.intuit.karate.core.ScenarioEngine; import java.io.IOException; import java.io.InputStream; import java.net.InetAddress; diff --git a/karate-core/src/main/java/com/intuit/karate/http/ArmeriaHttpClient.java b/karate-core/src/main/java/com/intuit/karate/http/ArmeriaHttpClient.java index 2cd0696e0..cb1d10b5c 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/ArmeriaHttpClient.java +++ b/karate-core/src/main/java/com/intuit/karate/http/ArmeriaHttpClient.java @@ -25,7 +25,7 @@ import com.intuit.karate.Logger; import com.intuit.karate.StringUtils; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import com.linecorp.armeria.client.ClientRequestContext; import com.linecorp.armeria.client.DecoratingHttpClientFunction; import com.linecorp.armeria.client.WebClient; diff --git a/karate-core/src/main/java/com/intuit/karate/http/HttpClient.java b/karate-core/src/main/java/com/intuit/karate/http/HttpClient.java index 7c5b919eb..b0a4bf7dd 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/HttpClient.java +++ b/karate-core/src/main/java/com/intuit/karate/http/HttpClient.java @@ -24,7 +24,7 @@ package com.intuit.karate.http; import com.intuit.karate.Logger; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; /** * diff --git a/karate-core/src/main/java/com/intuit/karate/http/HttpClientFactory.java b/karate-core/src/main/java/com/intuit/karate/http/HttpClientFactory.java index acaae7dc1..c22bc2c5a 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/HttpClientFactory.java +++ b/karate-core/src/main/java/com/intuit/karate/http/HttpClientFactory.java @@ -23,7 +23,7 @@ */ package com.intuit.karate.http; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; /** * diff --git a/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java b/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java index 72bc33add..510ecc567 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java +++ b/karate-core/src/main/java/com/intuit/karate/http/HttpLogger.java @@ -26,8 +26,8 @@ import com.intuit.karate.Logger; import com.intuit.karate.graal.JsValue; import com.intuit.karate.http.HttpLogModifier; -import com.intuit.karate.runtime.Config; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.Config; +import com.intuit.karate.core.Variable; import java.util.Iterator; import java.util.List; import java.util.Map; diff --git a/karate-core/src/main/java/com/intuit/karate/http/ServerConfig.java b/karate-core/src/main/java/com/intuit/karate/http/ServerConfig.java index 945175755..7194c085b 100644 --- a/karate-core/src/main/java/com/intuit/karate/http/ServerConfig.java +++ b/karate-core/src/main/java/com/intuit/karate/http/ServerConfig.java @@ -24,7 +24,7 @@ package com.intuit.karate.http; import com.intuit.karate.Logger; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import com.intuit.karate.http.ResourceResolver.*; import com.linecorp.armeria.common.RequestContext; import java.util.HashMap; diff --git a/karate-core/src/main/java/com/intuit/karate/job/JobExecutor.java b/karate-core/src/main/java/com/intuit/karate/job/JobExecutor.java index d672c19de..9647ebf7d 100644 --- a/karate-core/src/main/java/com/intuit/karate/job/JobExecutor.java +++ b/karate-core/src/main/java/com/intuit/karate/job/JobExecutor.java @@ -28,7 +28,7 @@ import com.intuit.karate.LogAppender; import com.intuit.karate.Logger; import com.intuit.karate.StringUtils; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.Variable; import com.intuit.karate.http.Response; import com.intuit.karate.shell.Command; import com.intuit.karate.shell.FileLogAppender; diff --git a/karate-core/src/test/java/com/intuit/karate/FileUtilsTest.java b/karate-core/src/test/java/com/intuit/karate/FileUtilsTest.java index 543619ea0..494bd7b4a 100755 --- a/karate-core/src/test/java/com/intuit/karate/FileUtilsTest.java +++ b/karate-core/src/test/java/com/intuit/karate/FileUtilsTest.java @@ -8,7 +8,6 @@ import java.nio.file.Path; import java.util.Collections; import java.util.List; -import java.util.Map; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; @@ -143,7 +142,7 @@ void testRenameZeroLengthFile() { @Test void testScanFile() { - String relativePath = "classpath:com/intuit/karate/test/test.feature"; + String relativePath = "classpath:com/intuit/karate/test/file-utils-test.feature"; ClassLoader cl = getClass().getClassLoader(); List files = FileUtils.scanForFeatureFilesOnClassPath(cl); boolean found = false; @@ -161,7 +160,7 @@ void testScanFile() { @Test void testScanFileWithLineNumber() { - String relativePath = "classpath:com/intuit/karate/test/test.feature:3"; + String relativePath = "classpath:com/intuit/karate/test/file-utils-test.feature:3"; List files = FileUtils.scanForFeatureFiles(Collections.singletonList(relativePath), getClass().getClassLoader()); assertEquals(1, files.size()); assertEquals(3, files.get(0).getLine()); @@ -189,7 +188,7 @@ void testGetAllClasspaths() { @Test void testGetClasspathAbsolute() { - File file = new File("src/test/java/com/intuit/karate/multi-scenario.feature").getAbsoluteFile(); + File file = new File("src/test/java/com/intuit/karate/core/runner/multi-scenario.feature").getAbsoluteFile(); String scan = "classpath:" + file.getPath(); List resources = FileUtils.scanForFeatureFiles(Collections.singletonList(scan), ClassLoader.getSystemClassLoader()); assertEquals(1, resources.size()); diff --git a/karate-core/src/test/java/com/intuit/karate/data/JsonTest.java b/karate-core/src/test/java/com/intuit/karate/JsonTest.java similarity index 97% rename from karate-core/src/test/java/com/intuit/karate/data/JsonTest.java rename to karate-core/src/test/java/com/intuit/karate/JsonTest.java index 6afc28530..250a76ce3 100644 --- a/karate-core/src/test/java/com/intuit/karate/data/JsonTest.java +++ b/karate-core/src/test/java/com/intuit/karate/JsonTest.java @@ -1,7 +1,5 @@ -package com.intuit.karate.data; +package com.intuit.karate; -import com.intuit.karate.Json; -import com.intuit.karate.StringUtils; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; import static org.junit.jupiter.api.Assertions.*; diff --git a/karate-core/src/test/java/com/intuit/karate/data/JsonUtilsTest.java b/karate-core/src/test/java/com/intuit/karate/JsonUtilsTest.java similarity index 92% rename from karate-core/src/test/java/com/intuit/karate/data/JsonUtilsTest.java rename to karate-core/src/test/java/com/intuit/karate/JsonUtilsTest.java index 621fb898e..1a4ae3775 100644 --- a/karate-core/src/test/java/com/intuit/karate/data/JsonUtilsTest.java +++ b/karate-core/src/test/java/com/intuit/karate/JsonUtilsTest.java @@ -1,12 +1,8 @@ -package com.intuit.karate.data; +package com.intuit.karate; -import com.intuit.karate.Json; -import com.intuit.karate.JsonUtils; -import com.intuit.karate.FileUtils; -import com.intuit.karate.XmlUtils; import com.intuit.karate.match.Match; -import com.intuit.karate.runtime.ComplexPojo; -import com.intuit.karate.runtime.SimplePojo; +import com.intuit.karate.core.ComplexPojo; +import com.intuit.karate.core.SimplePojo; import java.util.Arrays; import java.util.HashMap; import java.util.Map; diff --git a/karate-core/src/test/java/com/intuit/karate/core/AllKarateFeaturesTest.java b/karate-core/src/test/java/com/intuit/karate/core/AllKarateFeaturesTest.java deleted file mode 100644 index 6d0646b55..000000000 --- a/karate-core/src/test/java/com/intuit/karate/core/AllKarateFeaturesTest.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.intuit.karate.core; - -import com.intuit.karate.Resource; -import com.intuit.karate.FileUtils; -import java.util.List; -import static org.junit.jupiter.api.Assertions.*; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -/** - * - * @author pthomas3 - */ -class AllKarateFeaturesTest { - - static final Logger logger = LoggerFactory.getLogger(AllKarateFeaturesTest.class); - - @Test - void testParsingAllFeaturesInKarate() { - List files = FileUtils.scanForFeatureFiles(false, "..", null); - logger.debug("found files count: {}", files.size()); - assertTrue(files.size() > 200); - for (Resource file : files) { - logger.trace("parsing: {}", file.getRelativePath()); - FeatureParser.parse(file); - } - } - -} diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/Cat.java b/karate-core/src/test/java/com/intuit/karate/core/Cat.java similarity index 95% rename from karate-core/src/test/java/com/intuit/karate/runtime/Cat.java rename to karate-core/src/test/java/com/intuit/karate/core/Cat.java index b71ea8781..fb7a2e3ec 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/Cat.java +++ b/karate-core/src/test/java/com/intuit/karate/core/Cat.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import java.util.ArrayList; import java.util.List; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/ComplexPojo.java b/karate-core/src/test/java/com/intuit/karate/core/ComplexPojo.java similarity index 95% rename from karate-core/src/test/java/com/intuit/karate/runtime/ComplexPojo.java rename to karate-core/src/test/java/com/intuit/karate/core/ComplexPojo.java index 430cb3ec7..98eb8d735 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/ComplexPojo.java +++ b/karate-core/src/test/java/com/intuit/karate/core/ComplexPojo.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import java.util.List; import java.util.Map; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/DummyClient.java b/karate-core/src/test/java/com/intuit/karate/core/DummyClient.java similarity index 95% rename from karate-core/src/test/java/com/intuit/karate/runtime/DummyClient.java rename to karate-core/src/test/java/com/intuit/karate/core/DummyClient.java index 6701dab72..3ab2ce5cf 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/DummyClient.java +++ b/karate-core/src/test/java/com/intuit/karate/core/DummyClient.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.Logger; import com.intuit.karate.http.HttpClient; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureBuilder.java b/karate-core/src/test/java/com/intuit/karate/core/FeatureBuilder.java similarity index 90% rename from karate-core/src/test/java/com/intuit/karate/runtime/FeatureBuilder.java rename to karate-core/src/test/java/com/intuit/karate/core/FeatureBuilder.java index 1d54fe9a9..49610afce 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureBuilder.java +++ b/karate-core/src/test/java/com/intuit/karate/core/FeatureBuilder.java @@ -1,9 +1,7 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.FileUtils; import com.intuit.karate.Resource; -import com.intuit.karate.core.Feature; -import com.intuit.karate.core.FeatureParser; import java.io.InputStream; import java.nio.file.Path; import java.util.ArrayList; @@ -48,7 +46,7 @@ public Feature build() { String text = StringUtils.join(list, '\n'); InputStream is = FileUtils.toInputStream(text); ClassLoader cl = Thread.currentThread().getContextClassLoader(); - Path path = FileUtils.fromRelativeClassPath("classpath:com/intuit/karate/runtime/dummy.feature", cl); + Path path = FileUtils.fromRelativeClassPath("classpath:com/intuit/karate/core/dummy.feature", cl); Resource resource = new Resource(path, cl) { @Override public InputStream getStream() { diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureFailRunner.java b/karate-core/src/test/java/com/intuit/karate/core/FeatureFailRunner.java similarity index 91% rename from karate-core/src/test/java/com/intuit/karate/runtime/FeatureFailRunner.java rename to karate-core/src/test/java/com/intuit/karate/core/FeatureFailRunner.java index 4a3e00539..d68a0f1e6 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureFailRunner.java +++ b/karate-core/src/test/java/com/intuit/karate/core/FeatureFailRunner.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import static org.junit.jupiter.api.Assertions.assertTrue; import org.junit.jupiter.api.Test; @@ -16,7 +16,7 @@ class FeatureFailRunner { FeatureRuntime fr; private FeatureRuntime run(String name) { - fr = RuntimeUtils.runFeature("classpath:com/intuit/karate/runtime/" + name); + fr = RuntimeUtils.runFeature("classpath:com/intuit/karate/core/" + name); return fr; } diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureRuntimeRunner.java b/karate-core/src/test/java/com/intuit/karate/core/FeatureRuntimeRunner.java similarity index 92% rename from karate-core/src/test/java/com/intuit/karate/runtime/FeatureRuntimeRunner.java rename to karate-core/src/test/java/com/intuit/karate/core/FeatureRuntimeRunner.java index 3005fb3b9..f2ebaa433 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureRuntimeRunner.java +++ b/karate-core/src/test/java/com/intuit/karate/core/FeatureRuntimeRunner.java @@ -1,6 +1,5 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; -import com.intuit.karate.core.HtmlFeatureReport; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; import java.io.File; @@ -24,7 +23,7 @@ private FeatureRuntime run(String name) { } private FeatureRuntime run(String name, String configDir) { - fr = RuntimeUtils.runFeature("classpath:com/intuit/karate/runtime/" + name, configDir); + fr = RuntimeUtils.runFeature("classpath:com/intuit/karate/core/" + name, configDir); return fr; } diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureRuntimeTest.java b/karate-core/src/test/java/com/intuit/karate/core/FeatureRuntimeTest.java similarity index 96% rename from karate-core/src/test/java/com/intuit/karate/runtime/FeatureRuntimeTest.java rename to karate-core/src/test/java/com/intuit/karate/core/FeatureRuntimeTest.java index 151c3f484..ac18e7fec 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/FeatureRuntimeTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/FeatureRuntimeTest.java @@ -1,6 +1,5 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; -import com.intuit.karate.core.HtmlFeatureReport; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; import java.io.File; @@ -31,7 +30,7 @@ private FeatureRuntime run(String name) { } private FeatureRuntime run(String name, String configDir) { - fr = RuntimeUtils.runFeature("classpath:com/intuit/karate/runtime/" + name, configDir); + fr = RuntimeUtils.runFeature("classpath:com/intuit/karate/core/" + name, configDir); if (fail) { assertTrue(fr.result.isFailed()); } else { @@ -74,7 +73,7 @@ void testCallOnce() { @Test void testCallOnceWithUtilsPresentInKarateConfig() { - run("callonce-bg.feature", "classpath:com/intuit/karate/runtime"); + run("callonce-bg.feature", "classpath:com/intuit/karate/core"); } @Test @@ -109,7 +108,7 @@ void testCallFeatureFromJs() { @Test void testCallJsFromFeatureUtilsDefinedInKarateConfig() { - run("karate-config-fn.feature", "classpath:com/intuit/karate/runtime"); + run("karate-config-fn.feature", "classpath:com/intuit/karate/core/"); matchContains(fr.getResult(), "{ helloVar: 'hello world' }"); } diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/HttpMockHandlerRunner.java b/karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerRunner.java similarity index 98% rename from karate-core/src/test/java/com/intuit/karate/runtime/HttpMockHandlerRunner.java rename to karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerRunner.java index 4992662bf..f001d62be 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/HttpMockHandlerRunner.java +++ b/karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerRunner.java @@ -21,7 +21,7 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.http.ArmeriaHttpClient; import com.intuit.karate.match.Match; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/HttpMockHandlerTest.java b/karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerTest.java similarity index 96% rename from karate-core/src/test/java/com/intuit/karate/runtime/HttpMockHandlerTest.java rename to karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerTest.java index caaaae715..ffd1dbf76 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/HttpMockHandlerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/HttpMockHandlerTest.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.http.ArmeriaHttpClient; import com.intuit.karate.match.Match; @@ -74,7 +74,7 @@ void testUrlWithSpecialCharacters() { void testGraalJavaClassLoading() { background().scenario( "pathMatches('/hello')", - "def Utils = Java.type('com.intuit.karate.runtime.MockUtils')", + "def Utils = Java.type('com.intuit.karate.core.MockUtils')", "def response = Utils.testBytes" ); response = handle().path("/hello").invoke("get"); diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/KarateHttpMockHandlerTest.java b/karate-core/src/test/java/com/intuit/karate/core/KarateHttpMockHandlerTest.java similarity index 94% rename from karate-core/src/test/java/com/intuit/karate/runtime/KarateHttpMockHandlerTest.java rename to karate-core/src/test/java/com/intuit/karate/core/KarateHttpMockHandlerTest.java index 632e2484a..e1473bdbb 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/KarateHttpMockHandlerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/KarateHttpMockHandlerTest.java @@ -1,8 +1,8 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; -import static com.intuit.karate.runtime.RuntimeUtils.runScenario; +import static com.intuit.karate.core.RuntimeUtils.runScenario; import com.intuit.karate.http.HttpServer; import org.junit.jupiter.api.AfterEach; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/KarateMockHandlerTest.java b/karate-core/src/test/java/com/intuit/karate/core/KarateMockHandlerTest.java similarity index 98% rename from karate-core/src/test/java/com/intuit/karate/runtime/KarateMockHandlerTest.java rename to karate-core/src/test/java/com/intuit/karate/core/KarateMockHandlerTest.java index cef0e8215..f2401372f 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/KarateMockHandlerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/KarateMockHandlerTest.java @@ -1,8 +1,8 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; -import static com.intuit.karate.runtime.RuntimeUtils.runScenario; +import static com.intuit.karate.core.RuntimeUtils.runScenario; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; import org.slf4j.Logger; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/MockClient.java b/karate-core/src/test/java/com/intuit/karate/core/MockClient.java similarity index 96% rename from karate-core/src/test/java/com/intuit/karate/runtime/MockClient.java rename to karate-core/src/test/java/com/intuit/karate/core/MockClient.java index 3f3ac42b7..42df8c4f5 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/MockClient.java +++ b/karate-core/src/test/java/com/intuit/karate/core/MockClient.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.Logger; import com.intuit.karate.http.HttpClient; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/MockHandlerTest.java b/karate-core/src/test/java/com/intuit/karate/core/MockHandlerTest.java similarity index 98% rename from karate-core/src/test/java/com/intuit/karate/runtime/MockHandlerTest.java rename to karate-core/src/test/java/com/intuit/karate/core/MockHandlerTest.java index 4174075c3..5d417308b 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/MockHandlerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/MockHandlerTest.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.http.HttpClient; import com.intuit.karate.http.HttpRequestBuilder; @@ -259,7 +259,7 @@ void testUrlWithSpecialCharacters() { void testGraalJavaClassLoading() { background().scenario( "pathMatches('/hello')", - "def Utils = Java.type('com.intuit.karate.runtime.MockUtils')", + "def Utils = Java.type('com.intuit.karate.core.MockUtils')", "def response = Utils.testBytes" ); request.path("/hello"); diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/MockUtils.java b/karate-core/src/test/java/com/intuit/karate/core/MockUtils.java similarity index 82% rename from karate-core/src/test/java/com/intuit/karate/runtime/MockUtils.java rename to karate-core/src/test/java/com/intuit/karate/core/MockUtils.java index 22ad95718..4b66f8d33 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/MockUtils.java +++ b/karate-core/src/test/java/com/intuit/karate/core/MockUtils.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; /** * diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/PerfHookTest.java b/karate-core/src/test/java/com/intuit/karate/core/PerfHookTest.java similarity index 85% rename from karate-core/src/test/java/com/intuit/karate/runtime/PerfHookTest.java rename to karate-core/src/test/java/com/intuit/karate/core/PerfHookTest.java index 652875e62..908770b67 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/PerfHookTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/PerfHookTest.java @@ -1,8 +1,7 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.PerfHook; import com.intuit.karate.Runner; -import com.intuit.karate.core.PerfEvent; import com.intuit.karate.http.HttpRequest; import java.util.Collections; import java.util.Map; @@ -26,7 +25,7 @@ class PerfHookTest { @BeforeAll static void beforeAll() { server = MockServer - .feature("classpath:com/intuit/karate/runtime/perf-mock.feature") + .feature("classpath:com/intuit/karate/core/perf-mock.feature") .http(0).build(); System.setProperty("karate.server.port", server.getPort() + ""); } @@ -39,7 +38,7 @@ static void afterAll() { @Test void testPerfHook() { Map arg = Collections.singletonMap("foo", "bar"); - Runner.callAsync("classpath:com/intuit/karate/runtime/perf.feature", Collections.EMPTY_LIST, arg, perfHook); + Runner.callAsync("classpath:com/intuit/karate/core/perf.feature", Collections.EMPTY_LIST, arg, perfHook); assertEquals(eventName, "http://localhost:" + server.getPort() + "/hello?foo=bar"); } diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/RuntimeUtils.java b/karate-core/src/test/java/com/intuit/karate/core/RuntimeUtils.java similarity index 93% rename from karate-core/src/test/java/com/intuit/karate/runtime/RuntimeUtils.java rename to karate-core/src/test/java/com/intuit/karate/core/RuntimeUtils.java index 813fb4fa2..e6dfdd694 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/RuntimeUtils.java +++ b/karate-core/src/test/java/com/intuit/karate/core/RuntimeUtils.java @@ -1,12 +1,10 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.SuiteRuntime; import com.intuit.karate.FileUtils; import com.intuit.karate.Logger; import com.intuit.karate.Resource; import com.intuit.karate.Runner; -import com.intuit.karate.core.Feature; -import com.intuit.karate.core.FeatureParser; import com.intuit.karate.http.HttpClientFactory; import java.io.InputStream; import java.nio.file.Path; @@ -30,7 +28,7 @@ public static Feature toFeature(String... lines) { } InputStream is = FileUtils.toInputStream(sb.toString()); ClassLoader cl = Thread.currentThread().getContextClassLoader(); - Path path = FileUtils.fromRelativeClassPath("classpath:com/intuit/karate/runtime/dummy.feature", cl); + Path path = FileUtils.fromRelativeClassPath("classpath:com/intuit/karate/core/dummy.feature", cl); Resource resource = new Resource(path, cl) { @Override public InputStream getStream() { diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/ScenarioEngineTest.java b/karate-core/src/test/java/com/intuit/karate/core/ScenarioEngineTest.java similarity index 99% rename from karate-core/src/test/java/com/intuit/karate/runtime/ScenarioEngineTest.java rename to karate-core/src/test/java/com/intuit/karate/core/ScenarioEngineTest.java index aea76ab1a..f496171d7 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/ScenarioEngineTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/ScenarioEngineTest.java @@ -1,6 +1,5 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; -import com.intuit.karate.core.AssignType; import com.intuit.karate.StringUtils; import com.intuit.karate.Json; import com.intuit.karate.match.Match; @@ -338,7 +337,7 @@ void testTypeConversion() { engine.assign(AssignType.STRING, "myStr", "", false); matchEquals("myStr", "''"); // pojo to json - assign("myPojo", "new com.intuit.karate.runtime.SimplePojo()"); + assign("myPojo", "new com.intuit.karate.core.SimplePojo()"); value = engine.vars.get("myPojo"); assertTrue(value.isOther()); engine.assign(AssignType.JSON, "myJson", "myPojo", false); diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/ScenarioRuntimeTest.java b/karate-core/src/test/java/com/intuit/karate/core/ScenarioRuntimeTest.java similarity index 97% rename from karate-core/src/test/java/com/intuit/karate/runtime/ScenarioRuntimeTest.java rename to karate-core/src/test/java/com/intuit/karate/core/ScenarioRuntimeTest.java index 14e12c206..010fcc969 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/ScenarioRuntimeTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/ScenarioRuntimeTest.java @@ -1,11 +1,9 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.FileUtils; -import com.intuit.karate.core.Embed; -import com.intuit.karate.core.StepResult; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; -import static com.intuit.karate.runtime.RuntimeUtils.*; +import static com.intuit.karate.core.RuntimeUtils.*; import java.io.File; import java.util.List; import static org.junit.jupiter.api.Assertions.*; @@ -73,7 +71,7 @@ void testConfigAndEnv() { System.setProperty("karate.config.dir", ""); run("def foo = configSource"); matchVar("foo", "normal"); - System.setProperty("karate.config.dir", "src/test/java/com/intuit/karate/runtime"); + System.setProperty("karate.config.dir", "src/test/java/com/intuit/karate/core"); run( "def foo = configSource", "def bar = karate.env" @@ -94,7 +92,7 @@ void testConfigAndEnv() { @Test void testFunctionsFromGlobalConfig() { - System.setProperty("karate.config.dir", "src/test/java/com/intuit/karate/runtime"); + System.setProperty("karate.config.dir", "src/test/java/com/intuit/karate/core"); run( "def foo = configUtilsJs.someText", "def bar = configUtilsJs.someFun()", @@ -406,7 +404,7 @@ void testXmlPath() { void testToBean() { run( "def foo = { foo: 'hello', bar: 5 }", - "def res1 = karate.toBean(foo, 'com.intuit.karate.runtime.SimplePojo')" + "def res1 = karate.toBean(foo, 'com.intuit.karate.core.SimplePojo')" ); SimplePojo sp = (SimplePojo) get("res1"); assertEquals(sp.getFoo(), "hello"); @@ -416,7 +414,7 @@ void testToBean() { @Test void testToJson() { run( - "def SP = Java.type('com.intuit.karate.runtime.SimplePojo')", + "def SP = Java.type('com.intuit.karate.core.SimplePojo')", "def pojo = new SP()", "def res1 = karate.toJson(pojo)", "def res2 = karate.toJson(pojo, true)" @@ -428,7 +426,7 @@ void testToJson() { @Test void testToBeanAdvanced() { run( - "def pojoType = 'com.intuit.karate.runtime.SimplePojo'", + "def pojoType = 'com.intuit.karate.core.SimplePojo'", "def Pojo = Java.type(pojoType)", "def toPojo = function(x){ return karate.toBean(x, pojoType) }", "def toJson = function(x){ return karate.toJson(x, true) }", @@ -513,7 +511,7 @@ void testWrite() { @Test void testJavaClassAsVariable() { run( - "def Utils = Java.type('com.intuit.karate.runtime.MockUtils')", + "def Utils = Java.type('com.intuit.karate.core.MockUtils')", "def res = Utils.testBytes" ); assertEquals(get("res"), MockUtils.testBytes); @@ -623,7 +621,7 @@ void testMatchSchemaMagicVariables() { @Test void testJavaInteropStatic() { run( - "def Utils = Java.type('com.intuit.karate.runtime.StaticUtils')", + "def Utils = Java.type('com.intuit.karate.core.StaticUtils')", "def array = ['a', 'b', 'c']", "def res = Utils.concat(array)" ); diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/SimplePojo.java b/karate-core/src/test/java/com/intuit/karate/core/SimplePojo.java similarity index 91% rename from karate-core/src/test/java/com/intuit/karate/runtime/SimplePojo.java rename to karate-core/src/test/java/com/intuit/karate/core/SimplePojo.java index 7dcb14ff9..2329df78e 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/SimplePojo.java +++ b/karate-core/src/test/java/com/intuit/karate/core/SimplePojo.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; /** * diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/StaticUtils.java b/karate-core/src/test/java/com/intuit/karate/core/StaticUtils.java similarity index 91% rename from karate-core/src/test/java/com/intuit/karate/runtime/StaticUtils.java rename to karate-core/src/test/java/com/intuit/karate/core/StaticUtils.java index 9d63ae916..278dfd704 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/StaticUtils.java +++ b/karate-core/src/test/java/com/intuit/karate/core/StaticUtils.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import java.util.List; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/TagsTest.java b/karate-core/src/test/java/com/intuit/karate/core/TagsTest.java similarity index 98% rename from karate-core/src/test/java/com/intuit/karate/runtime/TagsTest.java rename to karate-core/src/test/java/com/intuit/karate/core/TagsTest.java index 1ee04cb11..cc8a7d4e4 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/TagsTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/TagsTest.java @@ -1,6 +1,5 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; -import com.intuit.karate.core.Tag; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; import java.util.ArrayList; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/VariableTest.java b/karate-core/src/test/java/com/intuit/karate/core/VariableTest.java similarity index 90% rename from karate-core/src/test/java/com/intuit/karate/runtime/VariableTest.java rename to karate-core/src/test/java/com/intuit/karate/core/VariableTest.java index 6099c298c..bbe7e2d58 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/VariableTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/VariableTest.java @@ -1,4 +1,4 @@ -package com.intuit.karate.runtime; +package com.intuit.karate.core; import com.intuit.karate.graal.JsValue; import com.intuit.karate.graal.JsEngine; @@ -44,13 +44,13 @@ void testJsFunction() { @Test void testPojo() { - JsValue jv = je.eval("new com.intuit.karate.runtime.SimplePojo()"); + JsValue jv = je.eval("new com.intuit.karate.core.SimplePojo()"); assertTrue(jv.isOther()); } @Test void testClass() { - JsValue jv = je.eval("Java.type('com.intuit.karate.runtime.MockUtils')"); + JsValue jv = je.eval("Java.type('com.intuit.karate.core.MockUtils')"); assertTrue(jv.isOther()); Variable v = new Variable(jv); assertEquals(v.type, Variable.Type.OTHER); diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/abort.feature b/karate-core/src/test/java/com/intuit/karate/core/abort.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/abort.feature rename to karate-core/src/test/java/com/intuit/karate/core/abort.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/call-by-tag-called.feature b/karate-core/src/test/java/com/intuit/karate/core/call-by-tag-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/call-by-tag-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/call-by-tag-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/call-by-tag.feature b/karate-core/src/test/java/com/intuit/karate/core/call-by-tag.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/call-by-tag.feature rename to karate-core/src/test/java/com/intuit/karate/core/call-by-tag.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/call-feature-called.feature b/karate-core/src/test/java/com/intuit/karate/core/call-feature-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/call-feature-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/call-feature-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/call-feature.feature b/karate-core/src/test/java/com/intuit/karate/core/call-feature.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/call-feature.feature rename to karate-core/src/test/java/com/intuit/karate/core/call-feature.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/call-js-called.feature b/karate-core/src/test/java/com/intuit/karate/core/call-js-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/call-js-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/call-js-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/call-js.feature b/karate-core/src/test/java/com/intuit/karate/core/call-js.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/call-js.feature rename to karate-core/src/test/java/com/intuit/karate/core/call-js.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/called1.feature b/karate-core/src/test/java/com/intuit/karate/core/called1.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/called1.feature rename to karate-core/src/test/java/com/intuit/karate/core/called1.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/called2.feature b/karate-core/src/test/java/com/intuit/karate/core/called2.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/called2.feature rename to karate-core/src/test/java/com/intuit/karate/core/called2.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/callonce-bg-called.feature b/karate-core/src/test/java/com/intuit/karate/core/callonce-bg-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/callonce-bg-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/callonce-bg-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/callonce-bg-outline.feature b/karate-core/src/test/java/com/intuit/karate/core/callonce-bg-outline.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/callonce-bg-outline.feature rename to karate-core/src/test/java/com/intuit/karate/core/callonce-bg-outline.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/callonce-bg.feature b/karate-core/src/test/java/com/intuit/karate/core/callonce-bg.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/callonce-bg.feature rename to karate-core/src/test/java/com/intuit/karate/core/callonce-bg.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/callonce-global-called.feature b/karate-core/src/test/java/com/intuit/karate/core/callonce-global-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/callonce-global-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/callonce-global-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/callonce-global.feature b/karate-core/src/test/java/com/intuit/karate/core/callonce-global.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/callonce-global.feature rename to karate-core/src/test/java/com/intuit/karate/core/callonce-global.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/configure-in-js.feature b/karate-core/src/test/java/com/intuit/karate/core/configure-in-js.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/configure-in-js.feature rename to karate-core/src/test/java/com/intuit/karate/core/configure-in-js.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/copy-called-nested.feature b/karate-core/src/test/java/com/intuit/karate/core/copy-called-nested.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/copy-called-nested.feature rename to karate-core/src/test/java/com/intuit/karate/core/copy-called-nested.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/copy-called-overwrite.feature b/karate-core/src/test/java/com/intuit/karate/core/copy-called-overwrite.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/copy-called-overwrite.feature rename to karate-core/src/test/java/com/intuit/karate/core/copy-called-overwrite.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/copy-called.feature b/karate-core/src/test/java/com/intuit/karate/core/copy-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/copy-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/copy-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/copy.feature b/karate-core/src/test/java/com/intuit/karate/core/copy.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/copy.feature rename to karate-core/src/test/java/com/intuit/karate/core/copy.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/data.json b/karate-core/src/test/java/com/intuit/karate/core/data.json similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/data.json rename to karate-core/src/test/java/com/intuit/karate/core/data.json diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/dummy.feature b/karate-core/src/test/java/com/intuit/karate/core/dummy.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/dummy.feature rename to karate-core/src/test/java/com/intuit/karate/core/dummy.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/eval-and-set.feature b/karate-core/src/test/java/com/intuit/karate/core/eval-and-set.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/eval-and-set.feature rename to karate-core/src/test/java/com/intuit/karate/core/eval-and-set.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/extract.feature b/karate-core/src/test/java/com/intuit/karate/core/extract.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/extract.feature rename to karate-core/src/test/java/com/intuit/karate/core/extract.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/extract.html b/karate-core/src/test/java/com/intuit/karate/core/extract.html similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/extract.html rename to karate-core/src/test/java/com/intuit/karate/core/extract.html diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/fail-api.feature b/karate-core/src/test/java/com/intuit/karate/core/fail-api.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/fail-api.feature rename to karate-core/src/test/java/com/intuit/karate/core/fail-api.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/fail-js.feature b/karate-core/src/test/java/com/intuit/karate/core/fail-js.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/fail-js.feature rename to karate-core/src/test/java/com/intuit/karate/core/fail-js.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/fail1.feature b/karate-core/src/test/java/com/intuit/karate/core/fail1.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/fail1.feature rename to karate-core/src/test/java/com/intuit/karate/core/fail1.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/fork-listener.feature b/karate-core/src/test/java/com/intuit/karate/core/fork-listener.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/fork-listener.feature rename to karate-core/src/test/java/com/intuit/karate/core/fork-listener.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/fork.feature b/karate-core/src/test/java/com/intuit/karate/core/fork.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/fork.feature rename to karate-core/src/test/java/com/intuit/karate/core/fork.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/increment.js b/karate-core/src/test/java/com/intuit/karate/core/increment.js similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/increment.js rename to karate-core/src/test/java/com/intuit/karate/core/increment.js diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/js-map-repeat.feature b/karate-core/src/test/java/com/intuit/karate/core/js-map-repeat.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/js-map-repeat.feature rename to karate-core/src/test/java/com/intuit/karate/core/js-map-repeat.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/js-read.feature b/karate-core/src/test/java/com/intuit/karate/core/js-read.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/js-read.feature rename to karate-core/src/test/java/com/intuit/karate/core/js-read.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/js-read.json b/karate-core/src/test/java/com/intuit/karate/core/js-read.json similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/js-read.json rename to karate-core/src/test/java/com/intuit/karate/core/js-read.json diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/karate-config-dev.js b/karate-core/src/test/java/com/intuit/karate/core/karate-config-dev.js similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/karate-config-dev.js rename to karate-core/src/test/java/com/intuit/karate/core/karate-config-dev.js diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/karate-config-fn.feature b/karate-core/src/test/java/com/intuit/karate/core/karate-config-fn.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/karate-config-fn.feature rename to karate-core/src/test/java/com/intuit/karate/core/karate-config-fn.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/karate-config-utils.feature b/karate-core/src/test/java/com/intuit/karate/core/karate-config-utils.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/karate-config-utils.feature rename to karate-core/src/test/java/com/intuit/karate/core/karate-config-utils.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/karate-config.js b/karate-core/src/test/java/com/intuit/karate/core/karate-config.js similarity index 68% rename from karate-core/src/test/java/com/intuit/karate/runtime/karate-config.js rename to karate-core/src/test/java/com/intuit/karate/core/karate-config.js index c344973a1..12f7c57ee 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/karate-config.js +++ b/karate-core/src/test/java/com/intuit/karate/core/karate-config.js @@ -7,7 +7,7 @@ function fn() { return 'hello world' } }, - configUtils: karate.call('classpath:com/intuit/karate/runtime/karate-config-utils.feature') + configUtils: karate.call('classpath:com/intuit/karate/core/karate-config-utils.feature') }; return config; } diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/karate-logo.png b/karate-core/src/test/java/com/intuit/karate/core/karate-logo.png similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/karate-logo.png rename to karate-core/src/test/java/com/intuit/karate/core/karate-logo.png diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/match-each-magic-variables.feature b/karate-core/src/test/java/com/intuit/karate/core/match-each-magic-variables.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/match-each-magic-variables.feature rename to karate-core/src/test/java/com/intuit/karate/core/match-each-magic-variables.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/MockRunner.java b/karate-core/src/test/java/com/intuit/karate/core/mock/MockRunner.java similarity index 93% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/MockRunner.java rename to karate-core/src/test/java/com/intuit/karate/core/mock/MockRunner.java index dd0e393ef..d25dd6534 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/mock/MockRunner.java +++ b/karate-core/src/test/java/com/intuit/karate/core/mock/MockRunner.java @@ -1,8 +1,8 @@ -package com.intuit.karate.runtime.mock; +package com.intuit.karate.core.mock; +import com.intuit.karate.core.MockServer; import com.intuit.karate.Results; import com.intuit.karate.Runner; -import com.intuit.karate.runtime.*; import com.intuit.karate.http.HttpServer; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/MockTest.java b/karate-core/src/test/java/com/intuit/karate/core/mock/MockTest.java similarity index 93% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/MockTest.java rename to karate-core/src/test/java/com/intuit/karate/core/mock/MockTest.java index 84c5ce926..da3370377 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/mock/MockTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/mock/MockTest.java @@ -1,11 +1,11 @@ -package com.intuit.karate.runtime.mock; +package com.intuit.karate.core.mock; import com.intuit.karate.http.HttpServer; import com.intuit.karate.FileUtils; import com.intuit.karate.Results; import com.intuit.karate.Runner; import com.intuit.karate.core.FeatureParser; -import com.intuit.karate.runtime.MockHandler; +import com.intuit.karate.core.MockHandler; import java.io.File; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/_mock.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/_mock.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/_mock.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/_mock.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/binary.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/binary.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/binary.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/binary.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/cookies.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/cookies.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/cookies.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/cookies.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/delete.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/delete.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/delete.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/delete.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/download.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/download.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/download.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/download.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/form.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/form.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/form.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/form.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/german.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/german.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/german.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/german.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/headers.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/headers.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/headers.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/headers.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/hello-data-driven.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/hello-data-driven.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/hello-data-driven.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/hello-data-driven.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/hello-world.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/hello-world.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/hello-world.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/hello-world.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/karate-config.js b/karate-core/src/test/java/com/intuit/karate/core/mock/karate-config.js similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/karate-config.js rename to karate-core/src/test/java/com/intuit/karate/core/mock/karate-config.js diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/malformed.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/malformed.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/malformed.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/malformed.feature diff --git a/karate-core/src/test/java/com/intuit/karate/data/malformed.txt b/karate-core/src/test/java/com/intuit/karate/core/mock/malformed.txt similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/data/malformed.txt rename to karate-core/src/test/java/com/intuit/karate/core/mock/malformed.txt diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/multi-params.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/multi-params.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/multi-params.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/multi-params.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/no-headers.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/no-headers.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/no-headers.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/no-headers.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/no-match.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/no-match.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/no-match.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/no-match.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/param-commas.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/param-commas.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/param-commas.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/param-commas.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/patch.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/patch.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/patch.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/patch.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/test.pdf.zip b/karate-core/src/test/java/com/intuit/karate/core/mock/test.pdf.zip similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/test.pdf.zip rename to karate-core/src/test/java/com/intuit/karate/core/mock/test.pdf.zip diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/url-encoding.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/url-encoding.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/url-encoding.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/url-encoding.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/white-space.feature b/karate-core/src/test/java/com/intuit/karate/core/mock/white-space.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/white-space.feature rename to karate-core/src/test/java/com/intuit/karate/core/mock/white-space.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/outline-generator.feature b/karate-core/src/test/java/com/intuit/karate/core/outline-generator.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/outline-generator.feature rename to karate-core/src/test/java/com/intuit/karate/core/outline-generator.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/FeatureParserTest.java b/karate-core/src/test/java/com/intuit/karate/core/parser/FeatureParserTest.java similarity index 90% rename from karate-core/src/test/java/com/intuit/karate/core/FeatureParserTest.java rename to karate-core/src/test/java/com/intuit/karate/core/parser/FeatureParserTest.java index 4e213d93a..0f8028911 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/FeatureParserTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/parser/FeatureParserTest.java @@ -1,10 +1,17 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.parser; import com.intuit.karate.Runner; import com.intuit.karate.SuiteRuntime; +import com.intuit.karate.core.Engine; +import com.intuit.karate.core.Feature; +import com.intuit.karate.core.FeatureParser; +import com.intuit.karate.core.FeatureResult; +import com.intuit.karate.core.ScenarioResult; +import com.intuit.karate.core.Step; +import com.intuit.karate.core.StepResult; import com.intuit.karate.match.Match; import com.intuit.karate.match.MatchResult; -import com.intuit.karate.runtime.FeatureRuntime; +import com.intuit.karate.core.FeatureRuntime; import java.util.Map; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; @@ -20,7 +27,7 @@ class FeatureParserTest { static final Logger logger = LoggerFactory.getLogger(FeatureParserTest.class); static FeatureResult execute(String name) { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/" + name); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/parser/" + name); Runner.Builder builder = Runner.builder(); builder.tags("~@ignore"); FeatureRuntime fr = FeatureRuntime.of(new SuiteRuntime(builder), feature); @@ -62,7 +69,7 @@ void testEngineForError() { @Test void testParsingFeatureDescription() { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/test-simple.feature"); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/parser/test-simple.feature"); assertEquals("the first line", feature.getName()); assertEquals("and the second", feature.getDescription()); } @@ -99,7 +106,7 @@ void testSetTable() { @Test void testEmptyFeature() { try { - FeatureResult result = execute("empty.feature.txt"); + FeatureResult result = execute("test-empty.feature.txt"); fail("we expected parsing to fail"); } catch (Exception e) { String message = e.getMessage(); @@ -122,7 +129,7 @@ void testEmptyFirstLine() { @Test void testFeatureHeaderOnly() { - FeatureResult result = execute("feature-header-only.feature"); + FeatureResult result = execute("test-feature-header-only.feature"); } @Test @@ -163,7 +170,7 @@ void testOutlineDynamic() { @Test void testStepEditing() throws Exception { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/test-simple.feature"); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/parser/test-simple.feature"); Step step = feature.getStep(0, -1, 0); assertEquals("def a = 1", step.getText()); FeatureParser.updateStepFromText(step, "* def a = 2 - 1"); @@ -180,7 +187,7 @@ void testEmptyBackground() { @Test void testHide() { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/test-hide.feature"); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/parser/test-hide.feature"); Step step = feature.getStep(0, -1, 0); assertTrue(step.isPrefixStar()); assertFalse(step.isPrint()); diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-comments.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-comments.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-comments.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-comments.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-def-docstring.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-def-docstring.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-def-docstring.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-def-docstring.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-edge-cases.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-edge-cases.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-edge-cases.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-edge-cases.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-empty-background.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-background.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-empty-background.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-background.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-empty-first-line1.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-first-line1.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-empty-first-line1.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-first-line1.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-empty-first-line2.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-first-line2.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-empty-first-line2.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-first-line2.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-empty-first-line3.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-first-line3.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-empty-first-line3.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-empty-first-line3.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/empty.feature.txt b/karate-core/src/test/java/com/intuit/karate/core/parser/test-empty.feature.txt similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/empty.feature.txt rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-empty.feature.txt diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-error.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-error.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-error.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-error.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/feature-header-only.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-feature-header-only.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/feature-header-only.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-feature-header-only.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-hide.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-hide.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-hide.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-hide.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-ignore-feature.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-ignore-feature.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-ignore-feature.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-ignore-feature.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-ignore-scenario.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-ignore-scenario.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-ignore-scenario.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-ignore-scenario.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-outline-dynamic.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-outline-dynamic.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-outline-dynamic.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-outline-dynamic.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-outline-name.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-outline-name.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-outline-name.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-outline-name.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-set-table.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-set-table.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-set-table.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-set-table.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-simple-background.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-simple-background.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-simple-background.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-simple-background.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-simple.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-simple.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-simple.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-simple.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-table-pipe.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-table-pipe.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-table-pipe.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-table-pipe.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-tags-multiline.feature b/karate-core/src/test/java/com/intuit/karate/core/parser/test-tags-multiline.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-tags-multiline.feature rename to karate-core/src/test/java/com/intuit/karate/core/parser/test-tags-multiline.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/perf-mock.feature b/karate-core/src/test/java/com/intuit/karate/core/perf-mock.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/perf-mock.feature rename to karate-core/src/test/java/com/intuit/karate/core/perf-mock.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/perf.feature b/karate-core/src/test/java/com/intuit/karate/core/perf.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/perf.feature rename to karate-core/src/test/java/com/intuit/karate/core/perf.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/print.feature b/karate-core/src/test/java/com/intuit/karate/core/print.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/print.feature rename to karate-core/src/test/java/com/intuit/karate/core/print.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/FeatureEditTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/FeatureEditTest.java similarity index 94% rename from karate-core/src/test/java/com/intuit/karate/core/FeatureEditTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/FeatureEditTest.java index 88fc10e21..085dce9f4 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/FeatureEditTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/FeatureEditTest.java @@ -1,7 +1,13 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; import com.intuit.karate.FileUtils; import com.intuit.karate.Resource; +import com.intuit.karate.core.Background; +import com.intuit.karate.core.Feature; +import com.intuit.karate.core.FeatureParser; +import com.intuit.karate.core.Scenario; +import com.intuit.karate.core.ScenarioOutline; +import com.intuit.karate.core.Step; import java.io.InputStream; import java.nio.file.Paths; import java.util.List; diff --git a/karate-core/src/test/java/com/intuit/karate/core/FeatureResultTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/FeatureResultTest.java similarity index 94% rename from karate-core/src/test/java/com/intuit/karate/core/FeatureResultTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/FeatureResultTest.java index 398b12afe..ef919f899 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/FeatureResultTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/FeatureResultTest.java @@ -1,8 +1,12 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; import com.intuit.karate.FileUtils; import com.intuit.karate.SuiteRuntime; -import com.intuit.karate.runtime.FeatureRuntime; +import com.intuit.karate.core.Engine; +import com.intuit.karate.core.Feature; +import com.intuit.karate.core.FeatureParser; +import com.intuit.karate.core.FeatureResult; +import com.intuit.karate.core.FeatureRuntime; import java.io.File; import java.util.Map; import java.util.function.IntBinaryOperator; @@ -20,7 +24,7 @@ public class FeatureResultTest { static final Logger logger = LoggerFactory.getLogger(FeatureResultTest.class); static FeatureResult result(String name) { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/" + name); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/runner/" + name); FeatureRuntime fr = FeatureRuntime.of(new SuiteRuntime(), feature); fr.run(); return fr.result; diff --git a/karate-core/src/test/java/com/intuit/karate/core/FeatureReuseTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/FeatureReuseTest.java similarity index 84% rename from karate-core/src/test/java/com/intuit/karate/core/FeatureReuseTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/FeatureReuseTest.java index 80a013a28..c11814e93 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/FeatureReuseTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/FeatureReuseTest.java @@ -1,8 +1,11 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; import com.intuit.karate.FileUtils; import com.intuit.karate.SuiteRuntime; -import com.intuit.karate.runtime.FeatureRuntime; +import com.intuit.karate.core.Engine; +import com.intuit.karate.core.Feature; +import com.intuit.karate.core.FeatureParser; +import com.intuit.karate.core.FeatureRuntime; import java.io.File; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.Test; @@ -18,7 +21,7 @@ class FeatureReuseTest { static final Logger logger = LoggerFactory.getLogger(FeatureReuseTest.class); static String resultXml(String name) { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/" + name); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/runner/" + name); FeatureRuntime fr = FeatureRuntime.of(new SuiteRuntime(), feature); fr.run(); File file = Engine.saveResultXml("target", fr.result, null); diff --git a/karate-core/src/test/java/com/intuit/karate/core/MandatoryTagHook.java b/karate-core/src/test/java/com/intuit/karate/core/runner/MandatoryTagHook.java similarity index 81% rename from karate-core/src/test/java/com/intuit/karate/core/MandatoryTagHook.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/MandatoryTagHook.java index 198705ade..50a38c73a 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/MandatoryTagHook.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/MandatoryTagHook.java @@ -1,9 +1,12 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; import com.intuit.karate.SuiteRuntime; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.Step; +import com.intuit.karate.core.StepResult; +import com.intuit.karate.core.Tag; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.ScenarioRuntime; /** * diff --git a/karate-core/src/test/java/com/intuit/karate/RunnerTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/RunnerTest.java similarity index 71% rename from karate-core/src/test/java/com/intuit/karate/RunnerTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/RunnerTest.java index 2c9841016..d35f0925a 100644 --- a/karate-core/src/test/java/com/intuit/karate/RunnerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/RunnerTest.java @@ -1,9 +1,14 @@ -package com.intuit.karate; +package com.intuit.karate.core.runner; +import com.intuit.karate.FileUtils; +import com.intuit.karate.KarateException; +import com.intuit.karate.KarateOptions; +import com.intuit.karate.Results; +import com.intuit.karate.Runner; import com.intuit.karate.core.Engine; import com.intuit.karate.core.Feature; import com.intuit.karate.core.FeatureParser; -import com.intuit.karate.runtime.FeatureRuntime; +import com.intuit.karate.core.FeatureRuntime; import java.io.File; import java.util.Map; import static org.junit.jupiter.api.Assertions.*; @@ -26,7 +31,7 @@ boolean contains(String reportPath, String textToFind) { } static String resultXml(String name) { - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/" + name); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/runner/" + name); FeatureRuntime fr = FeatureRuntime.of(feature); fr.run(); File file = Engine.saveResultXml("target", fr.result, null); @@ -35,40 +40,40 @@ static String resultXml(String name) { @Test void testScenario() throws Exception { - String contents = resultXml("core/scenario.feature"); + String contents = resultXml("scenario.feature"); assertTrue(contents.contains("Then match b == { foo: 'bar'}")); } @Test void testScenarioOutline() throws Exception { - String contents = resultXml("core/outline.feature"); + String contents = resultXml("outline.feature"); assertTrue(contents.contains("When def a = 55")); } @Test void testParallel() { Results results = Runner.path( - "classpath:com/intuit/karate/multi-scenario-fail.feature", - "classpath:com/intuit/karate/no-scenario-name.feature", - "classpath:com/intuit/karate/core/scenario.feature", - "classpath:com/intuit/karate/core/outline.feature", - "classpath:com/intuit/karate/core/stackoverflow-error.feature" + "classpath:com/intuit/karate/core/runner/multi-scenario-fail.feature", + "classpath:com/intuit/karate/core/runner/no-scenario-name.feature", + "classpath:com/intuit/karate/core/runner/scenario.feature", + "classpath:com/intuit/karate/core/runner/outline.feature", + "classpath:com/intuit/karate/core/runner/stackoverflow-error.feature" ).parallel(1); assertEquals(3, results.getFailCount()); - String pathBase = "target/surefire-reports/com.intuit.karate."; - assertTrue(contains(pathBase + "core.scenario.xml", "Then match b == { foo: 'bar'}")); - assertTrue(contains(pathBase + "core.outline.xml", "Then assert a == 55")); + String pathBase = "target/surefire-reports/com.intuit.karate.core.runner."; + assertTrue(contains(pathBase + "scenario.xml", "Then match b == { foo: 'bar'}")); + assertTrue(contains(pathBase + "outline.xml", "Then assert a == 55")); // a scenario failure should not stop other features from running assertTrue(contains(pathBase + "multi-scenario-fail.xml", "Then assert a != 2 ........................................................ passed")); assertEquals(3, results.getFailedMap().size()); - assertTrue(results.getFailedMap().keySet().contains("com.intuit.karate.no-scenario-name")); - assertTrue(results.getFailedMap().keySet().contains("com.intuit.karate.multi-scenario-fail")); - assertTrue(results.getFailedMap().keySet().contains("com.intuit.karate.core.stackoverflow-error")); + assertTrue(results.getFailedMap().keySet().contains("com.intuit.karate.core.runner.no-scenario-name")); + assertTrue(results.getFailedMap().keySet().contains("com.intuit.karate.core.runner.multi-scenario-fail")); + assertTrue(results.getFailedMap().keySet().contains("com.intuit.karate.core.runner.stackoverflow-error")); } @Test void testRunningFeatureFromJavaApi() { - Map result = Runner.runFeature(getClass(), "core/scenario.feature", null, true); + Map result = Runner.runFeature(getClass(), "scenario.feature", null, true); assertEquals(1, result.get("a")); Map temp = (Map) result.get("b"); assertEquals("bar", temp.get("foo")); @@ -87,13 +92,13 @@ void testRunningFeatureFailureFromJavaApi() { @Test void testRunningFeatureFailureFromRunner() { - Results results = Runner.path("classpath:com/intuit/karate/multi-scenario-fail.feature").parallel(1); + Results results = Runner.path("classpath:com/intuit/karate/core/runner/multi-scenario-fail.feature").parallel(1); assertEquals(1, results.getFailCount()); } @Test void testRunningRelativePathFeatureFromJavaApi() { - Map result = Runner.runFeature("classpath:com/intuit/karate/test-called.feature", null, true); + Map result = Runner.runFeature("classpath:com/intuit/karate/core/runner/test-called.feature", null, true); assertEquals(1, result.get("a")); assertEquals(2, result.get("b")); assertEquals("normal", result.get("configSource")); diff --git a/karate-core/src/test/java/com/intuit/karate/core/ScenarioHookTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/ScenarioHookTest.java similarity index 77% rename from karate-core/src/test/java/com/intuit/karate/core/ScenarioHookTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/ScenarioHookTest.java index d5fc01f13..81daa29c2 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/ScenarioHookTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/ScenarioHookTest.java @@ -1,4 +1,4 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; import com.intuit.karate.Results; import com.intuit.karate.Runner; @@ -13,7 +13,7 @@ class ScenarioHookTest { @Test void testStopIfScenarioHasNoTags() { - String path = "classpath:com/intuit/karate/core/test-hook-notags.feature"; + String path = "classpath:com/intuit/karate/core/runner/test-hook-notags.feature"; Results results = Runner.path(path).hook(new MandatoryTagHook()).parallel(1); assertEquals(1, results.getFeatureCount()); assertEquals(1, results.getFailCount()); @@ -21,7 +21,7 @@ void testStopIfScenarioHasNoTags() { @Test void testHookForExamplesWithTags() { - String path = "classpath:com/intuit/karate/core/test-hook-multiexample.feature"; + String path = "classpath:com/intuit/karate/core/runner/test-hook-multiexample.feature"; Results results = Runner.path(path).hook(new MandatoryTagHook()).parallel(1); assertEquals(1, results.getFeatureCount()); assertEquals(7, results.getScenarioCount()); diff --git a/karate-core/src/test/java/com/intuit/karate/core/ScenarioResultTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/ScenarioResultTest.java similarity index 79% rename from karate-core/src/test/java/com/intuit/karate/core/ScenarioResultTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/ScenarioResultTest.java index a01de3e3d..dba77f72f 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/ScenarioResultTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/ScenarioResultTest.java @@ -1,7 +1,11 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; import com.intuit.karate.FileUtils; import com.intuit.karate.Json; +import com.intuit.karate.core.Feature; +import com.intuit.karate.core.FeatureParser; +import com.intuit.karate.core.Scenario; +import com.intuit.karate.core.ScenarioResult; import com.intuit.karate.match.Match; import java.util.List; import java.util.Map; @@ -21,7 +25,7 @@ class ScenarioResultTest { void testJsonToScenarioResult() { String json = FileUtils.toString(getClass().getResourceAsStream("simple1.json")); List> list = Json.of(json).get("$[0].elements"); - Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/simple1.feature"); + Feature feature = FeatureParser.parse("classpath:com/intuit/karate/core/runner/simple1.feature"); Scenario scenario = feature.getSections().get(0).getScenario(); ScenarioResult sr = new ScenarioResult(scenario, list, true); Match.that(list.get(0)).isEqualTo(sr.backgroundToMap()).isTrue(); diff --git a/karate-core/src/test/java/com/intuit/karate/core/TagTest.java b/karate-core/src/test/java/com/intuit/karate/core/runner/TagTest.java similarity index 93% rename from karate-core/src/test/java/com/intuit/karate/core/TagTest.java rename to karate-core/src/test/java/com/intuit/karate/core/runner/TagTest.java index 4db135c3c..9970a2910 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/TagTest.java +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/TagTest.java @@ -1,5 +1,6 @@ -package com.intuit.karate.core; +package com.intuit.karate.core.runner; +import com.intuit.karate.core.Tag; import java.util.Arrays; import static org.junit.jupiter.api.Assertions.*; diff --git a/karate-core/src/test/java/com/intuit/karate/core/aborted.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/aborted.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/aborted.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/aborted.feature diff --git a/karate-core/src/test/java/com/intuit/karate/called-arg-loop.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called-arg-loop.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/called-arg-loop.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called-arg-loop.feature diff --git a/karate-core/src/test/java/com/intuit/karate/called-arg-null.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called-arg-null.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/called-arg-null.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called-arg-null.feature diff --git a/karate-core/src/test/java/com/intuit/karate/called-arg-single.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called-arg-single.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/called-arg-single.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called-arg-single.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/called-shared.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called-shared.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/called-shared.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called-shared.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/called-shared2.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called-shared2.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/called-shared2.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called-shared2.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/called.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/called.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/called_2.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/called_2.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/called_2.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/called_2.feature diff --git a/karate-core/src/test/java/com/intuit/karate/caller-arg.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/caller-arg.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/caller-arg.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/caller-arg.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/caller-shared.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/caller-shared.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/caller-shared.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/caller-shared.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/caller-with-lambda-arg.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/caller-with-lambda-arg.feature similarity index 97% rename from karate-core/src/test/java/com/intuit/karate/core/caller-with-lambda-arg.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/caller-with-lambda-arg.feature index 2a8f4fb74..12fb0a584 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/caller-with-lambda-arg.feature +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/caller-with-lambda-arg.feature @@ -16,7 +16,7 @@ Background: } }); - var featureResultTestClass = Java.type('com.intuit.karate.core.FeatureResultTest'); + var featureResultTestClass = Java.type('com.intuit.karate.core.runner.FeatureResultTest'); featureResultTestClass.addLambdaFunctionToMap(element); element.sum = new plusOperation(); diff --git a/karate-core/src/test/java/com/intuit/karate/core/caller.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/caller.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/caller.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/caller.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/caller_2.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/caller_2.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/caller_2.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/caller_2.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/failed.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/failed.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/failed.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/failed.feature diff --git a/karate-core/src/test/java/com/intuit/karate/multi-scenario-fail.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/multi-scenario-fail.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/multi-scenario-fail.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/multi-scenario-fail.feature diff --git a/karate-core/src/test/java/com/intuit/karate/multi-scenario.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/multi-scenario.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/multi-scenario.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/multi-scenario.feature diff --git a/karate-core/src/test/java/com/intuit/karate/no-scenario-name.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/no-scenario-name.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/no-scenario-name.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/no-scenario-name.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/notEqualMatch.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/notEqualMatch.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/notEqualMatch.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/notEqualMatch.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/outline.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/outline.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/outline.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/outline.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/scenario.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/scenario.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/scenario.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/scenario.feature diff --git a/karate-core/src/test/java/com/intuit/karate/signin.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/signin.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/signin.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/signin.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/simple1.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/simple1.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/simple1.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/simple1.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/simple1.json b/karate-core/src/test/java/com/intuit/karate/core/runner/simple1.json similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/simple1.json rename to karate-core/src/test/java/com/intuit/karate/core/runner/simple1.json diff --git a/karate-core/src/test/java/com/intuit/karate/core/stackoverflow-error.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/stackoverflow-error.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/stackoverflow-error.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/stackoverflow-error.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/runner/table.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/table.feature new file mode 100644 index 000000000..3b73dab7f --- /dev/null +++ b/karate-core/src/test/java/com/intuit/karate/core/runner/table.feature @@ -0,0 +1,11 @@ +Feature: + +Scenario: +* table cats + | name | age | + | 'Bob' | 2 | + | 'Wild' | 4 | + | 'Nyan' | 3 | + +* match cats == [{name: 'Bob', age: 2}, {name: 'Wild', age: 4}, {name: 'Nyan', age: 3}] + diff --git a/karate-core/src/test/java/com/intuit/karate/test-called-embedded-file.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/test-called-embedded-file.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/test-called-embedded-file.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/test-called-embedded-file.feature diff --git a/karate-core/src/test/java/com/intuit/karate/test-called-embedded.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/test-called-embedded.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/test-called-embedded.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/test-called-embedded.feature diff --git a/karate-core/src/test/java/com/intuit/karate/test-called.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/test-called.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/test-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/test-called.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-hook-multiexample.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/test-hook-multiexample.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-hook-multiexample.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/test-hook-multiexample.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/test-hook-notags.feature b/karate-core/src/test/java/com/intuit/karate/core/runner/test-hook-notags.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/core/test-hook-notags.feature rename to karate-core/src/test/java/com/intuit/karate/core/runner/test-hook-notags.feature diff --git a/karate-core/src/test/java/com/intuit/karate/test.json b/karate-core/src/test/java/com/intuit/karate/core/runner/test.json similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/test.json rename to karate-core/src/test/java/com/intuit/karate/core/runner/test.json diff --git a/karate-core/src/test/java/com/intuit/karate/test.xml b/karate-core/src/test/java/com/intuit/karate/core/runner/test.xml similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/test.xml rename to karate-core/src/test/java/com/intuit/karate/core/runner/test.xml diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/set-xml.feature b/karate-core/src/test/java/com/intuit/karate/core/set-xml.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/set-xml.feature rename to karate-core/src/test/java/com/intuit/karate/core/set-xml.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/set.feature b/karate-core/src/test/java/com/intuit/karate/core/set.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/set.feature rename to karate-core/src/test/java/com/intuit/karate/core/set.feature diff --git a/karate-core/src/test/java/com/intuit/karate/core/table.feature b/karate-core/src/test/java/com/intuit/karate/core/table.feature index 3b73dab7f..ec0d2aa08 100644 --- a/karate-core/src/test/java/com/intuit/karate/core/table.feature +++ b/karate-core/src/test/java/com/intuit/karate/core/table.feature @@ -1,11 +1,8 @@ Feature: Scenario: -* table cats - | name | age | - | 'Bob' | 2 | - | 'Wild' | 4 | - | 'Nyan' | 3 | - -* match cats == [{name: 'Bob', age: 2}, {name: 'Wild', age: 4}, {name: 'Nyan', age: 3}] - +* table data + | first | last | age | + | 'John' | 'Smith' | 20 | + | 'Bill' | | 40 | +* match data == [{ first: 'John', last: 'Smith', age: 20 }, { first: 'Bill', age: 40 }] diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/tags.feature b/karate-core/src/test/java/com/intuit/karate/core/tags.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/tags.feature rename to karate-core/src/test/java/com/intuit/karate/core/tags.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/to-bean-called.feature b/karate-core/src/test/java/com/intuit/karate/core/to-bean-called.feature similarity index 82% rename from karate-core/src/test/java/com/intuit/karate/runtime/to-bean-called.feature rename to karate-core/src/test/java/com/intuit/karate/core/to-bean-called.feature index a13e6940a..aca3b10d2 100644 --- a/karate-core/src/test/java/com/intuit/karate/runtime/to-bean-called.feature +++ b/karate-core/src/test/java/com/intuit/karate/core/to-bean-called.feature @@ -1,7 +1,7 @@ Feature: Scenario: -* def catType = 'com.intuit.karate.runtime.Cat' +* def catType = 'com.intuit.karate.core.Cat' * def Cat = Java.type(catType) * def toCat = function(x){ return karate.toBean(x, catType) } # second argument (true) is to strip keys with null values diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/to-bean.feature b/karate-core/src/test/java/com/intuit/karate/core/to-bean.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/to-bean.feature rename to karate-core/src/test/java/com/intuit/karate/core/to-bean.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/utils-reuse-common.feature b/karate-core/src/test/java/com/intuit/karate/core/utils-reuse-common.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/utils-reuse-common.feature rename to karate-core/src/test/java/com/intuit/karate/core/utils-reuse-common.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/utils-reuse.feature b/karate-core/src/test/java/com/intuit/karate/core/utils-reuse.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/utils-reuse.feature rename to karate-core/src/test/java/com/intuit/karate/core/utils-reuse.feature diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/uuid.js b/karate-core/src/test/java/com/intuit/karate/core/uuid.js similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/uuid.js rename to karate-core/src/test/java/com/intuit/karate/core/uuid.js diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/websocket.feature b/karate-core/src/test/java/com/intuit/karate/core/websocket.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/websocket.feature rename to karate-core/src/test/java/com/intuit/karate/core/websocket.feature diff --git a/karate-core/src/test/java/com/intuit/karate/driver/DriverElementTest.java b/karate-core/src/test/java/com/intuit/karate/driver/DriverElementTest.java index faef4802f..5ead4155b 100644 --- a/karate-core/src/test/java/com/intuit/karate/driver/DriverElementTest.java +++ b/karate-core/src/test/java/com/intuit/karate/driver/DriverElementTest.java @@ -1,6 +1,6 @@ package com.intuit.karate.driver; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.Variable; import java.util.Collections; import java.util.List; import org.junit.jupiter.api.Test; diff --git a/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureProxyRunner.java b/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureProxyRunner.java index c03f6805f..dea7b11f5 100644 --- a/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureProxyRunner.java +++ b/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureProxyRunner.java @@ -1,6 +1,6 @@ package com.intuit.karate.fatjar; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.jupiter.api.Test; /** diff --git a/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerRunner.java b/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerRunner.java index 71ec8a8f3..d7cc7ce95 100644 --- a/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerRunner.java +++ b/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerRunner.java @@ -1,6 +1,6 @@ package com.intuit.karate.fatjar; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.jupiter.api.Test; /** diff --git a/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerTest.java b/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerTest.java index 11c7dc76b..36fa6bf8a 100644 --- a/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/fatjar/FeatureServerTest.java @@ -2,7 +2,7 @@ import com.intuit.karate.Results; import com.intuit.karate.Runner; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.jupiter.api.AfterAll; import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.BeforeAll; diff --git a/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerSslTest.java b/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerSslTest.java index ddb6d174b..2fd9c0965 100644 --- a/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerSslTest.java +++ b/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerSslTest.java @@ -5,7 +5,7 @@ import com.intuit.karate.Runner; import com.intuit.karate.http.LenientTrustManager; import com.intuit.karate.http.ProxyServer; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import java.io.InputStream; import javax.net.ssl.SSLContext; import javax.net.ssl.TrustManager; diff --git a/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerTest.java b/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerTest.java index 17fd7fef1..65b3cd124 100644 --- a/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerTest.java +++ b/karate-core/src/test/java/com/intuit/karate/fatjar/ProxyServerTest.java @@ -4,7 +4,7 @@ import com.intuit.karate.Results; import com.intuit.karate.Runner; import com.intuit.karate.http.ProxyServer; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import java.io.InputStream; import org.apache.http.HttpEntity; import org.apache.http.HttpHost; diff --git a/karate-core/src/test/java/com/intuit/karate/graal/JsEngineTest.java b/karate-core/src/test/java/com/intuit/karate/graal/JsEngineTest.java index 4ed78d267..a938e4eb4 100644 --- a/karate-core/src/test/java/com/intuit/karate/graal/JsEngineTest.java +++ b/karate-core/src/test/java/com/intuit/karate/graal/JsEngineTest.java @@ -1,9 +1,8 @@ package com.intuit.karate.graal; import com.intuit.karate.core.AutoDef; -import com.intuit.karate.driver.Driver; import com.intuit.karate.match.Match; -import com.intuit.karate.runtime.MockUtils; +import com.intuit.karate.core.MockUtils; import com.intuit.karate.http.Request; import java.lang.reflect.Method; import java.util.Collections; @@ -183,7 +182,7 @@ void testStringInterpolation() { @Test void testHostBytes() { - JsValue v = je.eval("Java.type('com.intuit.karate.runtime.MockUtils')"); + JsValue v = je.eval("Java.type('com.intuit.karate.core.MockUtils')"); je.put("Utils", v.getValue()); JsValue val = je.eval("Utils.testBytes"); assertEquals(MockUtils.testBytes, val.getOriginal().asHostObject()); diff --git a/karate-core/src/test/java/com/intuit/karate/headers.js b/karate-core/src/test/java/com/intuit/karate/headers.js deleted file mode 100644 index 8c2125cd0..000000000 --- a/karate-core/src/test/java/com/intuit/karate/headers.js +++ /dev/null @@ -1,10 +0,0 @@ -function fn() { - var out = { - foo: 'bar_' + configSource // configSource is 'start-up' config, will never change - }; - var ticket = karate.get('ticket'); // get can get the 'latest' values of variables - if (ticket) { - out.baz = 'ban' - } - return out; -} diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/mock/malformed.txt b/karate-core/src/test/java/com/intuit/karate/malformed.txt similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/runtime/mock/malformed.txt rename to karate-core/src/test/java/com/intuit/karate/malformed.txt diff --git a/karate-core/src/test/java/com/intuit/karate/mutation.yaml b/karate-core/src/test/java/com/intuit/karate/mutation.yaml deleted file mode 100644 index 7e5558282..000000000 --- a/karate-core/src/test/java/com/intuit/karate/mutation.yaml +++ /dev/null @@ -1,16 +0,0 @@ -mutation: - typeName: - input: - id: '1' - subTypeName: - name: 'name' - notes: 'notes' - deleted: false - output: - - id - - edge: - - node: - - id - - name - - notes - - deleted diff --git a/karate-core/src/test/java/com/intuit/karate/runtime/table.feature b/karate-core/src/test/java/com/intuit/karate/runtime/table.feature deleted file mode 100644 index ec0d2aa08..000000000 --- a/karate-core/src/test/java/com/intuit/karate/runtime/table.feature +++ /dev/null @@ -1,8 +0,0 @@ -Feature: - -Scenario: -* table data - | first | last | age | - | 'John' | 'Smith' | 20 | - | 'Bill' | | 40 | -* match data == [{ first: 'John', last: 'Smith', age: 20 }, { first: 'Bill', age: 40 }] diff --git a/karate-core/src/test/java/com/intuit/karate/test.csv b/karate-core/src/test/java/com/intuit/karate/test.csv deleted file mode 100644 index 4f2d2328a..000000000 --- a/karate-core/src/test/java/com/intuit/karate/test.csv +++ /dev/null @@ -1,4 +0,0 @@ -foo,bar,baz -goodbye,10,true -cruel,20,false -world,30,true \ No newline at end of file diff --git a/karate-core/src/test/java/com/intuit/karate/test/test.feature b/karate-core/src/test/java/com/intuit/karate/test/file-utils-test.feature similarity index 100% rename from karate-core/src/test/java/com/intuit/karate/test/test.feature rename to karate-core/src/test/java/com/intuit/karate/test/file-utils-test.feature diff --git a/karate-core/src/test/java/com/intuit/karate/tx-cat-json.feature b/karate-core/src/test/java/com/intuit/karate/tx-cat-json.feature deleted file mode 100644 index ec9167907..000000000 --- a/karate-core/src/test/java/com/intuit/karate/tx-cat-json.feature +++ /dev/null @@ -1,12 +0,0 @@ -@ignore -Feature: - -Scenario: -* def result = call read('tx-kit-json.feature') input.kittens -* def kittens = $result[*].output - -* set output -| path | value | -| name.first | input.firstName | -| name.last | input.lastName | -| kittens | kittens | diff --git a/karate-core/src/test/java/com/intuit/karate/tx-kit-json.feature b/karate-core/src/test/java/com/intuit/karate/tx-kit-json.feature deleted file mode 100644 index 19ff7fb87..000000000 --- a/karate-core/src/test/java/com/intuit/karate/tx-kit-json.feature +++ /dev/null @@ -1,9 +0,0 @@ -@ignore -Feature: - -Scenario: -* set output -| path | value | -| name | kittenName | -| age | kittenAge | - diff --git a/karate-core/src/test/java/test.json b/karate-core/src/test/java/test.json deleted file mode 100644 index 8c850a5fd..000000000 --- a/karate-core/src/test/java/test.json +++ /dev/null @@ -1 +0,0 @@ -{ "foo": "bar" } diff --git a/karate-demo/src/test/java/driver/core/MockRunner.java b/karate-demo/src/test/java/driver/core/MockRunner.java index 7631b372e..cf067c991 100644 --- a/karate-demo/src/test/java/driver/core/MockRunner.java +++ b/karate-demo/src/test/java/driver/core/MockRunner.java @@ -1,6 +1,6 @@ package driver.core; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.Test; /** diff --git a/karate-demo/src/test/java/driver/core/Test01ParallelRunner.java b/karate-demo/src/test/java/driver/core/Test01ParallelRunner.java index c0a7a08ed..f373f5eb5 100644 --- a/karate-demo/src/test/java/driver/core/Test01ParallelRunner.java +++ b/karate-demo/src/test/java/driver/core/Test01ParallelRunner.java @@ -25,7 +25,7 @@ import com.intuit.karate.Results; import com.intuit.karate.Runner; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import static org.junit.Assert.*; import demo.DemoTestParallel; diff --git a/karate-demo/src/test/java/driver/core/Test01Runner.java b/karate-demo/src/test/java/driver/core/Test01Runner.java index 0189aad8e..8dbf9cfbd 100644 --- a/karate-demo/src/test/java/driver/core/Test01Runner.java +++ b/karate-demo/src/test/java/driver/core/Test01Runner.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.BeforeClass; import org.junit.runner.RunWith; diff --git a/karate-demo/src/test/java/driver/core/Test02Runner.java b/karate-demo/src/test/java/driver/core/Test02Runner.java index 1e21828b3..6da751454 100644 --- a/karate-demo/src/test/java/driver/core/Test02Runner.java +++ b/karate-demo/src/test/java/driver/core/Test02Runner.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.BeforeClass; import org.junit.runner.RunWith; diff --git a/karate-demo/src/test/java/driver/core/Test03DockerRunner.java b/karate-demo/src/test/java/driver/core/Test03DockerRunner.java index bc348d3fc..0aa5deed4 100644 --- a/karate-demo/src/test/java/driver/core/Test03DockerRunner.java +++ b/karate-demo/src/test/java/driver/core/Test03DockerRunner.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import com.intuit.karate.shell.Command; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/karate-demo/src/test/java/driver/core/Test04Runner.java b/karate-demo/src/test/java/driver/core/Test04Runner.java index 96a1e892e..a248bc63a 100644 --- a/karate-demo/src/test/java/driver/core/Test04Runner.java +++ b/karate-demo/src/test/java/driver/core/Test04Runner.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.BeforeClass; import org.junit.runner.RunWith; diff --git a/karate-demo/src/test/java/mock/contract/ConsumerUsingMockTest.java b/karate-demo/src/test/java/mock/contract/ConsumerUsingMockTest.java index 05ee455da..e76b843fb 100644 --- a/karate-demo/src/test/java/mock/contract/ConsumerUsingMockTest.java +++ b/karate-demo/src/test/java/mock/contract/ConsumerUsingMockTest.java @@ -1,7 +1,7 @@ package mock.contract; import com.intuit.karate.JsonUtils; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import org.junit.Test; import static org.junit.Assert.*; diff --git a/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyHttpTest.java b/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyHttpTest.java index 1a65932bd..65db3c581 100644 --- a/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyHttpTest.java +++ b/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyHttpTest.java @@ -1,7 +1,7 @@ package mock.contract; import com.intuit.karate.JsonUtils; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import org.junit.Test; import static org.junit.Assert.*; diff --git a/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteSslTest.java b/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteSslTest.java index b28756ef0..14e2df5ee 100644 --- a/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteSslTest.java +++ b/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteSslTest.java @@ -1,7 +1,7 @@ package mock.contract; import com.intuit.karate.JsonUtils; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import org.junit.Test; import static org.junit.Assert.*; diff --git a/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteTest.java b/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteTest.java index 3be1b65ac..fa40d2035 100644 --- a/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteTest.java +++ b/karate-demo/src/test/java/mock/contract/ConsumerUsingProxyRewriteTest.java @@ -1,7 +1,7 @@ package mock.contract; import com.intuit.karate.JsonUtils; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import org.junit.Test; import static org.junit.Assert.*; diff --git a/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockSslTest.java b/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockSslTest.java index 994fd75fa..d7a79af08 100644 --- a/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockSslTest.java +++ b/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockSslTest.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; diff --git a/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockTest.java b/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockTest.java index 5fc7efd15..4e8ad2580 100644 --- a/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockTest.java +++ b/karate-demo/src/test/java/mock/contract/PaymentServiceContractUsingMockTest.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.runner.RunWith; diff --git a/karate-demo/src/test/java/mock/contract/PaymentServiceMockMain.java b/karate-demo/src/test/java/mock/contract/PaymentServiceMockMain.java index 141b0cd90..69c27389e 100644 --- a/karate-demo/src/test/java/mock/contract/PaymentServiceMockMain.java +++ b/karate-demo/src/test/java/mock/contract/PaymentServiceMockMain.java @@ -1,6 +1,6 @@ package mock.contract; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; /** * diff --git a/karate-demo/src/test/java/mock/contract/PaymentServiceMockSslMain.java b/karate-demo/src/test/java/mock/contract/PaymentServiceMockSslMain.java index 665b898a8..bcae9cf17 100644 --- a/karate-demo/src/test/java/mock/contract/PaymentServiceMockSslMain.java +++ b/karate-demo/src/test/java/mock/contract/PaymentServiceMockSslMain.java @@ -1,6 +1,6 @@ package mock.contract; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import java.io.File; /** diff --git a/karate-demo/src/test/java/mock/micro/CatsMockRunner.java b/karate-demo/src/test/java/mock/micro/CatsMockRunner.java index 3b8e0b8eb..ac7753849 100644 --- a/karate-demo/src/test/java/mock/micro/CatsMockRunner.java +++ b/karate-demo/src/test/java/mock/micro/CatsMockRunner.java @@ -2,7 +2,7 @@ import com.intuit.karate.junit4.Karate; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.BeforeClass; import org.junit.runner.RunWith; diff --git a/karate-demo/src/test/java/mock/proxy/DemoMockProceedRunner.java b/karate-demo/src/test/java/mock/proxy/DemoMockProceedRunner.java index 458350fc1..a3e854cf9 100644 --- a/karate-demo/src/test/java/mock/proxy/DemoMockProceedRunner.java +++ b/karate-demo/src/test/java/mock/proxy/DemoMockProceedRunner.java @@ -3,7 +3,7 @@ import com.intuit.karate.Runner; import com.intuit.karate.Results; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import demo.TestBase; import org.junit.AfterClass; import static org.junit.Assert.assertTrue; diff --git a/karate-demo/src/test/java/mock/proxy/DemoMockProxyRunner.java b/karate-demo/src/test/java/mock/proxy/DemoMockProxyRunner.java index 63ab25ba2..cd2646e9d 100644 --- a/karate-demo/src/test/java/mock/proxy/DemoMockProxyRunner.java +++ b/karate-demo/src/test/java/mock/proxy/DemoMockProxyRunner.java @@ -3,7 +3,7 @@ import com.intuit.karate.Runner; import com.intuit.karate.Results; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import demo.TestBase; import org.junit.AfterClass; import static org.junit.Assert.assertTrue; diff --git a/karate-demo/src/test/java/mock/proxy/DemoMockProxySslRunner.java b/karate-demo/src/test/java/mock/proxy/DemoMockProxySslRunner.java index 8d9320f13..a0002c844 100644 --- a/karate-demo/src/test/java/mock/proxy/DemoMockProxySslRunner.java +++ b/karate-demo/src/test/java/mock/proxy/DemoMockProxySslRunner.java @@ -3,7 +3,7 @@ import com.intuit.karate.Runner; import com.intuit.karate.Results; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import demo.TestBase; import org.junit.AfterClass; import static org.junit.Assert.assertTrue; diff --git a/karate-demo/src/test/java/mock/proxy/DemoMockRunner.java b/karate-demo/src/test/java/mock/proxy/DemoMockRunner.java index cf9068084..d94257c14 100644 --- a/karate-demo/src/test/java/mock/proxy/DemoMockRunner.java +++ b/karate-demo/src/test/java/mock/proxy/DemoMockRunner.java @@ -3,7 +3,7 @@ import com.intuit.karate.Runner; import com.intuit.karate.Results; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import static org.junit.Assert.assertTrue; import org.junit.BeforeClass; diff --git a/karate-demo/src/test/java/mock/proxy/DemoMockSslRunner.java b/karate-demo/src/test/java/mock/proxy/DemoMockSslRunner.java index 562c5ee96..21f918111 100644 --- a/karate-demo/src/test/java/mock/proxy/DemoMockSslRunner.java +++ b/karate-demo/src/test/java/mock/proxy/DemoMockSslRunner.java @@ -3,7 +3,7 @@ import com.intuit.karate.Runner; import com.intuit.karate.Results; import com.intuit.karate.KarateOptions; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.AfterClass; import static org.junit.Assert.assertTrue; import org.junit.BeforeClass; diff --git a/karate-demo/src/test/java/mock/web/CatsMockStarter.java b/karate-demo/src/test/java/mock/web/CatsMockStarter.java index e8a227be3..453301119 100644 --- a/karate-demo/src/test/java/mock/web/CatsMockStarter.java +++ b/karate-demo/src/test/java/mock/web/CatsMockStarter.java @@ -1,6 +1,6 @@ package mock.web; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import org.junit.Test; /** diff --git a/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateAction.scala b/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateAction.scala index f9d18528e..e41becad9 100644 --- a/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateAction.scala +++ b/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateAction.scala @@ -5,7 +5,6 @@ import java.util.function.Consumer import akka.actor.ActorSystem import com.intuit.karate.core._ -import com.intuit.karate.runtime.ScenarioRuntime import com.intuit.karate.http.HttpRequest import com.intuit.karate.{PerfHook, Runner} import io.gatling.commons.stats.{KO, OK} diff --git a/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateProtocol.scala b/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateProtocol.scala index c3e469bc2..5a10fca7a 100644 --- a/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateProtocol.scala +++ b/karate-gatling/src/main/scala/com/intuit/karate/gatling/KarateProtocol.scala @@ -2,7 +2,7 @@ package com.intuit.karate.gatling import akka.actor.ActorSystem import com.intuit.karate.http.{HttpUtils, HttpRequest} -import com.intuit.karate.runtime.ScenarioRuntime +import com.intuit.karate.core.ScenarioRuntime import io.gatling.core.CoreComponents import io.gatling.core.config.GatlingConfiguration import io.gatling.core.protocol.{Protocol, ProtocolComponents, ProtocolKey} diff --git a/karate-gatling/src/test/scala/mock/MockUtils.java b/karate-gatling/src/test/scala/mock/MockUtils.java index f7f67c3ac..d5acf5f5b 100644 --- a/karate-gatling/src/test/scala/mock/MockUtils.java +++ b/karate-gatling/src/test/scala/mock/MockUtils.java @@ -1,7 +1,7 @@ package mock; import com.intuit.karate.PerfContext; -import com.intuit.karate.runtime.MockServer; +import com.intuit.karate.core.MockServer; import java.util.Collections; import java.util.Map; diff --git a/karate-junit4/src/main/java/com/intuit/karate/junit4/JunitHook.java b/karate-junit4/src/main/java/com/intuit/karate/junit4/JunitHook.java index 766022cb4..8c2f4caa1 100644 --- a/karate-junit4/src/main/java/com/intuit/karate/junit4/JunitHook.java +++ b/karate-junit4/src/main/java/com/intuit/karate/junit4/JunitHook.java @@ -27,9 +27,9 @@ import com.intuit.karate.core.Scenario; import com.intuit.karate.core.Step; import com.intuit.karate.core.StepResult; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.RuntimeHook; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.RuntimeHook; +import com.intuit.karate.core.ScenarioRuntime; import org.junit.runner.Description; import org.junit.runner.notification.Failure; import org.junit.runner.notification.RunNotifier; diff --git a/karate-junit4/src/main/java/com/intuit/karate/junit4/Karate.java b/karate-junit4/src/main/java/com/intuit/karate/junit4/Karate.java index 325df8f20..d272356cf 100644 --- a/karate-junit4/src/main/java/com/intuit/karate/junit4/Karate.java +++ b/karate-junit4/src/main/java/com/intuit/karate/junit4/Karate.java @@ -29,7 +29,7 @@ import com.intuit.karate.core.FeatureResult; import com.intuit.karate.core.HtmlFeatureReport; import com.intuit.karate.core.HtmlSummaryReport; -import com.intuit.karate.runtime.FeatureRuntime; +import com.intuit.karate.core.FeatureRuntime; import java.io.IOException; import java.util.List; import org.junit.Test; diff --git a/karate-junit5/src/main/java/com/intuit/karate/junit5/FeatureNode.java b/karate-junit5/src/main/java/com/intuit/karate/junit5/FeatureNode.java index 9da26c869..2b7f4d33e 100644 --- a/karate-junit5/src/main/java/com/intuit/karate/junit5/FeatureNode.java +++ b/karate-junit5/src/main/java/com/intuit/karate/junit5/FeatureNode.java @@ -28,9 +28,9 @@ import com.intuit.karate.core.FeatureResult; import com.intuit.karate.core.HtmlFeatureReport; import com.intuit.karate.core.HtmlSummaryReport; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.ScenarioGenerator; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.ScenarioGenerator; +import com.intuit.karate.core.ScenarioRuntime; import java.util.Iterator; import org.junit.jupiter.api.Assertions; diff --git a/karate-mock-servlet/src/main/java/com/intuit/karate/mock/servlet/MockHttpClient.java b/karate-mock-servlet/src/main/java/com/intuit/karate/mock/servlet/MockHttpClient.java index 4fd15303c..b8b38fcc7 100644 --- a/karate-mock-servlet/src/main/java/com/intuit/karate/mock/servlet/MockHttpClient.java +++ b/karate-mock-servlet/src/main/java/com/intuit/karate/mock/servlet/MockHttpClient.java @@ -24,8 +24,8 @@ package com.intuit.karate.mock.servlet; import com.intuit.karate.Logger; -import com.intuit.karate.runtime.Config; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.Config; +import com.intuit.karate.core.ScenarioEngine; import com.intuit.karate.http.HttpClient; import com.intuit.karate.http.HttpConstants; import com.intuit.karate.http.HttpLogger; diff --git a/karate-mock-servlet/src/test/java/demo/MockSpringMvcServlet.java b/karate-mock-servlet/src/test/java/demo/MockSpringMvcServlet.java index 0ad147998..b660fa0dc 100644 --- a/karate-mock-servlet/src/test/java/demo/MockSpringMvcServlet.java +++ b/karate-mock-servlet/src/test/java/demo/MockSpringMvcServlet.java @@ -24,7 +24,7 @@ package demo; import com.intuit.karate.mock.servlet.MockHttpClient; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import com.intuit.karate.http.HttpClient; import com.intuit.karate.http.HttpClientFactory; import javax.servlet.ServletConfig; diff --git a/karate-mock-servlet/src/test/java/mock/jersey/MockJerseyServlet.java b/karate-mock-servlet/src/test/java/mock/jersey/MockJerseyServlet.java index 0db164f01..4ce51b349 100644 --- a/karate-mock-servlet/src/test/java/mock/jersey/MockJerseyServlet.java +++ b/karate-mock-servlet/src/test/java/mock/jersey/MockJerseyServlet.java @@ -24,7 +24,7 @@ package mock.jersey; import com.intuit.karate.mock.servlet.MockHttpClient; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import com.intuit.karate.http.HttpClient; import com.intuit.karate.http.HttpClientFactory; import javax.servlet.Servlet; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/Element.java b/karate-robot/src/main/java/com/intuit/karate/robot/Element.java index ceb14fcd5..d1ad2bc29 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/Element.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/Element.java @@ -23,7 +23,7 @@ */ package com.intuit.karate.robot; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import java.util.List; import java.util.Map; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/Location.java b/karate-robot/src/main/java/com/intuit/karate/robot/Location.java index 95698b4a3..06416aed8 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/Location.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/Location.java @@ -23,7 +23,7 @@ */ package com.intuit.karate.robot; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import java.util.HashMap; import java.util.Map; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/Region.java b/karate-robot/src/main/java/com/intuit/karate/robot/Region.java index 4689ee975..e08a5910e 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/Region.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/Region.java @@ -23,7 +23,7 @@ */ package com.intuit.karate.robot; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import java.awt.Graphics; import java.awt.Image; import java.awt.Rectangle; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java b/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java index 34f2b2cea..e11a2066d 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/RobotBase.java @@ -23,14 +23,14 @@ */ package com.intuit.karate.robot; -import com.intuit.karate.runtime.Config; +import com.intuit.karate.core.Config; import com.intuit.karate.Logger; import com.intuit.karate.StringUtils; import com.intuit.karate.core.Plugin; import com.intuit.karate.driver.Keys; import com.intuit.karate.KarateException; -import com.intuit.karate.runtime.ScenarioEngine; -import com.intuit.karate.runtime.Variable; +import com.intuit.karate.core.ScenarioEngine; +import com.intuit.karate.core.Variable; import com.intuit.karate.shell.Command; import java.awt.Dimension; import java.awt.MouseInfo; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/RobotFactory.java b/karate-robot/src/main/java/com/intuit/karate/robot/RobotFactory.java index fc7a420af..c018c9a05 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/RobotFactory.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/RobotFactory.java @@ -29,7 +29,7 @@ import com.intuit.karate.robot.win.WinRobot; import java.util.Map; import com.intuit.karate.core.PluginFactory; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import java.util.HashMap; /** diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/linux/LinuxRobot.java b/karate-robot/src/main/java/com/intuit/karate/robot/linux/LinuxRobot.java index 93db63157..c276d0fcf 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/linux/LinuxRobot.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/linux/LinuxRobot.java @@ -28,7 +28,7 @@ import com.intuit.karate.robot.ImageElement; import com.intuit.karate.robot.RobotBase; import com.intuit.karate.robot.Window; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import com.intuit.karate.shell.Command; import java.util.Collections; import java.util.List; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/mac/MacRobot.java b/karate-robot/src/main/java/com/intuit/karate/robot/mac/MacRobot.java index b05ebd21e..7fb75e547 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/mac/MacRobot.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/mac/MacRobot.java @@ -28,7 +28,7 @@ import com.intuit.karate.robot.ImageElement; import com.intuit.karate.robot.RobotBase; import com.intuit.karate.robot.Window; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import com.intuit.karate.shell.Command; import java.util.Collections; import java.util.List; diff --git a/karate-robot/src/main/java/com/intuit/karate/robot/win/WinRobot.java b/karate-robot/src/main/java/com/intuit/karate/robot/win/WinRobot.java index b190e86a8..34439212c 100644 --- a/karate-robot/src/main/java/com/intuit/karate/robot/win/WinRobot.java +++ b/karate-robot/src/main/java/com/intuit/karate/robot/win/WinRobot.java @@ -30,7 +30,7 @@ import com.intuit.karate.robot.RobotBase; import com.intuit.karate.robot.StringMatcher; import com.intuit.karate.robot.Window; -import com.intuit.karate.runtime.ScenarioEngine; +import com.intuit.karate.core.ScenarioEngine; import com.sun.jna.platform.win32.BaseTSD.ULONG_PTR; import com.sun.jna.platform.win32.User32; diff --git a/karate-robot/src/test/java/robot/core/ChromeJavaRunner.java b/karate-robot/src/test/java/robot/core/ChromeJavaRunner.java index f4157e2a2..6592192b0 100755 --- a/karate-robot/src/test/java/robot/core/ChromeJavaRunner.java +++ b/karate-robot/src/test/java/robot/core/ChromeJavaRunner.java @@ -6,8 +6,8 @@ import com.intuit.karate.driver.Keys; import com.intuit.karate.robot.RobotBase; import com.intuit.karate.robot.RobotFactory; -import com.intuit.karate.runtime.FeatureRuntime; -import com.intuit.karate.runtime.ScenarioRuntime; +import com.intuit.karate.core.FeatureRuntime; +import com.intuit.karate.core.ScenarioRuntime; import org.junit.Test; /**