tests fix

Author: arkadius

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/testing/EventGeneratorSourceTestingApiHttpServiceSpec.scala

@@ -2,7 +2,6 @@ package pl.touk.nussknacker.ui.api.testing
 
 import com.typesafe.config.{Config, ConfigFactory}
 import io.circe.syntax.EncoderOps
-import pl.touk.nussknacker.engine.api.parameter.ParameterName
 import pl.touk.nussknacker.engine.build.ScenarioBuilder
 import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess
 import pl.touk.nussknacker.engine.graph.expression.Expression
@@ -49,23 +48,6 @@ trait EventGeneratorSourceTestingApiHttpServiceSpec extends ScenarioTestingApiHt
   override protected def validParameters: TestSourceParameters =
     TestSourceParameters(exampleScenarioSourceId, Map.empty)
 
-  override protected def invalidParameters: TestSourceParameters =
-    TestSourceParameters(exampleScenarioSourceId, Map(ParameterName("someParam") -> "0L".spel))
-
-  override protected def expectedValidationErrorsOnInvalidParametersJson: String =
-    """
-      |[
-      |  {
-      |    "typ": "RedundantParameters",
-      |    "message": "Redundant parameters",
-      |    "description": "Please omit redundant parameters: ParameterName(someParam)",
-      |    "fieldName": null,
-      |    "errorType": "SaveAllowed",
-      |    "details": null
-      |  }
-      |]
-      |""".stripMargin
-
   override protected def expectedTestParametersJson: String = {
     s"""
        |[

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/testing/GenericSourceWithCustomVariablesTestingApiHttpServiceSpec.scala

@@ -10,7 +10,9 @@ import pl.touk.nussknacker.ui.api.description.scenarioTesting.Dtos.ScenarioTestD
 import pl.touk.nussknacker.ui.api.description.scenarioTesting.Dtos.Validate.ScenarioTestValidationRequest
 import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter.toScenarioGraph
 
-class GenericSourceWithCustomVariablesTestingApiHttpServiceSpec extends ScenarioTestingApiHttpServiceSpec {
+class GenericSourceWithCustomVariablesTestingApiHttpServiceSpec
+    extends ScenarioTestingApiHttpServiceSpec
+    with WithAdHocInvalidParametersTestsLogic {
 
   override protected def exampleScenarioSourceId = "sourceId"
 

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/testing/ScenarioTestingApiHttpServiceSpec.scala

@@ -41,7 +41,6 @@ trait ScenarioTestingApiHttpServiceSpec
     with NuRestAssureMatchers
     with RestAssuredVerboseLoggingIfValidationFails
     with PatientScalaFutures
-    with WithAdHocTestParameters
     with WithAdHocTestsLogic {
 
   import pl.touk.nussknacker.engine.spel.SpelExtension._
@@ -364,9 +363,6 @@ trait ScenarioTestingApiHttpServiceSpec
     "return no errors on valid parameters" in {
       shouldValidateParametersProperly()
     }
-    "return errors if passed parameter is not valid" in {
-      shouldReturnErrorsForInvalidParameters()
-    }
   }
 
   "The endpoint for adhoc test run should" - {
@@ -392,15 +388,6 @@ trait ScenarioTestingApiHttpServiceSpec
        |  "numberOfSamples": $numberOfSamples
        |}""".stripMargin
 
-  private def capabilitiesResponse(
-      scenarioGraphStr: String,
-      numberOfSamples: Int,
-  ) =
-    s"""{
-       |  "scenarioGraph": $scenarioGraphStr,
-       |  "numberOfSamples": $numberOfSamples
-       |}""".stripMargin
-
   private def canonicalGraphStr(canonical: CanonicalProcess) =
     Encoder[ScenarioGraph].apply(CanonicalProcessConverter.toScenarioGraph(canonical)).toString()
 }

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/testing/SchemalessKafkaJsonTypeTests.scala

@@ -47,7 +47,7 @@ import pl.touk.nussknacker.ui.api.testing.SchemalessKafkaJsonTypeTests.{
   sinkTopicName,
   sourceTopicName,
   variablesNodeName,
-  WithSchemalessAdHocTestParameters
+  WithSchemalessAdHocTestsLogic
 }
 import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter
 import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter.toScenarioGraph
@@ -64,7 +64,8 @@ class SchemalessKafkaJsonTypeTests
     with RestAssuredVerboseLoggingIfValidationFails
     with PatientScalaFutures
     with WithAdHocTestsLogic
-    with WithSchemalessAdHocTestParameters
+    with WithSchemalessAdHocTestsLogic
+    with WithAdHocInvalidParametersTestsLogic
     with WithDockerContainers
     with ForAllTestContainer
     with StrictLogging {
@@ -197,7 +198,10 @@ class SchemalessKafkaJsonTypeTests
 
 object SchemalessKafkaJsonTypeTests {
 
-  private[SchemalessKafkaJsonTypeTests] trait WithSchemalessAdHocTestParameters extends WithAdHocTestParameters {
+  private[SchemalessKafkaJsonTypeTests] trait WithSchemalessAdHocTestsLogic
+      extends WithAdHocTestsLogic
+      with WithAdHocInvalidParametersTestsLogic {
+    self: WithSimplifiedConfigScenarioHelper with NuItTest =>
 
     override protected def exampleScenarioSourceId: String = "start"
 

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/testing/WithAdHocInvalidParametersTestsLogic.scala

@@ -0,0 +1,45 @@
+package pl.touk.nussknacker.ui.api.testing
+
+import io.circe.syntax.EncoderOps
+import io.restassured.RestAssured.`given`
+import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse
+import pl.touk.nussknacker.test.NuRestAssureExtensions.{AppConfiguration, EqualsJsonBody, JsonBody}
+import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper}
+import pl.touk.nussknacker.test.processes.WithScenarioActivitySpecAsserts.UsersBasicAuth
+import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.TestSourceParameters
+import pl.touk.nussknacker.ui.api.description.scenarioTesting.Dtos.ScenarioTestData
+import pl.touk.nussknacker.ui.api.description.scenarioTesting.Dtos.Validate.ScenarioTestValidationRequest
+
+trait WithAdHocInvalidParametersTestsLogic {
+  self: WithAdHocTestsLogic with WithSimplifiedConfigScenarioHelper with NuItTest =>
+
+  def shouldReturnErrorsForInvalidParameters(): Unit = {
+    val request = ScenarioTestValidationRequest(
+      exampleScenarioGraph,
+      ScenarioTestData.WithParameters(invalidParameters),
+    ).asJson.toString()
+
+    given()
+      .applicationState {
+        createSavedScenario(exampleScenario)
+      }
+      .when()
+      .basicAuthAllPermUser()
+      .jsonBody(request)
+      .post(s"$nuDesignerHttpAddress/api/scenarioTesting/${exampleScenario.name}/validate")
+      .Then()
+      .statusCode(200)
+      .equalsJsonBody(
+        s"""{
+           |    "validationErrors": $expectedValidationErrorsOnInvalidParametersJson,
+           |    "validationPerformed": true
+           |}
+           |""".stripMargin
+      )
+  }
+
+  protected def invalidParameters: TestSourceParameters
+
+  protected def expectedValidationErrorsOnInvalidParametersJson: String
+
+}

designer/server/src/test/scala/pl/touk/nussknacker/ui/api/testing/WithAdHocTestParameters.scala

@@ -4,15 +4,19 @@ import io.circe.syntax.EncoderOps
 import io.restassured.RestAssured.`given`
 import io.restassured.module.scala.RestAssuredSupport.AddThenToResponse
 import org.hamcrest.Matchers.equalTo
+import pl.touk.nussknacker.engine.api.graph.ScenarioGraph
+import pl.touk.nussknacker.engine.canonicalgraph.CanonicalProcess
 import pl.touk.nussknacker.test.NuRestAssureExtensions.{AppConfiguration, EqualsJsonBody, JsonBody}
 import pl.touk.nussknacker.test.base.it.{NuItTest, WithSimplifiedConfigScenarioHelper}
 import pl.touk.nussknacker.test.processes.WithScenarioActivitySpecAsserts.UsersBasicAuth
+import pl.touk.nussknacker.ui.api.description.NodesApiEndpoints.Dtos.TestSourceParameters
 import pl.touk.nussknacker.ui.api.description.scenarioTesting.Dtos.ScenarioTestData
 import pl.touk.nussknacker.ui.api.description.scenarioTesting.Dtos.Validate.ScenarioTestValidationRequest
+import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter
 import pl.touk.nussknacker.ui.process.marshall.CanonicalProcessConverter.toScenarioGraph
 
 trait WithAdHocTestsLogic {
-  self: WithAdHocTestParameters with WithSimplifiedConfigScenarioHelper with NuItTest =>
+  self: WithSimplifiedConfigScenarioHelper with NuItTest =>
 
   def shouldValidateParametersProperly(): Unit = {
     val request = ScenarioTestValidationRequest(
@@ -38,31 +42,6 @@ trait WithAdHocTestsLogic {
       )
   }
 
-  def shouldReturnErrorsForInvalidParameters(): Unit = {
-    val request = ScenarioTestValidationRequest(
-      exampleScenarioGraph,
-      ScenarioTestData.WithParameters(invalidParameters),
-    ).asJson.toString()
-
-    given()
-      .applicationState {
-        createSavedScenario(exampleScenario)
-      }
-      .when()
-      .basicAuthAllPermUser()
-      .jsonBody(request)
-      .post(s"$nuDesignerHttpAddress/api/scenarioTesting/${exampleScenario.name}/validate")
-      .Then()
-      .statusCode(200)
-      .equalsJsonBody(
-        s"""{
-           |    "validationErrors": $expectedValidationErrorsOnInvalidParametersJson,
-           |    "validationPerformed": true
-           |}
-           |""".stripMargin
-      )
-  }
-
   def shouldProperlyRunAdHocTest(): Unit = {
     given()
       .applicationState {
@@ -109,4 +88,16 @@ trait WithAdHocTestsLogic {
        |    }
        |}""".stripMargin
 
+  protected def exampleScenarioSourceId: String
+
+  protected def exampleScenario: CanonicalProcess
+
+  protected def validParameters: TestSourceParameters
+
+  protected def parametersProvidedForDryRun: String
+
+  protected def expectedTestParametersJson: String
+
+  protected def exampleScenarioGraph: ScenarioGraph = CanonicalProcessConverter.toScenarioGraph(exampleScenario)
+
 }