Merge pull request #30 from code-star/fix-project-structure

Fixed project structure

Author: Hayena

.github/workflows/build-and-test.yml

@@ -9,7 +9,7 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Run Gradle
-      run: ./gradlew :backend:clean backend:test
+      run: ./gradlew :backend:clean :backend:test
 
   frontend:
     name: "frontend / Build and test"
@@ -29,5 +29,5 @@ jobs:
     steps:
     - uses: actions/checkout@v1
     - name: Run Gradle
-      run: ./gradlew data:clean data:test
+      run: ./gradlew :data:clean :data:test
 

backend/build.gradle.kts

@@ -61,9 +61,3 @@ dependencies {
     testImplementation("io.ktor:ktor-server-tests:$ktor_version")
     testImplementation("io.kotlintest:kotlintest-runner-junit5:3.3.0")
 }
-
-kotlin.sourceSets["main"].kotlin.srcDirs("src")
-kotlin.sourceSets["test"].kotlin.srcDirs("test")
-
-project.the<SourceSetContainer>()["main"].resources.srcDirs("resources")
-project.the<SourceSetContainer>()["test"].resources.srcDirs("testresources")

backend/src/nl/codestar/interchange/Application.kt renamed to backend/src/main/kotlin/nl/codestar/interchange/Application.kt

@@ -11,4 +11,11 @@ allprojects {
     maven { url = uri("https://kotlin.bintray.com/ktor") }
     maven { url = uri("https://plugins.gradle.org/m2/") }
   }
+
+  tasks.withType<Test> {
+    useJUnitPlatform()
+    testLogging {
+      events("passed", "failed", "skipped")
+    }
+  }
 }

backend/src/nl/codestar/interchange/KinesisStringConsumer.kt renamed to backend/src/main/kotlin/nl/codestar/interchange/KinesisStringConsumer.kt

@@ -56,10 +56,5 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-serialization-runtime:$serialization_version")
     implementation("io.ktor:ktor-client-apache:$ktor_version")
     testImplementation("io.ktor:ktor-server-tests:$ktor_version")
+    testImplementation("io.kotlintest:kotlintest-runner-junit5:3.4.2")
 }
-
-kotlin.sourceSets["main"].kotlin.srcDirs("src")
-kotlin.sourceSets["test"].kotlin.srcDirs("test")
-
-sourceSets["main"].resources.srcDirs("resources")
-sourceSets["test"].resources.srcDirs("testresources")

backend/src/nl/codestar/interchange/KinesisStringProducer.kt renamed to backend/src/main/kotlin/nl/codestar/interchange/KinesisStringProducer.kt

@@ -1,11 +1,11 @@
 package nl.codestar.interchange.domain
 
-import kotlinx.serialization.dumps
+import io.kotlintest.specs.StringSpec
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
 import kotlin.test.*
 
-class GraphTest {
+class GraphTest : StringSpec({
     val nodes = listOf(
         Node(Position("50", "100")),
         Node(Position("150", "200")),
@@ -21,8 +21,7 @@ class GraphTest {
 
     val json = Json(JsonConfiguration.Stable.copy(strictMode = false))
 
-    @Test
-    fun testSerialization() {
+    "serialization should work correctly" {
         val expected = """
             {
                 "nodes": [
@@ -44,4 +43,4 @@ class GraphTest {
             serialized
         )
     }
-}
+})