For #5274, #2547, #5493: tests, various fixes

orbeon · Oct 19, 2024 · 7e30aaa · 7e30aaa
1 parent 5074afd
commit 7e30aaa
Show file tree

Hide file tree

Showing 16 changed files with 1,107 additions and 55 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,4 +28,14 @@ package-lock.json
 # SQLite file used for tests
 form-runner/test-db.sqlite
 # jenv
-.java-version
+.java-version
+# JS dev
+.angular
+node_modules/
+package-lock.json
+angular/dist/
+angular-test/dist/
+react/dist/
+react-test/dist/
+# FormMetadataApiTest
+src/test/resources/properties-form-metadata-api-test.xml
diff --git a/form-runner/jvm/src/db/scala/org/orbeon/oxf/fr/persistence/adt/Forms.scala b/form-runner/jvm/src/db/scala/org/orbeon/oxf/fr/persistence/adt/Forms.scala
@@ -93,7 +93,12 @@ case class FormWithData(
 
   val appForm : AppForm  = appFormVersion._1
   val version : Version  = Specific(appFormVersion._2)
-  val testForm: TestForm = TestForm(appForm, title, controls = Seq(TestForm.Control("control label")))
+  val testForm: TestForm = TestForm(
+    appForm          = appForm,
+    titlesByLanguage = Map("en" -> title),
+    controls         = Seq(TestForm.Control("control label")),
+    operations       = None
+  )
 
   def save(): FormWithData = {
     testForm.putFormDefinition(version)

diff --git a/form-runner/jvm/src/db/scala/org/orbeon/oxf/fr/persistence/http/HttpCall.scala b/form-runner/jvm/src/db/scala/org/orbeon/oxf/fr/persistence/http/HttpCall.scala
@@ -114,22 +114,22 @@ private[persistence] object HttpCall {
       }
     )
 
-  def assertCall(
-    actualRequest            : SolicitedRequest,
-    assertResponse           : Response => Unit)(implicit
-    logger                   : IndentedLogger,
-    externalContext          : ExternalContext,
-    coreCrossPlatformSupport : CoreCrossPlatformSupportTrait
-  ): Unit = {
+  def request[T](
+    solicitedRequest        : SolicitedRequest,
+    responseProcessor       : Response => T)(implicit
+    logger                  : IndentedLogger,
+    externalContext         : ExternalContext,
+    coreCrossPlatformSupport: CoreCrossPlatformSupportTrait
+  ): T = {
     useAndClose(
       request(
-        path        = actualRequest.path,
-        method      = actualRequest.method,
-        version     = actualRequest.version,
-        stage       = actualRequest.stage,
-        body        = actualRequest.body,
-        credentials = actualRequest.credentials,
-        timeout     = actualRequest.timeout
+        path        = solicitedRequest.path,
+        method      = solicitedRequest.method,
+        version     = solicitedRequest.version,
+        stage       = solicitedRequest.stage,
+        body        = solicitedRequest.body,
+        credentials = solicitedRequest.credentials,
+        timeout     = solicitedRequest.timeout
       )
     ) { closableHttpResponse =>
 
@@ -147,10 +147,19 @@ private[persistence] object HttpCall {
         }
       )
 
-      assertResponse(response)
+      responseProcessor(response)
     }
   }
 
+  def assertCall(
+    actualRequest            : SolicitedRequest,
+    assertResponse           : Response => Unit)(implicit
+    logger                   : IndentedLogger,
+    externalContext          : ExternalContext,
+    coreCrossPlatformSupport : CoreCrossPlatformSupportTrait
+  ): Unit =
+    request(actualRequest, assertResponse)
+
   private def request(
     path                     : String,
     method                   : HttpMethod,
@@ -225,11 +234,11 @@ private[persistence] object HttpCall {
   }
 
   val DefaultFormName = "my-form"
-  def crudURLPrefix         (appForm: AppForm): String                                       = s"crud/${appForm.app}/${appForm.form}/"
-  def crudURLPrefix         (provider: Provider, formName: String = DefaultFormName): String = crudURLPrefix(AppForm(provider.entryName, formName))
-  def searchURLPrefix       (provider: Provider, formName: String = DefaultFormName): String = s"search/${provider.entryName}/$formName"
-  def metadataURL           (provider: Provider, formName: String = DefaultFormName): String = s"form/${provider.entryName}/$formName"
-  def distinctValueURLPrefix(provider: Provider, formName: String = DefaultFormName): String = s"distinct-values/${provider.entryName}/$formName"
+  def crudURLPrefix   (appForm: AppForm): String                                       = s"crud/${appForm.app}/${appForm.form}/"
+  def crudURLPrefix   (provider: Provider, formName: String = DefaultFormName): String = crudURLPrefix(AppForm(provider.entryName, formName))
+  def searchURL       (provider: Provider, formName: String = DefaultFormName): String = s"search/${provider.entryName}/$formName"
+  def formMetadataURL (provider: Provider, formName: String = DefaultFormName): String = s"form/${provider.entryName}/$formName"
+  def distinctValueURL(provider: Provider, formName: String = DefaultFormName): String = s"distinct-values/${provider.entryName}/$formName"
 
   def post(
     url                      : String,

diff --git a/form-runner/jvm/src/db/scala/org/orbeon/oxf/fr/persistence/test/DistinctValuesTest.scala b/form-runner/jvm/src/db/scala/org/orbeon/oxf/fr/persistence/test/DistinctValuesTest.scala
@@ -167,7 +167,7 @@ class DistinctValuesTest
 
         testForm.putFormData(version, formData)
 
-        val url = HttpCall.distinctValueURLPrefix(provider)
+        val url = HttpCall.distinctValueURL(provider)
 
         eventually(timeout(Span(10, Seconds)), interval(Span(1, Second))) {