From 5b4d60146a98008132f28da1ea63c40023b239d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Kleinb=C3=B6lting?= Date: Fri, 2 Dec 2022 16:03:08 +0100 Subject: [PATCH] chore: Split long running integration tests and fast unit tests (DEV-1537) (#2315) Split tests into different source sets, so that long running integration tests are separated from faster unit tests. Make sbt it run all tests from all sbt sub projects from the IntegrationTest configuration in sequence. Make stb test run all tests from all sbt sub projects from the Test configuration in parallel. Run integration and unit tests in parallel Github Action build jobs. Move most tests to it source set and keep some zio-test unit tests in test source set. Fix schema-core to run tests by adding zio-test-sbt to its dependencies. Add documentation: README.md and internal docs. Issue Number: DEV-1537 Co-authored-by: irinaschubert --- .github/workflows/build-and-test.yml | 20 +++++- Makefile | 17 +++-- README.md | 17 ++++- build.sbt | 63 ++++++++----------- .../development/building-and-running.md | 2 +- docs/05-internals/development/testing.md | 54 ++++++++++------ .../schema/domain/SchemaCommandsSpec.scala | 2 +- project/Dependencies.scala | 43 +++++++------ .../fuseki-repository-config.ttl.template | 0 webapi/src/{test => it}/resources/fuseki.conf | 0 .../{test => it}/resources/logback-test.xml | 0 .../resources/sipi.docker-config.lua | 0 webapi/src/{test => it}/resources/test.conf | 0 .../scala/org/knora/webapi/CoreSpec.scala | 0 .../scala/org/knora/webapi/E2ESpec.scala | 0 .../org/knora/webapi/ITKnoraLiveSpec.scala | 0 .../scala/org/knora/webapi/R2RSpec.scala | 0 .../config/AppConfigForTestContainers.scala | 0 .../AppConfigForTestContainersZSpec.scala | 0 .../knora/webapi/core/ActorSystemTest.scala | 0 .../org/knora/webapi/core/LayersTest.scala | 0 .../knora/webapi/core/TestClientService.scala | 0 .../knora/webapi/core/TestStartupUtils.scala | 0 .../knora/webapi/e2e/CORSSupportE2ESpec.scala | 0 .../webapi/e2e/ClientTestDataCollector.scala | 0 .../knora/webapi/e2e/ExampleE2ESimSpec.scala | 0 .../webapi/e2e/ExceptionHandlerR2RSpec.scala | 0 .../knora/webapi/e2e/HealthRouteE2ESpec.scala | 0 .../knora/webapi/e2e/InstanceChecker.scala | 0 .../webapi/e2e/InstanceCheckerSpec.scala | 0 .../webapi/e2e/RejectingRouteE2ESpec.scala | 0 .../webapi/e2e/admin/FilesADME2ESpec.scala | 0 .../webapi/e2e/admin/GroupsADME2ESpec.scala | 0 .../e2e/admin/PermissionsADME2ESpec.scala | 0 .../webapi/e2e/admin/ProjectsADME2ESpec.scala | 0 .../webapi/e2e/admin/StoreADME2ESpec.scala | 0 .../webapi/e2e/admin/UsersADME2ESpec.scala | 0 .../CreateListItemsRouteADME2ESpec.scala | 0 .../DeleteListItemsRouteADME2ESpec.scala | 0 .../lists/GetListItemsRouteADME2ESpec.scala | 0 .../UpdateListItemsRouteADME2ESpec.scala | 0 .../e2e/http/ServerVersionE2ESpec.scala | 0 .../e2e/v1/AuthenticationV1E2ESpec.scala | 0 .../knora/webapi/e2e/v1/ErrorV1E2ESpec.scala | 0 .../e2e/v1/PermissionsHandlingV1E2ESpec.scala | 0 .../webapi/e2e/v1/ProjectsV1E2ESpec.scala | 0 .../webapi/e2e/v1/ResourcesV1R2RSpec.scala | 0 .../knora/webapi/e2e/v1/SearchV1R2RSpec.scala | 0 .../knora/webapi/e2e/v1/SipiV1R2RSpec.scala | 0 .../webapi/e2e/v1/StandoffV1R2RSpec.scala | 0 .../knora/webapi/e2e/v1/UsersV1E2ESpec.scala | 0 .../knora/webapi/e2e/v1/ValuesV1R2RSpec.scala | 0 .../e2e/v2/AuthenticationV2E2ESpec.scala | 0 .../e2e/v2/JSONLDHandlingV2R2RSpec.scala | 0 .../webapi/e2e/v2/ListsRouteV2R2RSpec.scala | 0 .../knora/webapi/e2e/v2/MarkupHeader.scala | 0 .../webapi/e2e/v2/OntologyV2R2RSpec.scala | 0 .../knora/webapi/e2e/v2/ProjectHeader.scala | 0 .../e2e/v2/ResourcesRouteV2E2ESpec.scala | 0 .../webapi/e2e/v2/ResponseCheckerV2.scala | 0 .../webapi/e2e/v2/ResponseCheckerV2Spec.scala | 0 .../knora/webapi/e2e/v2/SchemaHeader.scala | 0 .../webapi/e2e/v2/SearchRouteV2R2RSpec.scala | 0 .../webapi/e2e/v2/ValuesRouteV2E2ESpec.scala | 0 .../knora/webapi/e2e/v2/ValuesV2R2RSpec.scala | 0 .../webapi/http/version/BuildInfoSpec.scala | 0 .../http/version/ServerVersionSpec.scala | 0 .../knora/webapi/it/VersionRouteITSpec.scala | 0 .../webapi/it/v1/DrawingsGodsV1ITSpec.scala | 0 .../knora/webapi/it/v1/ErrorV1ITSpec.scala | 0 .../it/v1/KnoraSipiIntegrationV1ITSpec.scala | 0 .../it/v1/KnoraSipiPermissionsV1ITSpec.scala | 0 .../it/v2/KnoraSipiAuthenticationITSpec.scala | 0 .../it/v2/KnoraSipiIntegrationV2ITSpec.scala | 0 .../webapi/it/v2/StandoffRouteV2ITSpec.scala | 0 .../webapi/messages/StringFormatterSpec.scala | 0 .../listsmessages/ListsMessagesADMSpec.scala | 0 .../PermissionsMessagesADMSpec.scala | 0 .../ProjectsMessagesADMSpec.scala | 0 .../usersmessages/UsersMessagesADMSpec.scala | 0 .../TriplestoreMessagesSpec.scala | 0 .../util/CalendarDateUtilV2Spec.scala | 0 .../util/ConstructResponseUtilV2Spec.scala | 0 .../ConstructResponseUtilV2SpecFullData.scala | 0 .../webapi/messages/util/DateUtilV1Spec.scala | 0 .../messages/util/PermissionUtilADMSpec.scala | 0 .../messages/util/rdf/JsonLDUtilSpec.scala | 0 .../util/rdf/KnoraResponseV2Spec.scala | 0 .../messages/util/rdf/RdfFormatUtilSpec.scala | 0 .../messages/util/rdf/RdfModelSpec.scala | 0 .../util/rdf/ShaclValidatorSpec.scala | 0 .../util/search/SparqlTransformerSpec.scala | 0 .../gravsearch/GravsearchParserSpec.scala | 0 ...searchToCountPrequeryTransformerSpec.scala | 0 ...cGravsearchToPrequeryTransformerSpec.scala | 0 .../prequery/TopologicalSortUtilSpec.scala | 0 .../types/GravsearchTypeInspectorSpec.scala | 0 .../util/standoff/StandoffTagUtilV2Spec.scala | 0 .../util/standoff/XMLToStandoffUtilSpec.scala | 0 .../messages/util/standoff/XMLUtilSpec.scala | 0 .../PermissionMessagesV1Spec.scala | 0 .../sessionmessages/SessionMessagesV1.scala | 0 .../usermessages/UserMessagesV1Spec.scala | 0 .../InputOntologyV2Spec.scala | 0 .../ResourcesMessagesV2Spec.scala | 0 .../knora/webapi/models/OntologyModels.scala | 0 .../models/filemodels/FileModelUtil.scala | 0 .../webapi/models/filemodels/FileModels.scala | 0 .../models/filemodels/FileModelsSpec.scala | 0 .../standoffmodels/StandoffModels.scala | 0 .../standoffmodels/StandoffModelsSpec.scala | 0 .../other/v1/DrawingsGodsV1E2ESpec.scala | 0 .../webapi/other/v1/DrawingsGodsV1Spec.scala | 0 .../other/v2/LumieresLausanneV2E2ESpec.scala | 0 .../webapi/responders/IriLockerSpec.scala | 0 .../admin/GroupsResponderADMSpec.scala | 0 .../admin/ListsResponderADMSpec.scala | 0 .../admin/PermissionsResponderADMSpec.scala | 0 .../admin/ProjectsResponderADMSpec.scala | 0 .../admin/SipiResponderADMSpec.scala | 0 .../admin/UsersResponderADMSpec.scala | 0 .../responders/v1/ListsResponderV1Spec.scala | 0 .../v1/OntologyResponderV1Spec.scala | 0 .../v1/ProjectsResponderV1Spec.scala | 0 .../v1/ResourcesResponderV1Spec.scala | 0 .../ResourcesResponderV1SpecContextData.scala | 0 .../v1/ResourcesResponderV1SpecFullData.scala | 0 .../responders/v1/SearchResponderV1Spec.scala | 0 .../responders/v1/UsersResponderV1Spec.scala | 0 .../responders/v1/ValuesResponderV1Spec.scala | 0 .../responders/v2/ListsResponderV2Spec.scala | 0 .../v2/ListsResponderV2SpecFullData.scala | 0 .../v2/LoadOntologiesRequestV2Spec.scala | 0 .../v2/OntologyResponderV2Spec.scala | 0 .../responders/v2/ResourceUtilV2Spec.scala | 0 .../v2/ResourcesResponderV2Spec.scala | 0 .../v2/ResourcesResponderV2SpecFullData.scala | 0 .../v2/ResourcesResponseCheckerV2.scala | 0 .../v2/ResourcesResponseCheckerV2Spec.scala | 0 ...sourcesResponseCheckerV2SpecFullData.scala | 0 .../responders/v2/SearchResponderV2Spec.scala | 0 .../v2/SearchResponderV2SpecFullData.scala | 0 .../v2/StandoffResponderV2Spec.scala | 0 .../responders/v2/ValuesResponderV2Spec.scala | 0 .../AddCardinalitiesToClassSpec.scala | 0 .../responders/v2/ontology/CacheSpec.scala | 0 .../v2/ontology/CardinalitiesSpec.scala | 0 .../v2/ontology/OntologyHelpersSpec.scala | 0 .../webapi/routing/AuthenticatorSpec.scala | 0 .../knora/webapi/routing/JWTHelperSpec.scala | 0 .../SharedListsTestDataADM.scala | 0 .../SharedOntologyTestDataADM.scala | 0 .../SharedPermissionsTestData.scala | 0 .../sharedtestdata/SharedTestDataADM.scala | 0 .../sharedtestdata/SharedTestDataV1.scala | 0 .../store/cache/CacheServiceManagerSpec.scala | 0 .../store/cache/config/RedisTestConfig.scala | 0 .../cache/impl/CacheInMemImplZSpec.scala | 8 +-- .../cache/impl/CacheRedisImplZSpec.scala | 0 .../CacheSerializationZSpec.scala | 8 +-- .../store/iiif/impl/IIIFServiceMockImpl.scala | 0 .../TriplestoreServiceManagerSpec.scala | 0 ...lestoreServiceHttpConnectorImplZSpec.scala | 0 .../plugins/UpgradePluginPR1307Spec.scala | 0 .../plugins/UpgradePluginPR1322Spec.scala | 0 .../plugins/UpgradePluginPR1367Spec.scala | 0 .../plugins/UpgradePluginPR1372Spec.scala | 0 .../plugins/UpgradePluginPR1615Spec.scala | 0 .../plugins/UpgradePluginPR1746Spec.scala | 0 .../plugins/UpgradePluginPR1921Spec.scala | 0 .../plugins/UpgradePluginPR2018Spec.scala | 0 .../plugins/UpgradePluginPR2079Spec.scala | 0 .../plugins/UpgradePluginPR2081Spec.scala | 0 .../plugins/UpgradePluginPR2094Spec.scala | 0 .../plugins/UpgradePluginPR2255Spec.scala | 0 .../upgrade/plugins/UpgradePluginSpec.scala | 0 .../testcontainers/FusekiTestContainer.scala | 0 .../testcontainers/RedisTestContainer.scala | 0 .../testcontainers/SipiTestContainer.scala | 0 .../org/knora/webapi/util/AkkaHttpUtils.scala | 0 .../knora/webapi/util/MutableTestIri.scala | 0 .../knora/webapi/util/MutableTestString.scala | 0 .../knora/webapi/util/MutableUserADM.scala | 0 .../util/StringLiteralSequenceV2Spec.scala | 0 .../webapi/util/TestExtractorMethods.scala | 0 .../webapi/util/cache/CacheUtilSpec.scala | 0 .../knora/webapi/config/AppConfigZSpec.scala | 10 ++- ...raCardinalityInfoIsStricterThanZSpec.scala | 8 ++- .../util/ApacheLuceneSupportZSpec.scala | 6 +- .../util/Base64UrlCheckDigitZSpec.scala | 2 +- 190 files changed, 160 insertions(+), 100 deletions(-) rename webapi/src/{test => it}/resources/fuseki-repository-config.ttl.template (100%) rename webapi/src/{test => it}/resources/fuseki.conf (100%) rename webapi/src/{test => it}/resources/logback-test.xml (100%) rename webapi/src/{test => it}/resources/sipi.docker-config.lua (100%) rename webapi/src/{test => it}/resources/test.conf (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/CoreSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/ITKnoraLiveSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/config/AppConfigForTestContainers.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/core/ActorSystemTest.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/core/LayersTest.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/core/TestClientService.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/core/TestStartupUtils.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/InstanceChecker.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/AuthenticationV1E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/ErrorV1E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/PermissionsHandlingV1E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/ProjectsV1E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/UsersV1E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v1/ValuesV1R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/MarkupHeader.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ProjectHeader.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/SchemaHeader.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/http/version/BuildInfoSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/http/version/ServerVersionSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/VersionRouteITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v1/ErrorV1ITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v1/KnoraSipiPermissionsV1ITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/StringFormatterSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtilSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/v1/responder/permissionmessages/PermissionMessagesV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/v1/responder/sessionmessages/SessionMessagesV1.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/models/OntologyModels.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/models/filemodels/FileModels.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/other/v1/DrawingsGodsV1E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/other/v1/DrawingsGodsV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/other/v2/LumieresLausanneV2E2ESpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/IriLockerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/ListsResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecFullData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/SearchResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ListsResponderV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/LoadOntologiesRequestV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ResourceUtilV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/routing/AuthenticatorSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/routing/JWTHelperSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/cache/config/RedisTestConfig.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala (98%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/cache/impl/CacheRedisImplZSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala (95%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/TriplestoreServiceManagerSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceHttpConnectorImplZSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2255Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/testcontainers/FusekiTestContainer.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/testcontainers/RedisTestContainer.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/AkkaHttpUtils.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/MutableTestIri.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/MutableTestString.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/MutableUserADM.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/TestExtractorMethods.scala (100%) rename webapi/src/{test => it}/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala (100%) diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index a1a9cf9f5d..dc0ad14a62 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -14,7 +14,25 @@ jobs: - name: Run preparatory steps uses: dasch-swiss/dsp-api/.github/actions/preparation@main - name: Run all tests - run: make test + run: sbt -v coverage test coverageAggregate + - name: Upload coverage data to codacy + uses: codacy/codacy-coverage-reporter-action@v1 + with: + project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} + coverage-reports: ./target/scala-2.13/coverage-report/cobertura.xml + - name: Upload coverage data to codecov + uses: codecov/codecov-action@v3 + with: + files: ./target/scala-2.13/coverage-report/cobertura.xml + + integration-test: + name: Build and integration-test + runs-on: ubuntu-latest + steps: + - name: Run preparatory steps + uses: dasch-swiss/dsp-api/.github/actions/preparation@main + - name: Run all integration tests + run: make integration-test - name: Upload coverage data to codacy uses: codacy/codacy-coverage-reporter-action@v1 with: diff --git a/Makefile b/Makefile index 10c5150eae..76b9a524f3 100644 --- a/Makefile +++ b/Makefile @@ -185,7 +185,7 @@ stack-db-only: env-file ## starts only fuseki. client-test-data: export KNORA_WEBAPI_COLLECT_CLIENT_TEST_DATA := true client-test-data: build ## runs the dsp-api e2e and r2r tests and generates client-test-data. $(CURRENT_DIR)/webapi/scripts/zap-client-test-data.sh - sbt -v "webapi/testOnly *E2ESpec *R2RSpec" + sbt -v "webapi/IntegrationTest/testOnly *E2ESpec *R2RSpec" $(CURRENT_DIR)/webapi/scripts/zip-client-test-data.sh .PHONY: test-repository-upgrade @@ -201,12 +201,17 @@ test-repository-upgrade: build init-db-test-minimal ## runs DB upgrade integrati # after a certain time. at startup, data should be upgraded. @$(MAKE) -f $(THIS_FILE) stack-up +.PHONY: test-all +test-all: test integration-test + .PHONY: test -test: build test-shared test-user-slice test-role-slice test-project-slice ## runs all tests - sbt -v coverage "webapi/test" - sbt -v coverage "schemaCore/test" - sbt coverageAggregate - +test: ## runs all unit tests + sbt -v coverage test coverageAggregate + +.PHONY: integration-test +integration-test: docker-build-sipi-image ## runs all integration tests + sbt -v coverage "IntegrationTest/test" coverageAggregate + .PHONY: test-shared test-shared: ## tests the shared projects (build is not called from this target) sbt -v coverage "shared/test" diff --git a/README.md b/README.md index 24507ccd19..f3b22e83f3 100644 --- a/README.md +++ b/README.md @@ -94,10 +94,25 @@ make stack-down ### Run the automated tests +Automated tests are split into different source sets into slow running integration tests (i.e. tests which do IO or are +using [Testcontainers](https://www.testcontainers.org/)) and fast running unit tests. + +Run unit tests: + +```shell +sbt test +``` + +Run integration tests: + +```shell +make integration-test +``` + Run all tests: ```shell -make test +make test-all ``` ## Release Versioning Convention diff --git a/build.sbt b/build.sbt index 1716589386..9f6777a73e 100644 --- a/build.sbt +++ b/build.sbt @@ -2,13 +2,10 @@ import com.typesafe.sbt.SbtNativePackager.autoImport.NativePackagerHelper._ import com.typesafe.sbt.packager.docker.DockerPlugin.autoImport.{Docker, dockerRepository} import com.typesafe.sbt.packager.docker.{Cmd, ExecCmd} import org.knora.Dependencies - -import sbt._ import sbt.Keys.version -import sbt.librarymanagement.Resolver +import sbt._ import scala.language.postfixOps -import scala.sys.process.Process ////////////////////////////////////// // GLOBAL SETTINGS @@ -76,6 +73,7 @@ lazy val root: Project = Project(id = "root", file(".")) addCommandAlias("fmt", "; all root/scalafmtSbt root/scalafmtAll; root/scalafixAll") addCommandAlias("check", "; all root/scalafmtSbtCheck root/scalafmtCheckAll; root/scalafixAll --check") +addCommandAlias("it", "IntegrationTest/test") lazy val customScalacOptions = Seq( "-feature", @@ -103,8 +101,7 @@ lazy val sipi: Project = Project(id = "sipi", base = file("sipi")) Docker / dockerExposedPorts ++= Seq(1024), Docker / defaultLinuxInstallLocation := "/sipi", Universal / mappings ++= { - // copy the sipi/scripts folder - directory("sipi/scripts"), + directory("sipi/scripts") }, // use filterNot to return all items that do NOT meet the criteria dockerCommands := dockerCommands.value.filterNot { @@ -132,20 +129,31 @@ run / connectInput := true lazy val webApiCommonSettings = Seq( name := "webapi" ) +testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")) lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) .settings(buildSettings) + .settings( + inConfig(Test) { + Defaults.testSettings + }, + Test / testFrameworks := Seq(new TestFramework("zio.test.sbt.ZTestFramework")), + Test / fork := true, // run tests in a forked JVM + Test / testForkedParallel := true, // run tests in parallel + Test / parallelExecution := true, // run tests in parallel + libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies + ) .enablePlugins(SbtTwirl, JavaAppPackaging, DockerPlugin, GatlingPlugin, JavaAgent, BuildInfoPlugin) .settings( name := "webapi", resolvers ++= Seq( - Resolver.bintrayRepo("hseeberger", "maven"), - "Sonatype" at "https://oss.sonatype.org/content/repositories/snapshots" + "Sonatype OSS Snapshots" at "https://oss.sonatype.org/content/repositories/snapshots" ), - libraryDependencies ++= Dependencies.webapiLibraryDependencies + libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiTestDependencies ++ Dependencies.webapiIntegrationTestDependencies ) .settings( - inConfig(Test)(Defaults.testTasks ++ baseAssemblySettings) + inConfig(IntegrationTest)(Defaults.itSettings ++ Defaults.testTasks ++ baseAssemblySettings), + libraryDependencies ++= Dependencies.webapiDependencies ++ Dependencies.webapiIntegrationTestDependencies ) .settings( // add needed files to production jar @@ -160,12 +168,12 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) // use packaged jars (through packageBin) on classpaths instead of class directories for production Compile / exportJars := true, // add needed files to test jar - Test / packageBin / mappings ++= Seq( + IntegrationTest / packageBin / mappings ++= Seq( (rootBaseDir.value / "webapi" / "scripts" / "fuseki-repository-config.ttl.template") -> "webapi/scripts/fuseki-repository-config.ttl.template", // needed for initialization of triplestore (rootBaseDir.value / "sipi" / "config" / "sipi.docker-config.lua") -> "sipi/config/sipi.docker-config.lua" ), // use packaged jars (through packageBin) on classpaths instead of class directories for test - Test / exportJars := true + IntegrationTest / exportJars := true ) .settings( scalacOptions ++= Seq( @@ -178,19 +186,18 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) "-Wconf:src=target/.*:s", "-Wunused:imports" ), - logLevel := Level.Info, - run / javaOptions := webapiJavaRunOptions, + logLevel := Level.Info, javaAgents += Dependencies.aspectjweaver, - Test / fork := true, // run tests in a forked JVM - Test / testForkedParallel := false, // not run forked tests in parallel - Test / parallelExecution := false, // not run non-forked tests in parallel + IntegrationTest / fork := true, // run tests in a forked JVM + IntegrationTest / testForkedParallel := false, // not run forked tests in parallel + IntegrationTest / parallelExecution := false, // not run non-forked tests in parallel // Global / concurrentRestrictions += Tags.limit(Tags.Test, 1), // restrict the number of concurrently executing tests in all projects - Test / javaOptions ++= Seq("-Dconfig.resource=fuseki.conf") ++ webapiJavaTestOptions, + IntegrationTest / javaOptions += "-Dconfig.resource=fuseki.conf", // Test / javaOptions ++= Seq("-Dakka.log-config-on-start=on"), // prints out akka config // Test / javaOptions ++= Seq("-Dconfig.trace=loads"), // prints out config locations - Test / testOptions += Tests.Argument("-oDF"), // show full stack traces and test case durations + IntegrationTest / testOptions += Tests.Argument("-oDF"), // show full stack traces and test case durations // add test framework for running zio-tests - Test / testFrameworks ++= Seq(new TestFramework("zio.test.sbt.ZTestFramework")) + IntegrationTest / testFrameworks ++= Seq(new TestFramework("zio.test.sbt.ZTestFramework")) ) .settings( // prepare for publishing @@ -241,22 +248,6 @@ lazy val webapi: Project = Project(id = "webapi", base = file("webapi")) ) .dependsOn(shared, schemaCore) -lazy val webapiJavaRunOptions = Seq( - "-Xms1G", - "-Xmx1G", - "-Xss6M" -) - -lazy val webapiJavaTestOptions = Seq( - // "-showversion", - "-Xms1G", - "-Xmx1G" - // "-verbose:gc", - // "-XX:+UseG1GC", - // "-XX:MaxGCPauseMillis=500", - // "-XX:MaxMetaspaceSize=4096m" -) - ////////////////////////////////////// // DSP's new codebase ////////////////////////////////////// diff --git a/docs/05-internals/development/building-and-running.md b/docs/05-internals/development/building-and-running.md index 0fd9f986c5..6c9c0f9460 100644 --- a/docs/05-internals/development/building-and-running.md +++ b/docs/05-internals/development/building-and-running.md @@ -114,7 +114,7 @@ The docker plugin also allows for a number of other useful features, like inspec To run all test targets, use the following in the command line: ``` -$ make test +$ make test-all ``` To run a single test from the command line, for example `SearchV1R2RSpec`, diff --git a/docs/05-internals/development/testing.md b/docs/05-internals/development/testing.md index f06cfb9c0d..97df7d6e67 100644 --- a/docs/05-internals/development/testing.md +++ b/docs/05-internals/development/testing.md @@ -5,30 +5,46 @@ # Testing -## How to Write Unit Tests +## How to Write and Run Unit Tests -1) Inside a test, at the beginning, add the following (change the paths - to the test data as needed): +A test is not a [unit test](https://www.martinfowler.com/bliki/UnitTest.html) if: -```scala -val rdfDataObjects = List ( - RdfDataObject(path = "test_data/responders.v1.ValuesResponderV1Spec/incunabula-data.ttl", name = "http://www.knora.org/data/incunabula") -) -``` -The data will be automatically loaded before any tests are executed. These tests should be stored inside -the `src/test` folder hierarchy. +* It talks to the database +* It communicates across the network +* It touches the file system +* It can’t run at the same time as any of your other unit tests +* You have to do special things to your environment (such as editing config files) to run it -2) Call the test from terminal: +Unit tests live in the `src/test` folder of our sbt projects. +Run all unit tests from terminal: + +```shell +sbt test ``` -$ make test-unit -$ make test-e2e -``` -## How to Write Integration Tests +## How to Write and Run Integration Tests + +[Mostly you should consider writing unit tests](https://www.youtube.com/watch?v=VDfX44fZoMc). These can be executed fast and help developers more in their daily work. + +You might need to create an integration test because: -The only difference between Integration and Unit tests is the location -where they are stored and the way how they are called: +* The test needs to talk to a database +* It requires network +* It is slow and cannot run in parallel with other tests +* You have to do special things to the environment in order to run it + +In this case create it in the `src/it` source set of our projects. + +.NOTE +_Currently only the `webapi` project supports integration tests_ + +Run all integration tests from the terminal. + +```shell +make integration-test +``` -1) Store tests inside the `src/it` folder hierarchy. -2) Call the tests from the terminal: `make test-it` +.NOTE +_The integration tests currently depend on a locally published Sipi container. That is why we need to start +the `make` command and not `sbt it`._ diff --git a/dsp-schema/core/src/test/scala/dsp/schema/domain/SchemaCommandsSpec.scala b/dsp-schema/core/src/test/scala/dsp/schema/domain/SchemaCommandsSpec.scala index 6e7bc811e4..2061e04474 100644 --- a/dsp-schema/core/src/test/scala/dsp/schema/domain/SchemaCommandsSpec.scala +++ b/dsp-schema/core/src/test/scala/dsp/schema/domain/SchemaCommandsSpec.scala @@ -11,7 +11,7 @@ import dsp.valueobjects.LanguageCode import dsp.valueobjects.Schema /** - * This spec is used to test [[dsp.schema.domain.SchemaCommands]]. + * This spec is used to test [[dsp.schema.domain.SchemaCommandsSpec]]. */ object SchemaCommandsSpec extends ZIOSpecDefault { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dc749a5bfb..6767b00633 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -5,8 +5,7 @@ package org.knora -import sbt.Keys._ -import sbt.{Def, _} +import sbt._ object Dependencies { @@ -40,10 +39,12 @@ object Dependencies { val zioConfig = "dev.zio" %% "zio-config" % ZioConfigVersion val zioConfigMagnolia = "dev.zio" %% "zio-config-magnolia" % ZioConfigVersion val zioConfigTypesafe = "dev.zio" %% "zio-config-typesafe" % ZioConfigVersion - val zioTest = "dev.zio" %% "zio-test" % ZioVersion - val zioTestSbt = "dev.zio" %% "zio-test-sbt" % ZioVersion val zioMetricsConnectors = "dev.zio" %% "zio-metrics-connectors" % ZioMetricsConnectorsVersion + // zio-test and friends + val zioTest = "dev.zio" %% "zio-test" % ZioVersion + val zioTestSbt = "dev.zio" %% "zio-test-sbt" % ZioVersion + // akka val akkaActor = "com.typesafe.akka" %% "akka-actor" % AkkaActorVersion // Scala 3 compatible val akkaHttp = "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion // Scala 3 incompatible @@ -112,22 +113,33 @@ object Dependencies { // found/added by the plugin but deleted anyway val commonsLang3 = "org.apache.commons" % "commons-lang3" % "3.12.0" - val webapiLibraryDependencies = Seq( + val webapiIntegrationTestDependencies = Seq( + akkaHttpTestkit, + akkaStreamTestkit, + akkaTestkit, + gatlingHighcharts, + gatlingTestFramework, + rdf4jClient, + scalaTest, + testcontainers, + xmlunitCore, + zioTest, + zioTestSbt + ).map(_ % IntegrationTest) + + val webapiTestDependencies = Seq(zioTest, zioTestSbt).map(_ % Test) + + val webapiDependencies = Seq( akkaActor, akkaHttp, akkaHttpCors, akkaHttpSprayJson, akkaSlf4j, - akkaHttpTestkit % Test, akkaStream, - akkaStreamTestkit % Test, - akkaTestkit % Test, commonsValidator, commonsLang3, diff, ehcache, - gatlingHighcharts % Test, - gatlingTestFramework % Test, gwtServlet, icu4j, jacksonDatabind, @@ -139,19 +151,15 @@ object Dependencies { kamonCore, kamonScalaFuture, logbackClassic, - rdf4jClient % Test, rdf4jShacl, saxonHE, scalaGraph, scalaLogging, - scalaTest % Test, scallop, slf4jApi, springSecurityCore, bouncyCastle, - testcontainers % Test, titaniumJSONLD, - xmlunitCore % Test, zio, zioConfig, zioConfigMagnolia, @@ -162,9 +170,7 @@ object Dependencies { zioLoggingSlf4j, zioMacros, zioMetricsConnectors, - zioPrelude, - zioTest % Test, - zioTestSbt % Test + zioPrelude ) val valueObjectsLibraryDependencies = Seq( @@ -197,7 +203,8 @@ object Dependencies { val schemaCoreLibraryDependencies = Seq( zioPrelude, - zioTest % Test + zioTest % Test, + zioTestSbt % Test ) val schemaRepoLibraryDependencies = Seq() diff --git a/webapi/src/test/resources/fuseki-repository-config.ttl.template b/webapi/src/it/resources/fuseki-repository-config.ttl.template similarity index 100% rename from webapi/src/test/resources/fuseki-repository-config.ttl.template rename to webapi/src/it/resources/fuseki-repository-config.ttl.template diff --git a/webapi/src/test/resources/fuseki.conf b/webapi/src/it/resources/fuseki.conf similarity index 100% rename from webapi/src/test/resources/fuseki.conf rename to webapi/src/it/resources/fuseki.conf diff --git a/webapi/src/test/resources/logback-test.xml b/webapi/src/it/resources/logback-test.xml similarity index 100% rename from webapi/src/test/resources/logback-test.xml rename to webapi/src/it/resources/logback-test.xml diff --git a/webapi/src/test/resources/sipi.docker-config.lua b/webapi/src/it/resources/sipi.docker-config.lua similarity index 100% rename from webapi/src/test/resources/sipi.docker-config.lua rename to webapi/src/it/resources/sipi.docker-config.lua diff --git a/webapi/src/test/resources/test.conf b/webapi/src/it/resources/test.conf similarity index 100% rename from webapi/src/test/resources/test.conf rename to webapi/src/it/resources/test.conf diff --git a/webapi/src/test/scala/org/knora/webapi/CoreSpec.scala b/webapi/src/it/scala/org/knora/webapi/CoreSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/CoreSpec.scala rename to webapi/src/it/scala/org/knora/webapi/CoreSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala b/webapi/src/it/scala/org/knora/webapi/ITKnoraLiveSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/ITKnoraLiveSpec.scala rename to webapi/src/it/scala/org/knora/webapi/ITKnoraLiveSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala b/webapi/src/it/scala/org/knora/webapi/config/AppConfigForTestContainers.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/config/AppConfigForTestContainers.scala rename to webapi/src/it/scala/org/knora/webapi/config/AppConfigForTestContainers.scala diff --git a/webapi/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala b/webapi/src/it/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala rename to webapi/src/it/scala/org/knora/webapi/config/AppConfigForTestContainersZSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala b/webapi/src/it/scala/org/knora/webapi/core/ActorSystemTest.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/core/ActorSystemTest.scala rename to webapi/src/it/scala/org/knora/webapi/core/ActorSystemTest.scala diff --git a/webapi/src/test/scala/org/knora/webapi/core/LayersTest.scala b/webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/core/LayersTest.scala rename to webapi/src/it/scala/org/knora/webapi/core/LayersTest.scala diff --git a/webapi/src/test/scala/org/knora/webapi/core/TestClientService.scala b/webapi/src/it/scala/org/knora/webapi/core/TestClientService.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/core/TestClientService.scala rename to webapi/src/it/scala/org/knora/webapi/core/TestClientService.scala diff --git a/webapi/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala b/webapi/src/it/scala/org/knora/webapi/core/TestStartupUtils.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/core/TestStartupUtils.scala rename to webapi/src/it/scala/org/knora/webapi/core/TestStartupUtils.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/CORSSupportE2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala b/webapi/src/it/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/ClientTestDataCollector.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/ExampleE2ESimSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/ExceptionHandlerR2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/HealthRouteE2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala b/webapi/src/it/scala/org/knora/webapi/e2e/InstanceChecker.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/InstanceChecker.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/InstanceChecker.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/InstanceCheckerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/RejectingRouteE2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/FilesADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/GroupsADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/PermissionsADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/ProjectsADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/StoreADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/UsersADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/CreateListItemsRouteADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/DeleteListItemsRouteADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/GetListItemsRouteADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/admin/lists/UpdateListItemsRouteADME2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/http/ServerVersionE2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/AuthenticationV1E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/AuthenticationV1E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/AuthenticationV1E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/AuthenticationV1E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ErrorV1E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/ErrorV1E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/ErrorV1E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/ErrorV1E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/PermissionsHandlingV1E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/PermissionsHandlingV1E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/PermissionsHandlingV1E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/PermissionsHandlingV1E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ProjectsV1E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/ProjectsV1E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/ProjectsV1E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/ProjectsV1E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/ResourcesV1R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/SearchV1R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/SipiV1R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/StandoffV1R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/UsersV1E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/UsersV1E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/UsersV1E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/UsersV1E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v1/ValuesV1R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v1/ValuesV1R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v1/ValuesV1R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v1/ValuesV1R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/AuthenticationV2E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/JSONLDHandlingV2R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ListsRouteV2R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/MarkupHeader.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/MarkupHeader.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/MarkupHeader.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/MarkupHeader.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/OntologyV2R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ProjectHeader.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ProjectHeader.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ProjectHeader.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ProjectHeader.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ResourcesRouteV2E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ResponseCheckerV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/SchemaHeader.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/SchemaHeader.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/SchemaHeader.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/SchemaHeader.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/SearchRouteV2R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ValuesRouteV2E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala b/webapi/src/it/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala rename to webapi/src/it/scala/org/knora/webapi/e2e/v2/ValuesV2R2RSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/BuildInfoSpec.scala b/webapi/src/it/scala/org/knora/webapi/http/version/BuildInfoSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/http/version/BuildInfoSpec.scala rename to webapi/src/it/scala/org/knora/webapi/http/version/BuildInfoSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/http/version/ServerVersionSpec.scala b/webapi/src/it/scala/org/knora/webapi/http/version/ServerVersionSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/http/version/ServerVersionSpec.scala rename to webapi/src/it/scala/org/knora/webapi/http/version/ServerVersionSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/VersionRouteITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/VersionRouteITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/VersionRouteITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v1/DrawingsGodsV1ITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/ErrorV1ITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v1/ErrorV1ITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v1/ErrorV1ITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v1/ErrorV1ITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v1/KnoraSipiIntegrationV1ITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiPermissionsV1ITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v1/KnoraSipiPermissionsV1ITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v1/KnoraSipiPermissionsV1ITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v1/KnoraSipiPermissionsV1ITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v2/KnoraSipiAuthenticationITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v2/KnoraSipiIntegrationV2ITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala b/webapi/src/it/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala rename to webapi/src/it/scala/org/knora/webapi/it/v2/StandoffRouteV2ITSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/StringFormatterSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/StringFormatterSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/StringFormatterSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/admin/responder/listsmessages/ListsMessagesADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/admin/responder/permissionsmessages/PermissionsMessagesADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/admin/responder/projectsmessages/ProjectsMessagesADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/store/triplestoremessages/TriplestoreMessagesSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/CalendarDateUtilV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/ConstructResponseUtilV2SpecFullData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/DateUtilV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/PermissionUtilADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/rdf/JsonLDUtilSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/rdf/KnoraResponseV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/rdf/RdfFormatUtilSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/rdf/RdfModelSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/rdf/ShaclValidatorSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/search/SparqlTransformerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/GravsearchParserSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToCountPrequeryTransformerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/NonTriplestoreSpecificGravsearchToPrequeryTransformerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/prequery/TopologicalSortUtilSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/search/gravsearch/types/GravsearchTypeInspectorSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/standoff/StandoffTagUtilV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtilSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtilSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtilSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/standoff/XMLToStandoffUtilSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala b/webapi/src/it/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/util/standoff/XMLUtilSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/PermissionMessagesV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/v1/responder/permissionmessages/PermissionMessagesV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/v1/responder/permissionmessages/PermissionMessagesV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/v1/responder/permissionmessages/PermissionMessagesV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/sessionmessages/SessionMessagesV1.scala b/webapi/src/it/scala/org/knora/webapi/messages/v1/responder/sessionmessages/SessionMessagesV1.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/v1/responder/sessionmessages/SessionMessagesV1.scala rename to webapi/src/it/scala/org/knora/webapi/messages/v1/responder/sessionmessages/SessionMessagesV1.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/v2/responder/ontologymessages/InputOntologyV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/messages/v2/responder/resourcesmessages/ResourcesMessagesV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/models/OntologyModels.scala b/webapi/src/it/scala/org/knora/webapi/models/OntologyModels.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/models/OntologyModels.scala rename to webapi/src/it/scala/org/knora/webapi/models/OntologyModels.scala diff --git a/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala b/webapi/src/it/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala rename to webapi/src/it/scala/org/knora/webapi/models/filemodels/FileModelUtil.scala diff --git a/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala b/webapi/src/it/scala/org/knora/webapi/models/filemodels/FileModels.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModels.scala rename to webapi/src/it/scala/org/knora/webapi/models/filemodels/FileModels.scala diff --git a/webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala b/webapi/src/it/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala rename to webapi/src/it/scala/org/knora/webapi/models/filemodels/FileModelsSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala b/webapi/src/it/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala rename to webapi/src/it/scala/org/knora/webapi/models/standoffmodels/StandoffModels.scala diff --git a/webapi/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala b/webapi/src/it/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala rename to webapi/src/it/scala/org/knora/webapi/models/standoffmodels/StandoffModelsSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/other/v1/DrawingsGodsV1E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/other/v1/DrawingsGodsV1E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/other/v1/DrawingsGodsV1E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/other/v1/DrawingsGodsV1E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/other/v1/DrawingsGodsV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/other/v1/DrawingsGodsV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/other/v1/DrawingsGodsV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/other/v1/DrawingsGodsV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/other/v2/LumieresLausanneV2E2ESpec.scala b/webapi/src/it/scala/org/knora/webapi/other/v2/LumieresLausanneV2E2ESpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/other/v2/LumieresLausanneV2E2ESpec.scala rename to webapi/src/it/scala/org/knora/webapi/other/v2/LumieresLausanneV2E2ESpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/IriLockerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/IriLockerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/IriLockerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/admin/GroupsResponderADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/admin/ListsResponderADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/admin/PermissionsResponderADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/admin/ProjectsResponderADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/admin/SipiResponderADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/admin/UsersResponderADMSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ListsResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/ListsResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/ListsResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/ListsResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/OntologyResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/ProjectsResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/ResourcesResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecContextData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecFullData.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecFullData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecFullData.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/ResourcesResponderV1SpecFullData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/SearchResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/SearchResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/SearchResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/SearchResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/UsersResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v1/ValuesResponderV1Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ListsResponderV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ListsResponderV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ListsResponderV2SpecFullData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/LoadOntologiesRequestV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/LoadOntologiesRequestV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/LoadOntologiesRequestV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/LoadOntologiesRequestV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/OntologyResponderV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourceUtilV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ResourceUtilV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ResourceUtilV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ResourceUtilV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponderV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponderV2SpecFullData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ResourcesResponseCheckerV2SpecFullData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/SearchResponderV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/SearchResponderV2SpecFullData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/StandoffResponderV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ValuesResponderV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/AddCardinalitiesToClassSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/CacheSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/CardinalitiesSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala b/webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala rename to webapi/src/it/scala/org/knora/webapi/responders/v2/ontology/OntologyHelpersSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala b/webapi/src/it/scala/org/knora/webapi/routing/AuthenticatorSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/routing/AuthenticatorSpec.scala rename to webapi/src/it/scala/org/knora/webapi/routing/AuthenticatorSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/routing/JWTHelperSpec.scala b/webapi/src/it/scala/org/knora/webapi/routing/JWTHelperSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/routing/JWTHelperSpec.scala rename to webapi/src/it/scala/org/knora/webapi/routing/JWTHelperSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala b/webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala rename to webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedListsTestDataADM.scala diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala b/webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala rename to webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedOntologyTestDataADM.scala diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala b/webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala rename to webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedPermissionsTestData.scala diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala b/webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala rename to webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedTestDataADM.scala diff --git a/webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala b/webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala rename to webapi/src/it/scala/org/knora/webapi/sharedtestdata/SharedTestDataV1.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/cache/CacheServiceManagerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/cache/config/RedisTestConfig.scala b/webapi/src/it/scala/org/knora/webapi/store/cache/config/RedisTestConfig.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/cache/config/RedisTestConfig.scala rename to webapi/src/it/scala/org/knora/webapi/store/cache/config/RedisTestConfig.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala similarity index 98% rename from webapi/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala index d96ee3b878..967a86318e 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala +++ b/webapi/src/it/scala/org/knora/webapi/store/cache/impl/CacheInMemImplZSpec.scala @@ -5,10 +5,6 @@ package org.knora.webapi.store.cache.impl -import zio.ZLayer -import zio.test.Assertion._ -import zio.test._ - import dsp.errors.BadRequestException import dsp.valueobjects.V2UuidValidation import org.knora.webapi.messages.StringFormatter @@ -18,7 +14,9 @@ import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.messages.admin.responder.usersmessages.UserIdentifierADM import org.knora.webapi.sharedtestdata.SharedTestDataADM import org.knora.webapi.store.cache.api.CacheService -import org.knora.webapi.store.cache.impl.CacheServiceInMemImpl +import zio.ZLayer +import zio.test.Assertion._ +import zio.test._ /** * This spec is used to test [[org.knora.webapi.store.cache.impl.CacheServiceInMemImpl]]. diff --git a/webapi/src/test/scala/org/knora/webapi/store/cache/impl/CacheRedisImplZSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/cache/impl/CacheRedisImplZSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/cache/impl/CacheRedisImplZSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/cache/impl/CacheRedisImplZSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala similarity index 95% rename from webapi/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala index 9a0b575b35..ed7c3d294f 100644 --- a/webapi/src/test/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala +++ b/webapi/src/it/scala/org/knora/webapi/store/cache/serialization/CacheSerializationZSpec.scala @@ -5,14 +5,12 @@ package org.knora.webapi.store.cache.serialization -import zio.test.Assertion._ -import zio.test.TestAspect.ignore -import zio.test._ - import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM import org.knora.webapi.messages.admin.responder.usersmessages.UserADM import org.knora.webapi.sharedtestdata.SharedTestDataADM -import org.knora.webapi.store.cache.serialization.CacheSerialization +import zio.test.Assertion._ +import zio.test.TestAspect.ignore +import zio.test._ /** * This spec is used to test [[CacheSerialization]]. diff --git a/webapi/src/test/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala b/webapi/src/it/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala rename to webapi/src/it/scala/org/knora/webapi/store/iiif/impl/IIIFServiceMockImpl.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreServiceManagerSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/TriplestoreServiceManagerSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/TriplestoreServiceManagerSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/TriplestoreServiceManagerSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceHttpConnectorImplZSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceHttpConnectorImplZSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceHttpConnectorImplZSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/impl/TriplestoreServiceHttpConnectorImplZSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1307Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1322Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1367Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1372Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1615Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1746Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR1921Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2018Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2079Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2081Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2094Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2255Spec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2255Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2255Spec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginPR2255Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala b/webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala rename to webapi/src/it/scala/org/knora/webapi/store/triplestore/upgrade/plugins/UpgradePluginSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/testcontainers/FusekiTestContainer.scala b/webapi/src/it/scala/org/knora/webapi/testcontainers/FusekiTestContainer.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/testcontainers/FusekiTestContainer.scala rename to webapi/src/it/scala/org/knora/webapi/testcontainers/FusekiTestContainer.scala diff --git a/webapi/src/test/scala/org/knora/webapi/testcontainers/RedisTestContainer.scala b/webapi/src/it/scala/org/knora/webapi/testcontainers/RedisTestContainer.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/testcontainers/RedisTestContainer.scala rename to webapi/src/it/scala/org/knora/webapi/testcontainers/RedisTestContainer.scala diff --git a/webapi/src/test/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala b/webapi/src/it/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala rename to webapi/src/it/scala/org/knora/webapi/testcontainers/SipiTestContainer.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala b/webapi/src/it/scala/org/knora/webapi/util/AkkaHttpUtils.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/AkkaHttpUtils.scala rename to webapi/src/it/scala/org/knora/webapi/util/AkkaHttpUtils.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/MutableTestIri.scala b/webapi/src/it/scala/org/knora/webapi/util/MutableTestIri.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/MutableTestIri.scala rename to webapi/src/it/scala/org/knora/webapi/util/MutableTestIri.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/MutableTestString.scala b/webapi/src/it/scala/org/knora/webapi/util/MutableTestString.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/MutableTestString.scala rename to webapi/src/it/scala/org/knora/webapi/util/MutableTestString.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/MutableUserADM.scala b/webapi/src/it/scala/org/knora/webapi/util/MutableUserADM.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/MutableUserADM.scala rename to webapi/src/it/scala/org/knora/webapi/util/MutableUserADM.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala b/webapi/src/it/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala rename to webapi/src/it/scala/org/knora/webapi/util/StringLiteralSequenceV2Spec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/TestExtractorMethods.scala b/webapi/src/it/scala/org/knora/webapi/util/TestExtractorMethods.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/TestExtractorMethods.scala rename to webapi/src/it/scala/org/knora/webapi/util/TestExtractorMethods.scala diff --git a/webapi/src/test/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala b/webapi/src/it/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala similarity index 100% rename from webapi/src/test/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala rename to webapi/src/it/scala/org/knora/webapi/util/cache/CacheUtilSpec.scala diff --git a/webapi/src/test/scala/org/knora/webapi/config/AppConfigZSpec.scala b/webapi/src/test/scala/org/knora/webapi/config/AppConfigZSpec.scala index 1fdaf3b81f..80eb6edc38 100644 --- a/webapi/src/test/scala/org/knora/webapi/config/AppConfigZSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/config/AppConfigZSpec.scala @@ -1,7 +1,13 @@ +/* + * Copyright © 2021 - 2022 Swiss National Data and Service Center for the Humanities and/or DaSCH Service Platform contributors. + * SPDX-License-Identifier: Apache-2.0 + */ + package org.knora.webapi.config -import zio._ -import zio.test._ +import zio.ZIO +import zio.test.ZIOSpecDefault +import zio.test.assertTrue import java.util.concurrent.TimeUnit import scala.concurrent.duration.FiniteDuration diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraCardinalityInfoIsStricterThanZSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraCardinalityInfoIsStricterThanZSpec.scala index 9016469fc3..73bc0d49c1 100644 --- a/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraCardinalityInfoIsStricterThanZSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/messages/v2/responder/ontologymessages/KnoraCardinalityInfoIsStricterThanZSpec.scala @@ -5,9 +5,13 @@ package org.knora.webapi.messages.v2.responder.ontologymessages -import zio.test._ +import zio.test.ZIOSpecDefault +import zio.test.assertTrue -import dsp.schema.domain.Cardinality._ +import dsp.schema.domain.Cardinality.MayHaveMany +import dsp.schema.domain.Cardinality.MayHaveOne +import dsp.schema.domain.Cardinality.MustHaveOne +import dsp.schema.domain.Cardinality.MustHaveSome /** * Tests the comparison forstrictness of cardinalities with [[isStricterThan()]]. diff --git a/webapi/src/test/scala/org/knora/webapi/util/ApacheLuceneSupportZSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/ApacheLuceneSupportZSpec.scala index cd16de34d5..32fc2e6b73 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/ApacheLuceneSupportZSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/ApacheLuceneSupportZSpec.scala @@ -5,9 +5,11 @@ package org.knora.webapi.util -import zio._ +import zio.Scope +import zio.test.Spec +import zio.test.TestEnvironment import zio.test.ZIOSpecDefault -import zio.test._ +import zio.test.assertTrue object ApacheLuceneSupportZSpec extends ZIOSpecDefault { diff --git a/webapi/src/test/scala/org/knora/webapi/util/Base64UrlCheckDigitZSpec.scala b/webapi/src/test/scala/org/knora/webapi/util/Base64UrlCheckDigitZSpec.scala index eeb26d1cb1..d0f56e6ba4 100644 --- a/webapi/src/test/scala/org/knora/webapi/util/Base64UrlCheckDigitZSpec.scala +++ b/webapi/src/test/scala/org/knora/webapi/util/Base64UrlCheckDigitZSpec.scala @@ -6,7 +6,7 @@ package org.knora.webapi.util import zio.test.ZIOSpecDefault -import zio.test._ +import zio.test.assertTrue /** * Tests [[Base64UrlCheckDigit]].