Move some files from jvmTest to awtTest and from jvmMain to awtMain (#571)

* Move some files from jvmTest to awtTest

Because they depend on AWT classes.

jvmTest is shared between AWT and Android implementations

(cherry picked from commit 616934c)

* Move jvmMain -> awtMain

Author: igordmn

skiko/build.gradle.kts

@@ -658,15 +658,15 @@ fun createObjcCompileTask(
     dependsOn(skiaJvmBindingsDir)
 
     val srcDirs = projectDirs(
-        "src/jvmMain/objectiveC/${os.id}"
+        "src/awtMain/objectiveC/${os.id}"
     )
     sourceRoots.set(srcDirs)
     val jdkHome = File(System.getProperty("java.home") ?: error("'java.home' is null"))
 
     includeHeadersNonRecursive(jdkHome.resolve("include"))
     includeHeadersNonRecursive(jdkHome.resolve("include/darwin"))
     includeHeadersNonRecursive(skiaHeadersDirs(skiaJvmBindingsDir.get()))
-    includeHeadersNonRecursive(projectDir.resolve("src/jvmMain/cpp/include"))
+    includeHeadersNonRecursive(projectDir.resolve("src/awtMain/cpp/include"))
     includeHeadersNonRecursive(projectDir.resolve("src/commonMain/cpp/common/include"))
 
     compiler.set("clang")
@@ -778,12 +778,14 @@ fun createCompileJvmBindingsTask(
     val srcDirs = projectDirs(
         "src/commonMain/cpp/common",
         "src/jvmMain/cpp/common",
-        "src/jvmMain/cpp/${targetOs.id}",
+        "src/awtMain/cpp/common",
+        "src/awtMain/cpp/${targetOs.id}",
         "src/jvmTest/cpp"
     )
     sourceRoots.set(srcDirs)
     if (targetOs != OS.Android) includeHeadersNonRecursive(jdkHome.resolve("include"))
     includeHeadersNonRecursive(skiaHeadersDirs(skiaJvmBindingsDir.get()))
+    includeHeadersNonRecursive(projectDir.resolve("src/awtMain/cpp/include"))
     includeHeadersNonRecursive(projectDir.resolve("src/jvmMain/cpp/include"))
     includeHeadersNonRecursive(projectDir.resolve("src/commonMain/cpp/common/include"))
 

skiko/src/jvmMain/cpp/include/exceptions_handler.h renamed to skiko/src/awtMain/cpp/include/exceptions_handler.h

@@ -7,7 +7,7 @@ import org.junit.Test
 import java.awt.Font
 import java.awt.GraphicsEnvironment
 
-class AwtFontInterop {
+class AwtFontInteropTest {
     private val fontManager = AwtFontManager()
 
     private fun assumeOk() {

skiko/src/jvmMain/cpp/include/jni_helpers.h renamed to skiko/src/awtMain/cpp/include/jni_helpers.h

@@ -1,12 +1,10 @@
-package org.jetbrains.skiko.tests.org.jetbrains.skiko
+package org.jetbrains.skiko
 
 import org.jetbrains.skia.*
-import org.jetbrains.skiko.toBitmap
-import org.jetbrains.skiko.toBufferedImage
 import org.junit.Test
 import kotlin.test.assertEquals
 
-class ConvertorsTests {
+class ConvertorsTest {
 
     @Test
     fun canConvertBitmapToBufferedImage() {

skiko/src/jvmMain/cpp/include/window_util.h renamed to skiko/src/awtMain/cpp/include/window_util.h

@@ -5,7 +5,6 @@ import java.net.URL
 import java.net.URLClassLoader
 import java.nio.file.Paths
 import kotlin.concurrent.thread
-import kotlin.test.Ignore
 
 private class PlatformAndURLClassLoader(classpath: List<URL>) :
     ClassLoader(getPlatformClassLoader()) {
@@ -69,7 +68,7 @@ private fun newInstance(loader: ClassLoader, fqName: String, vararg args: Any):
         .newInstance(*args)
 }
 
-class SeveralClassloaders {
+class SeveralClassloadersTest {
     @Test
     fun `load skiko in several classloaders (with skiko path)`()  {
         check(skikoLibraryPath != null)

skiko/src/jvmMain/cpp/include/xrandr_utils.h renamed to skiko/src/awtMain/cpp/include/xrandr_utils.h

@@ -1,16 +1,13 @@
 package org.jetbrains.skiko.util
 
 import org.jetbrains.skia.Image
-import org.jetbrains.skiko.OS
-import org.jetbrains.skiko.hostOs
 import org.jetbrains.skiko.toImage
 import org.junit.rules.TestRule
 import org.junit.runner.Description
 import org.junit.runners.model.Statement
 import java.awt.Rectangle
 import java.awt.Robot
 import java.io.File
-import javax.imageio.ImageIO
 
 // WARNING!!!
 // macOS has wrong colors ([128, 128, 128] isn't [128, 128, 128] on screenshot). Only white, black, red and green are correct.