From 9b38e5e7b5dfcfbe0964df4354d5a40ab40eaa9a Mon Sep 17 00:00:00 2001 From: Ilya Gorbunov Date: Thu, 25 Jan 2018 23:28:32 +0300 Subject: [PATCH] stdlib tests: move JVM-only test source files --- .../stdlib/{ => jvm}/test/ExceptionJVMTest.kt | 0 .../test/collections/CollectionJVMTest.kt | 0 .../test/collections/IterableJVMTests.kt | 0 .../test/collections/IteratorsJVMTest.kt | 0 .../{ => jvm}/test/collections/MapJVMTest.kt | 0 .../collections/MutableCollectionsJVMTest.kt | 0 .../test/collections/SequenceJVMTest.kt | 0 .../{ => jvm}/test/concurrent/ThreadTest.kt | 0 .../{ => jvm}/test/concurrent/TimerTest.kt | 0 libraries/stdlib/{ => jvm}/test/io/Console.kt | 0 .../stdlib/{ => jvm}/test/io/FileTreeWalks.kt | 0 libraries/stdlib/{ => jvm}/test/io/Files.kt | 0 libraries/stdlib/{ => jvm}/test/io/IOStreams.kt | 0 libraries/stdlib/{ => jvm}/test/io/ReadWrite.kt | 0 .../{ => jvm}/test/io/SerializableTest.kt | 0 libraries/stdlib/{ => jvm}/test/js/StubsJVM.kt | 0 .../{ => jvm}/test/numbers/BigNumbersTest.kt | 0 .../numbers/CompanionIntrinsicObjectsJVMTest.kt | 0 .../{ => jvm}/test/numbers/MathJVMTest.kt | 0 .../{ => jvm}/test/numbers/NumbersJVMTest.kt | 0 .../delegation/lazy/LazyValuesJVMTest.kt | 0 .../test/ranges/RangeIterationJVMTest.kt | 0 .../test/reflection/AnnotationsTest.kt | 0 libraries/stdlib/{ => jvm}/test/testUtilsJVM.kt | 0 .../stdlib/{ => jvm}/test/text/CharJVMTest.kt | 0 .../stdlib/{ => jvm}/test/text/RegexJVMTest.kt | 0 .../{ => jvm}/test/text/StringBuilderJVMTest.kt | 0 .../stdlib/{ => jvm}/test/text/StringJVMTest.kt | 0 .../test/text/StringNumberConversionJVMTest.kt | 0 .../{ => jvm}/test/utils/AssertionsJVMTest.kt | 0 .../stdlib/{ => jvm}/test/utils/LazyJVMTest.kt | 0 .../test/language/EscapedTestNamesTest.kt | 17 ----------------- 32 files changed, 17 deletions(-) rename libraries/stdlib/{ => jvm}/test/ExceptionJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/collections/CollectionJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/collections/IterableJVMTests.kt (100%) rename libraries/stdlib/{ => jvm}/test/collections/IteratorsJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/collections/MapJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/collections/MutableCollectionsJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/collections/SequenceJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/concurrent/ThreadTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/concurrent/TimerTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/io/Console.kt (100%) rename libraries/stdlib/{ => jvm}/test/io/FileTreeWalks.kt (100%) rename libraries/stdlib/{ => jvm}/test/io/Files.kt (100%) rename libraries/stdlib/{ => jvm}/test/io/IOStreams.kt (100%) rename libraries/stdlib/{ => jvm}/test/io/ReadWrite.kt (100%) rename libraries/stdlib/{ => jvm}/test/io/SerializableTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/js/StubsJVM.kt (100%) rename libraries/stdlib/{ => jvm}/test/numbers/BigNumbersTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/numbers/CompanionIntrinsicObjectsJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/numbers/MathJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/numbers/NumbersJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/properties/delegation/lazy/LazyValuesJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/ranges/RangeIterationJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/reflection/AnnotationsTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/testUtilsJVM.kt (100%) rename libraries/stdlib/{ => jvm}/test/text/CharJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/text/RegexJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/text/StringBuilderJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/text/StringJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/text/StringNumberConversionJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/utils/AssertionsJVMTest.kt (100%) rename libraries/stdlib/{ => jvm}/test/utils/LazyJVMTest.kt (100%) delete mode 100644 libraries/stdlib/test/language/EscapedTestNamesTest.kt diff --git a/libraries/stdlib/test/ExceptionJVMTest.kt b/libraries/stdlib/jvm/test/ExceptionJVMTest.kt similarity index 100% rename from libraries/stdlib/test/ExceptionJVMTest.kt rename to libraries/stdlib/jvm/test/ExceptionJVMTest.kt diff --git a/libraries/stdlib/test/collections/CollectionJVMTest.kt b/libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt similarity index 100% rename from libraries/stdlib/test/collections/CollectionJVMTest.kt rename to libraries/stdlib/jvm/test/collections/CollectionJVMTest.kt diff --git a/libraries/stdlib/test/collections/IterableJVMTests.kt b/libraries/stdlib/jvm/test/collections/IterableJVMTests.kt similarity index 100% rename from libraries/stdlib/test/collections/IterableJVMTests.kt rename to libraries/stdlib/jvm/test/collections/IterableJVMTests.kt diff --git a/libraries/stdlib/test/collections/IteratorsJVMTest.kt b/libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt similarity index 100% rename from libraries/stdlib/test/collections/IteratorsJVMTest.kt rename to libraries/stdlib/jvm/test/collections/IteratorsJVMTest.kt diff --git a/libraries/stdlib/test/collections/MapJVMTest.kt b/libraries/stdlib/jvm/test/collections/MapJVMTest.kt similarity index 100% rename from libraries/stdlib/test/collections/MapJVMTest.kt rename to libraries/stdlib/jvm/test/collections/MapJVMTest.kt diff --git a/libraries/stdlib/test/collections/MutableCollectionsJVMTest.kt b/libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt similarity index 100% rename from libraries/stdlib/test/collections/MutableCollectionsJVMTest.kt rename to libraries/stdlib/jvm/test/collections/MutableCollectionsJVMTest.kt diff --git a/libraries/stdlib/test/collections/SequenceJVMTest.kt b/libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt similarity index 100% rename from libraries/stdlib/test/collections/SequenceJVMTest.kt rename to libraries/stdlib/jvm/test/collections/SequenceJVMTest.kt diff --git a/libraries/stdlib/test/concurrent/ThreadTest.kt b/libraries/stdlib/jvm/test/concurrent/ThreadTest.kt similarity index 100% rename from libraries/stdlib/test/concurrent/ThreadTest.kt rename to libraries/stdlib/jvm/test/concurrent/ThreadTest.kt diff --git a/libraries/stdlib/test/concurrent/TimerTest.kt b/libraries/stdlib/jvm/test/concurrent/TimerTest.kt similarity index 100% rename from libraries/stdlib/test/concurrent/TimerTest.kt rename to libraries/stdlib/jvm/test/concurrent/TimerTest.kt diff --git a/libraries/stdlib/test/io/Console.kt b/libraries/stdlib/jvm/test/io/Console.kt similarity index 100% rename from libraries/stdlib/test/io/Console.kt rename to libraries/stdlib/jvm/test/io/Console.kt diff --git a/libraries/stdlib/test/io/FileTreeWalks.kt b/libraries/stdlib/jvm/test/io/FileTreeWalks.kt similarity index 100% rename from libraries/stdlib/test/io/FileTreeWalks.kt rename to libraries/stdlib/jvm/test/io/FileTreeWalks.kt diff --git a/libraries/stdlib/test/io/Files.kt b/libraries/stdlib/jvm/test/io/Files.kt similarity index 100% rename from libraries/stdlib/test/io/Files.kt rename to libraries/stdlib/jvm/test/io/Files.kt diff --git a/libraries/stdlib/test/io/IOStreams.kt b/libraries/stdlib/jvm/test/io/IOStreams.kt similarity index 100% rename from libraries/stdlib/test/io/IOStreams.kt rename to libraries/stdlib/jvm/test/io/IOStreams.kt diff --git a/libraries/stdlib/test/io/ReadWrite.kt b/libraries/stdlib/jvm/test/io/ReadWrite.kt similarity index 100% rename from libraries/stdlib/test/io/ReadWrite.kt rename to libraries/stdlib/jvm/test/io/ReadWrite.kt diff --git a/libraries/stdlib/test/io/SerializableTest.kt b/libraries/stdlib/jvm/test/io/SerializableTest.kt similarity index 100% rename from libraries/stdlib/test/io/SerializableTest.kt rename to libraries/stdlib/jvm/test/io/SerializableTest.kt diff --git a/libraries/stdlib/test/js/StubsJVM.kt b/libraries/stdlib/jvm/test/js/StubsJVM.kt similarity index 100% rename from libraries/stdlib/test/js/StubsJVM.kt rename to libraries/stdlib/jvm/test/js/StubsJVM.kt diff --git a/libraries/stdlib/test/numbers/BigNumbersTest.kt b/libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt similarity index 100% rename from libraries/stdlib/test/numbers/BigNumbersTest.kt rename to libraries/stdlib/jvm/test/numbers/BigNumbersTest.kt diff --git a/libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt b/libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt similarity index 100% rename from libraries/stdlib/test/numbers/CompanionIntrinsicObjectsJVMTest.kt rename to libraries/stdlib/jvm/test/numbers/CompanionIntrinsicObjectsJVMTest.kt diff --git a/libraries/stdlib/test/numbers/MathJVMTest.kt b/libraries/stdlib/jvm/test/numbers/MathJVMTest.kt similarity index 100% rename from libraries/stdlib/test/numbers/MathJVMTest.kt rename to libraries/stdlib/jvm/test/numbers/MathJVMTest.kt diff --git a/libraries/stdlib/test/numbers/NumbersJVMTest.kt b/libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt similarity index 100% rename from libraries/stdlib/test/numbers/NumbersJVMTest.kt rename to libraries/stdlib/jvm/test/numbers/NumbersJVMTest.kt diff --git a/libraries/stdlib/test/properties/delegation/lazy/LazyValuesJVMTest.kt b/libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt similarity index 100% rename from libraries/stdlib/test/properties/delegation/lazy/LazyValuesJVMTest.kt rename to libraries/stdlib/jvm/test/properties/delegation/lazy/LazyValuesJVMTest.kt diff --git a/libraries/stdlib/test/ranges/RangeIterationJVMTest.kt b/libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt similarity index 100% rename from libraries/stdlib/test/ranges/RangeIterationJVMTest.kt rename to libraries/stdlib/jvm/test/ranges/RangeIterationJVMTest.kt diff --git a/libraries/stdlib/test/reflection/AnnotationsTest.kt b/libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt similarity index 100% rename from libraries/stdlib/test/reflection/AnnotationsTest.kt rename to libraries/stdlib/jvm/test/reflection/AnnotationsTest.kt diff --git a/libraries/stdlib/test/testUtilsJVM.kt b/libraries/stdlib/jvm/test/testUtilsJVM.kt similarity index 100% rename from libraries/stdlib/test/testUtilsJVM.kt rename to libraries/stdlib/jvm/test/testUtilsJVM.kt diff --git a/libraries/stdlib/test/text/CharJVMTest.kt b/libraries/stdlib/jvm/test/text/CharJVMTest.kt similarity index 100% rename from libraries/stdlib/test/text/CharJVMTest.kt rename to libraries/stdlib/jvm/test/text/CharJVMTest.kt diff --git a/libraries/stdlib/test/text/RegexJVMTest.kt b/libraries/stdlib/jvm/test/text/RegexJVMTest.kt similarity index 100% rename from libraries/stdlib/test/text/RegexJVMTest.kt rename to libraries/stdlib/jvm/test/text/RegexJVMTest.kt diff --git a/libraries/stdlib/test/text/StringBuilderJVMTest.kt b/libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt similarity index 100% rename from libraries/stdlib/test/text/StringBuilderJVMTest.kt rename to libraries/stdlib/jvm/test/text/StringBuilderJVMTest.kt diff --git a/libraries/stdlib/test/text/StringJVMTest.kt b/libraries/stdlib/jvm/test/text/StringJVMTest.kt similarity index 100% rename from libraries/stdlib/test/text/StringJVMTest.kt rename to libraries/stdlib/jvm/test/text/StringJVMTest.kt diff --git a/libraries/stdlib/test/text/StringNumberConversionJVMTest.kt b/libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt similarity index 100% rename from libraries/stdlib/test/text/StringNumberConversionJVMTest.kt rename to libraries/stdlib/jvm/test/text/StringNumberConversionJVMTest.kt diff --git a/libraries/stdlib/test/utils/AssertionsJVMTest.kt b/libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt similarity index 100% rename from libraries/stdlib/test/utils/AssertionsJVMTest.kt rename to libraries/stdlib/jvm/test/utils/AssertionsJVMTest.kt diff --git a/libraries/stdlib/test/utils/LazyJVMTest.kt b/libraries/stdlib/jvm/test/utils/LazyJVMTest.kt similarity index 100% rename from libraries/stdlib/test/utils/LazyJVMTest.kt rename to libraries/stdlib/jvm/test/utils/LazyJVMTest.kt diff --git a/libraries/stdlib/test/language/EscapedTestNamesTest.kt b/libraries/stdlib/test/language/EscapedTestNamesTest.kt deleted file mode 100644 index 415cfa0532c..00000000000 --- a/libraries/stdlib/test/language/EscapedTestNamesTest.kt +++ /dev/null @@ -1,17 +0,0 @@ -@file:kotlin.jvm.JvmVersion // TODO: Can't run in JS: spaces in function name KT-4160 -package test.language - -import kotlin.test.* - -class EscapedTestNamesTest { - - @Test fun `strings equal`() { - val actual = "abc" - assertEquals("abc", actual) - } - - @Test fun `numbers equal`() { - val actual = 5 - assertEquals(5, actual) - } -} \ No newline at end of file