From 18f3018ce77d4af6bd1ec836b65908f2bfa48d4b Mon Sep 17 00:00:00 2001
From: Ilya Gorbunov <ilya.gorbunov@jetbrains.com>
Date: Tue, 7 Apr 2015 21:37:49 +0300
Subject: [PATCH] js.stdlib: js-only tests now included in kotlin-js-tests
 module.

---
 .../kotlin/js/test/semantics/JsonTest.java    | 26 -------------------
 libraries/tools/kotlin-js-tests/pom.xml       |  3 +++
 2 files changed, 3 insertions(+), 26 deletions(-)
 delete mode 100644 js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java

diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java
deleted file mode 100644
index f8f3e57c328..00000000000
--- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/JsonTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2010-2015 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.jetbrains.kotlin.js.test.semantics;
-
-import junit.framework.Test;
-
-@SuppressWarnings("JUnitTestCaseWithNoTests")
-public final class JsonTest extends JsUnitTestBase {
-    public static Test suite() throws Exception {
-        return createTestSuiteForFile("js/js.libraries/test/core/JsonTest.kt");
-    }
-}
diff --git a/libraries/tools/kotlin-js-tests/pom.xml b/libraries/tools/kotlin-js-tests/pom.xml
index d12f01ff3ba..94d5ea3b118 100644
--- a/libraries/tools/kotlin-js-tests/pom.xml
+++ b/libraries/tools/kotlin-js-tests/pom.xml
@@ -85,6 +85,9 @@
                                         <exclude name="Test.kt"/>
                                         <exclude name="TestDslExample.kt"/>
                                     </fileset>
+                                    <fileset dir="${basedir}/../../../js/js.libraries/test">
+                                        <include name="**/*.kt" />
+                                    </fileset>
                                 </copy>
                             </target>
                         </configuration>