build(model-server): integrate the model-server-test project into model-server

Author: Oleksandr Dzhychko

model-server-test/README.md

@@ -82,6 +82,8 @@ dependencies {
     testImplementation(libs.mockk)
     testImplementation(kotlin("test"))
     testImplementation(project(":modelql-untyped"))
+    testImplementation(libs.testcontainers)
+    testImplementation(libs.testcontainers.postgresql)
 }
 
 tasks.named<ShadowJar>("shadowJar") {

model-server-test/build.gradle.kts

@@ -13,11 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package org.modelix.model.server.store
+
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertDoesNotThrow
 import org.modelix.model.lazy.RepositoryId
-import org.modelix.model.server.store.IgniteStoreClient
-import org.modelix.model.server.store.ObjectInRepository
 import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.utility.DockerImageName
 import java.sql.Connection

model-server/build.gradle.kts

@@ -13,10 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+package org.modelix.model.server.store
+
 import org.modelix.model.lazy.RepositoryId
 import org.modelix.model.persistent.HashUtil
-import org.modelix.model.server.store.IgniteStoreClient
-import org.modelix.model.server.store.ObjectInRepository
 import org.testcontainers.containers.PostgreSQLContainer
 import org.testcontainers.utility.DockerImageName
 import org.testcontainers.utility.MountableFile

model-server-test/src/test/kotlin/IgnitePostgresRepositoryRemovalTest.kt renamed to model-server/src/test/kotlin/org/modelix/model/server/store/IgnitePostgresRepositoryRemovalTest.kt

@@ -27,7 +27,6 @@ include("model-server")
 include("model-server-openapi")
 include("model-server-api")
 include("model-server-lib")
-include("model-server-test")
 include("modelql-client")
 include("modelql-core")
 include("modelql-html")