* Fix - expected change to fix jacoco report issue and better package…

… name and location.
AbsaOSS · Oct 13, 2023 · aca8587 · aca8587
1 parent f353d54
commit aca8587
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/testApi/src/main/scala/africa/absa/testing/scapi/json/ReferenceResolver.scala b/testApi/src/main/scala/africa/absa/testing/scapi/json/ReferenceResolver.scala
@@ -16,7 +16,7 @@
 
 package africa.absa.testing.scapi.json
 
-import africa.absa.testing.scapi.rest.response.`enum`.ResponseActionGroupType.ResponseActionGroupType
+import africa.absa.testing.scapi.rest.response.action.types.ResponseActionGroupType.ResponseActionGroupType
 import africa.absa.testing.scapi.utils.cache.RuntimeCache
 import africa.absa.testing.scapi.{PropertyNotFoundException, UndefinedConstantsInPropertiesException}
 

diff --git a/testApi/src/main/scala/africa/absa/testing/scapi/json/factory/SuiteFactory.scala b/testApi/src/main/scala/africa/absa/testing/scapi/json/factory/SuiteFactory.scala
@@ -24,7 +24,7 @@ import africa.absa.testing.scapi.model._
 import africa.absa.testing.scapi.model.suite.{Method, TestSet, AfterTestSet, SuitePreAndPostProcessing, BeforeTestSet, Suite, SuiteTestScenario}
 import africa.absa.testing.scapi.rest.request.{RequestBody, RequestHeaders, RequestParams}
 import africa.absa.testing.scapi.rest.response.Response
-import africa.absa.testing.scapi.rest.response.`enum`.ResponseActionGroupType
+import africa.absa.testing.scapi.rest.response.action.types.ResponseActionGroupType
 import africa.absa.testing.scapi.utils.file.{FileUtils, JsonUtils}
 import spray.json._
 

diff --git a/testApi/src/main/scala/africa/absa/testing/scapi/rest/response/Response.scala b/testApi/src/main/scala/africa/absa/testing/scapi/rest/response/Response.scala
@@ -19,7 +19,7 @@ package africa.absa.testing.scapi.rest.response
 import africa.absa.testing.scapi.json.ResponseAction
 import africa.absa.testing.scapi.logging.Logger
 import africa.absa.testing.scapi.rest.model.CookieValue
-import africa.absa.testing.scapi.rest.response.`enum`.ResponseActionGroupType
+import africa.absa.testing.scapi.rest.response.action.types.ResponseActionGroupType
 import africa.absa.testing.scapi.rest.response.action.{AssertionResponseAction, ExtractJsonResponseAction, LogResponseAction}
 
 import scala.util.{Failure, Success, Try}

diff --git a/...c/main/scala/africa/absa/testing/scapi/rest/response/action/AssertionResponseAction.scala b/...c/main/scala/africa/absa/testing/scapi/rest/response/action/AssertionResponseAction.scala
@@ -18,7 +18,7 @@ package africa.absa.testing.scapi.rest.response.action
 
 import africa.absa.testing.scapi.json.ResponseAction
 import africa.absa.testing.scapi.logging.Logger
-import africa.absa.testing.scapi.rest.response.`enum`.AssertResponseActionType._
+import africa.absa.testing.scapi.rest.response.action.types.AssertResponseActionType._
 import africa.absa.testing.scapi.rest.response.Response
 import africa.absa.testing.scapi.utils.validation.ContentValidator
 import africa.absa.testing.scapi.{AssertionException, UndefinedResponseActionTypeException}

diff --git a/...main/scala/africa/absa/testing/scapi/rest/response/action/ExtractJsonResponseAction.scala b/...main/scala/africa/absa/testing/scapi/rest/response/action/ExtractJsonResponseAction.scala
@@ -18,7 +18,7 @@ package africa.absa.testing.scapi.rest.response.action
 
 import africa.absa.testing.scapi.json.ResponseAction
 import africa.absa.testing.scapi.logging.Logger
-import africa.absa.testing.scapi.rest.response.`enum`.ExtractJsonResponseActionType._
+import africa.absa.testing.scapi.rest.response.action.types.ExtractJsonResponseActionType._
 import africa.absa.testing.scapi.rest.response.Response
 import africa.absa.testing.scapi.utils.cache.RuntimeCache
 import africa.absa.testing.scapi.utils.validation.ContentValidator

diff --git a/...Api/src/main/scala/africa/absa/testing/scapi/rest/response/action/LogResponseAction.scala b/...Api/src/main/scala/africa/absa/testing/scapi/rest/response/action/LogResponseAction.scala
@@ -18,7 +18,7 @@ package africa.absa.testing.scapi.rest.response.action
 
 import africa.absa.testing.scapi.json.ResponseAction
 import africa.absa.testing.scapi.logging.Logger
-import africa.absa.testing.scapi.rest.response.`enum`.LogResponseActionType._
+import africa.absa.testing.scapi.rest.response.action.types.LogResponseActionType._
 import africa.absa.testing.scapi.rest.response.Response
 import africa.absa.testing.scapi.utils.validation.ContentValidator
 import africa.absa.testing.scapi.{PropertyNotFoundException, UndefinedResponseActionTypeException}

diff --git a/...ponse/enum/AssertResponseActionType.scala → ...tion/types/AssertResponseActionType.scala b/...ponse/enum/AssertResponseActionType.scala → ...tion/types/AssertResponseActionType.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package africa.absa.testing.scapi.rest.response.`enum`
+package africa.absa.testing.scapi.rest.response.action.types
 
 import scala.language.implicitConversions
 

diff --git a/.../enum/ExtractJsonResponseActionType.scala → ...types/ExtractJsonResponseActionType.scala b/.../enum/ExtractJsonResponseActionType.scala → ...types/ExtractJsonResponseActionType.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package africa.absa.testing.scapi.rest.response.`enum`
+package africa.absa.testing.scapi.rest.response.action.types
 
 import scala.language.implicitConversions
 

diff --git a/...response/enum/LogResponseActionType.scala → .../action/types/LogResponseActionType.scala b/...response/enum/LogResponseActionType.scala → .../action/types/LogResponseActionType.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package africa.absa.testing.scapi.rest.response.`enum`
+package africa.absa.testing.scapi.rest.response.action.types
 
 import scala.language.implicitConversions
 

diff --git a/...sponse/enum/ResponseActionGroupType.scala → ...ction/types/ResponseActionGroupType.scala b/...sponse/enum/ResponseActionGroupType.scala → ...ction/types/ResponseActionGroupType.scala
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package africa.absa.testing.scapi.rest.response.`enum`
+package africa.absa.testing.scapi.rest.response.action.types
 
 object ResponseActionGroupType extends Enumeration {
   val ASSERT, EXTRACT_JSON, LOG = Value

diff --git a/testApi/src/test/scala/africa/absa/testing/scapi/rest/response/ResponseAssertionsTest.scala b/testApi/src/test/scala/africa/absa/testing/scapi/rest/response/ResponseAssertionsTest.scala
@@ -18,8 +18,8 @@ package africa.absa.testing.scapi.rest.response
 
 import africa.absa.testing.scapi.json.ResponseAction
 import africa.absa.testing.scapi.rest.model.CookieValue
-import africa.absa.testing.scapi.rest.response.`enum`.{AssertResponseActionType, ResponseActionGroupType}
 import africa.absa.testing.scapi.rest.response.action.AssertionResponseAction
+import africa.absa.testing.scapi.rest.response.action.types.{AssertResponseActionType, ResponseActionGroupType}
 import africa.absa.testing.scapi.{ContentValidationFailedException, UndefinedResponseActionTypeException}
 import munit.FunSuite
 

diff --git a/testApi/src/test/scala/africa/absa/testing/scapi/rest/response/ResponseExtractTest.scala b/testApi/src/test/scala/africa/absa/testing/scapi/rest/response/ResponseExtractTest.scala
@@ -18,8 +18,8 @@ package africa.absa.testing.scapi.rest.response
 
 import africa.absa.testing.scapi.{ContentValidationFailedException, UndefinedResponseActionTypeException}
 import africa.absa.testing.scapi.json.ResponseAction
-import africa.absa.testing.scapi.rest.response.`enum`.{ExtractJsonResponseActionType, ResponseActionGroupType}
 import africa.absa.testing.scapi.rest.response.action.ExtractJsonResponseAction
+import africa.absa.testing.scapi.rest.response.action.types.{ExtractJsonResponseActionType, ResponseActionGroupType}
 import africa.absa.testing.scapi.utils.cache.RuntimeCache
 import munit.FunSuite
 

diff --git a/testApi/src/test/scala/africa/absa/testing/scapi/rest/response/ResponseLogTest.scala b/testApi/src/test/scala/africa/absa/testing/scapi/rest/response/ResponseLogTest.scala
@@ -17,8 +17,8 @@
 package africa.absa.testing.scapi.rest.response
 
 import africa.absa.testing.scapi.json.ResponseAction
-import africa.absa.testing.scapi.rest.response.`enum`.{ResponseActionGroupType, LogResponseActionType => LogType}
 import africa.absa.testing.scapi.rest.response.action.LogResponseAction
+import africa.absa.testing.scapi.rest.response.action.types.{ResponseActionGroupType, LogResponseActionType => LogType}
 import munit.FunSuite
 
 

diff --git a/testApi/src/test/scala/africa/absa/testing/scapi/suite/runner/SuiteRunnerTest.scala b/testApi/src/test/scala/africa/absa/testing/scapi/suite/runner/SuiteRunnerTest.scala
@@ -22,7 +22,7 @@ import africa.absa.testing.scapi.model._
 import africa.absa.testing.scapi.model.suite._
 import africa.absa.testing.scapi.rest.RestClient
 import africa.absa.testing.scapi.rest.request.RequestHeaders
-import africa.absa.testing.scapi.rest.response.`enum`.{AssertResponseActionType, ResponseActionGroupType}
+import africa.absa.testing.scapi.rest.response.action.types.{AssertResponseActionType, ResponseActionGroupType}
 import africa.absa.testing.scapi.utils.cache.RuntimeCache
 import munit.FunSuite
 import org.apache.logging.log4j.Level