groovy runner: remove createWithDelegatingEnabled

Author: MykolaGolubyev

webtau-groovy/src/main/groovy/org/testingisdocumenting/webtau/cfg/GroovyRunner.groovy

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2021 webtau maintainers
  * Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,10 +24,6 @@ import java.nio.file.Path
 class GroovyRunner {
     private static final List<String> staticImports = ["org.testingisdocumenting.webtau.WebTauGroovyDsl"]
 
-    static GroovyScriptEngine createWithDelegatingEnabled(Path workingDir) {
-        return GroovyStandaloneEngine.createWithDelegatingEnabled(workingDir, staticImports)
-    }
-
     static GroovyScriptEngine createWithoutDelegating(Path workingDir) {
         return GroovyStandaloneEngine.createWithoutDelegating(workingDir, staticImports)
     }

webtau-groovy/src/main/groovy/org/testingisdocumenting/webtau/cli/WebTauCliApp.groovy

@@ -122,7 +122,7 @@ class WebTauCliApp implements TestListener, ReportGenerator {
             }
 
             testFiles.forEach {
-                runner.process(it, this)
+                runner.process(it)
             }
 
             code()
@@ -144,7 +144,7 @@ class WebTauCliApp implements TestListener, ReportGenerator {
         registerListenersAndHandlers()
 
         runner = new StandaloneTestRunner(
-                GroovyRunner.createWithDelegatingEnabled(cfg.workingDir),
+                GroovyRunner.createWithoutDelegating(cfg.workingDir),
                 cfg.getWorkingDir())
 
         WebTauGroovyDsl.initWithTestRunner(runner)

webtau-groovy/src/main/groovy/org/testingisdocumenting/webtau/cli/repl/InteractiveTests.groovy

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2021 webtau maintainers
  * Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,7 +39,7 @@ class InteractiveTests {
 
     List<StandaloneTest> refreshScenarios(String filePath) {
         runner.clearRegisteredTests()
-        runner.process(new TestFile(Paths.get(filePath)), this)
+        runner.process(new TestFile(Paths.get(filePath)))
 
         def withError = runner.tests.find { it.hasError() }
         if (withError) {

webtau-groovy/src/test/groovy/org/testingisdocumenting/webtau/cli/repl/ReplCommandsTest.groovy

@@ -50,13 +50,13 @@ class ReplCommandsTest implements StepReporter, ConsoleOutput {
     void init() {
         def workingDir = Paths.get("").toAbsolutePath()
         def runner = new StandaloneTestRunner(
-                GroovyRunner.createWithDelegatingEnabled(workingDir),
+                GroovyRunner.createWithoutDelegating(workingDir),
                 workingDir)
 
         WebTauGroovyDsl.initWithTestRunner(runner)
 
-        runner.process(new TestFile(Paths.get("src/test/resources/repl/doNothingScenariosOne.groovy")), this)
-        runner.process(new TestFile(Paths.get("src/test/resources/repl/doNothingScenariosTwo.groovy")), this)
+        runner.process(new TestFile(Paths.get("src/test/resources/repl/doNothingScenariosOne.groovy")))
+        runner.process(new TestFile(Paths.get("src/test/resources/repl/doNothingScenariosTwo.groovy")))
 
         repl = new Repl(runner)
 

webtau-standalone-runner-groovy/src/main/groovy/org/testingisdocumenting/webtau/runner/standalone/GroovyStandaloneEngine.groovy

@@ -1,4 +1,5 @@
 /*
+ * Copyright 2021 webtau maintainers
  * Copyright 2019 TWO SIGMA OPEN SOURCE, LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -22,10 +23,6 @@ import org.codehaus.groovy.control.customizers.ImportCustomizer
 import java.nio.file.Path
 
 class GroovyStandaloneEngine {
-    static GroovyScriptEngine createWithDelegatingEnabled(Path workingDir, List<String> staticImports) {
-        return createImpl(workingDir, staticImports, DelegatingScript.class)
-    }
-
     static GroovyScriptEngine createWithoutDelegating(Path workingDir, List<String> staticImports) {
         return createImpl(workingDir, staticImports, null)
     }

webtau-standalone-runner-groovy/src/main/groovy/org/testingisdocumenting/webtau/runner/standalone/StandaloneTestRunner.groovy

@@ -63,7 +63,7 @@ class StandaloneTestRunner {
         this.isTerminated = new AtomicBoolean(false)
     }
 
-    void process(TestFile testFile, delegate) {
+    void process(TestFile testFile) {
         Path scriptPath = testFile.path
         currentTestPath = scriptPath.isAbsolute() ? scriptPath : workingDir.resolve(scriptPath)
         currentTestMetadata.set(new WebTauTestMetadata())
@@ -73,8 +73,6 @@ class StandaloneTestRunner {
 
         def scriptParseTest = new StandaloneTest(workingDir, currentTestPath, currentShortContainerId, "parse/init", { ->
             def script = groovy.createScript(relativeToWorkDirPath.toString(), new Binding())
-
-            script.setDelegate(delegate)
             script.run()
         })
 

webtau-standalone-runner-groovy/src/test/groovy/org/testingisdocumenting/webtau/runner/standalone/StandaloneTestRunnerTest.groovy

@@ -297,7 +297,7 @@ class StandaloneTestRunnerTest {
 
             def afterAllTest = runner.webTauTestList.get(3)
             afterAllTest.scenario.should == 'after all tests'
-            afterAllTest.isSynthetic.should == true
+            afterAllTest.synthetic.should == true
             afterAllTest.shortContainerId.should == 'Teardown'
             afterAllTest.exception.message.should == 'test error message'
         }
@@ -323,11 +323,12 @@ class StandaloneTestRunnerTest {
 
     private static StandaloneTestRunner createRunner(String... scenarioFiles) {
         def workingDir = Paths.get("test-scripts")
-        def runner = new StandaloneTestRunner(GroovyStandaloneEngine.createWithDelegatingEnabled(workingDir,
+        def runner = new StandaloneTestRunner(
+                GroovyStandaloneEngine.createWithoutDelegating(workingDir,
                 ["org.testingisdocumenting.webtau.runner.standalone.StandaloneTestRunnerTestStaticImport"]), workingDir)
 
         StandaloneTestRunnerTestStaticImport.runner = runner
-        scenarioFiles.each { runner.process(new TestFile(Paths.get(it)), this) }
+        scenarioFiles.each { runner.process(new TestFile(Paths.get(it))) }
 
         return runner
     }