Move unit tests to test source set

dasch-swiss · Dec 2, 2022 · 72047ef · 72047ef
1 parent a499317
commit 72047ef
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 34 deletions.
diff --git a/...tore/cache/impl/CacheInMemImplZSpec.scala → ...tore/cache/impl/CacheInMemImplZSpec.scala b/...tore/cache/impl/CacheInMemImplZSpec.scala → ...tore/cache/impl/CacheInMemImplZSpec.scala
@@ -1,24 +1,23 @@
-/*
- * 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.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
 import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectADM
-import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM._
+import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.IriIdentifier
+import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortcodeIdentifier
+import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.ShortnameIdentifier
+import org.knora.webapi.messages.admin.responder.projectsmessages.ProjectIdentifierADM.UuidIdentifier
 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.equalTo
+import zio.test.TestAspect
+import zio.test.ZIOSpecDefault
+import zio.test.assert
+import zio.test.assertTrue
 
 /**
  * This spec is used to test [[org.knora.webapi.store.cache.impl.CacheServiceInMemImpl]].

diff --git a/...rialization/CacheSerializationZSpec.scala → ...rialization/CacheSerializationZSpec.scala b/...rialization/CacheSerializationZSpec.scala → ...rialization/CacheSerializationZSpec.scala
@@ -1,18 +1,12 @@
-/*
- * 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.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.equalTo
+import zio.test.TestAspect.ignore
+import zio.test.ZIOSpecDefault
+import zio.test.assert
 
 /**
  * This spec is used to test [[CacheSerialization]].

diff --git a/...ebapi/util/ApacheLuceneSupportZSpec.scala → ...ebapi/util/ApacheLuceneSupportZSpec.scala b/...ebapi/util/ApacheLuceneSupportZSpec.scala → ...ebapi/util/ApacheLuceneSupportZSpec.scala
@@ -1,13 +1,10 @@
-/*
- * 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.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/...ebapi/util/Base64UrlCheckDigitZSpec.scala → ...ebapi/util/Base64UrlCheckDigitZSpec.scala b/...ebapi/util/Base64UrlCheckDigitZSpec.scala → ...ebapi/util/Base64UrlCheckDigitZSpec.scala
@@ -1,12 +1,7 @@
-/*
- * 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.util
 
 import zio.test.ZIOSpecDefault
-import zio.test._
+import zio.test.assertTrue
 
 /**
  * Tests [[Base64UrlCheckDigit]].