Skip to content

Commit

Permalink
[rewrite] #1281 cleaning up packages esp test folders
Browse files Browse the repository at this point in the history
  • Loading branch information
ptrthomas committed Nov 16, 2020
1 parent a16eb25 commit 8917984
Show file tree
Hide file tree
Showing 263 changed files with 264 additions and 343 deletions.
4 changes: 2 additions & 2 deletions karate-core/src/main/java/com/intuit/karate/Http.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion karate-core/src/main/java/com/intuit/karate/JsonUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion karate-core/src/main/java/com/intuit/karate/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion karate-core/src/main/java/com/intuit/karate/PerfHook.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
Expand Down
6 changes: 3 additions & 3 deletions karate-core/src/main/java/com/intuit/karate/Runner.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.*;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions karate-core/src/main/java/com/intuit/karate/SuiteRuntime.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
*/
package com.intuit.karate.core;

import com.intuit.karate.runtime.ScenarioEngine;
import java.util.Map;

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

/**
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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();
Expand All @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading

0 comments on commit 8917984

Please sign in to comment.