Commit 616934ce authored by Igor Demin's avatar Igor Demin

Move some files from jvmTest to awtTest

Because they depend on AWT classes.

jvmTest is shared between AWT and Android implementations
parent bd79451a
...@@ -7,7 +7,7 @@ import org.junit.Test ...@@ -7,7 +7,7 @@ import org.junit.Test
import java.awt.Font import java.awt.Font
import java.awt.GraphicsEnvironment import java.awt.GraphicsEnvironment
class AwtFontInterop { class AwtFontInteropTest {
private val fontManager = AwtFontManager() private val fontManager = AwtFontManager()
private fun assumeOk() { private fun assumeOk() {
......
package org.jetbrains.skiko.tests.org.jetbrains.skiko package org.jetbrains.skiko
import org.jetbrains.skia.* import org.jetbrains.skia.*
import org.jetbrains.skiko.toBitmap
import org.jetbrains.skiko.toBufferedImage
import org.junit.Test import org.junit.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
class ConvertorsTests { class ConvertorsTest {
@Test @Test
fun canConvertBitmapToBufferedImage() { fun canConvertBitmapToBufferedImage() {
......
...@@ -5,7 +5,6 @@ import java.net.URL ...@@ -5,7 +5,6 @@ import java.net.URL
import java.net.URLClassLoader import java.net.URLClassLoader
import java.nio.file.Paths import java.nio.file.Paths
import kotlin.concurrent.thread import kotlin.concurrent.thread
import kotlin.test.Ignore
private class PlatformAndURLClassLoader(classpath: List<URL>) : private class PlatformAndURLClassLoader(classpath: List<URL>) :
ClassLoader(getPlatformClassLoader()) { ClassLoader(getPlatformClassLoader()) {
...@@ -69,7 +68,7 @@ private fun newInstance(loader: ClassLoader, fqName: String, vararg args: Any): ...@@ -69,7 +68,7 @@ private fun newInstance(loader: ClassLoader, fqName: String, vararg args: Any):
.newInstance(*args) .newInstance(*args)
} }
class SeveralClassloaders { class SeveralClassloadersTest {
@Test @Test
fun `load skiko in several classloaders (with skiko path)`() { fun `load skiko in several classloaders (with skiko path)`() {
check(skikoLibraryPath != null) check(skikoLibraryPath != null)
......
package org.jetbrains.skiko.util package org.jetbrains.skiko.util
import org.jetbrains.skia.Image import org.jetbrains.skia.Image
import org.jetbrains.skiko.OS
import org.jetbrains.skiko.hostOs
import org.jetbrains.skiko.toImage import org.jetbrains.skiko.toImage
import org.junit.rules.TestRule import org.junit.rules.TestRule
import org.junit.runner.Description import org.junit.runner.Description
...@@ -10,7 +8,6 @@ import org.junit.runners.model.Statement ...@@ -10,7 +8,6 @@ import org.junit.runners.model.Statement
import java.awt.Rectangle import java.awt.Rectangle
import java.awt.Robot import java.awt.Robot
import java.io.File import java.io.File
import javax.imageio.ImageIO
// WARNING!!! // WARNING!!!
// macOS has wrong colors ([128, 128, 128] isn't [128, 128, 128] on screenshot). Only white, black, red and green are correct. // macOS has wrong colors ([128, 128, 128] isn't [128, 128, 128] on screenshot). Only white, black, red and green are correct.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment