From 1378f836f50d3a98548f1d3dc6d6b42c0775bac8 Mon Sep 17 00:00:00 2001 From: "Natalia.Ukhorskaya" Date: Tue, 27 Nov 2012 15:33:09 +0400 Subject: [PATCH] Rename test projects for jps plugin. Do not lowercase first letter in project name --- .../jps/build/AbstractKotlinJpsBuildTestCase.java | 2 +- .../jet/jps/build/KotlinJpsBuildTestCase.java | 12 ++++-------- .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/Test.java | 0 .../src/kotlinFile.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/test1.kt | 0 .../kotlinProject.iml | 0 .../kotlinProject.ipr | 0 .../src/src.kt | 0 .../test/test.kt | 0 13 files changed, 5 insertions(+), 9 deletions(-) rename jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/kotlinProject.iml (100%) rename jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/kotlinProject.ipr (100%) rename jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/src/Test.java (100%) rename jps-plugin/testData/{simpleKotlinJavaProject => KotlinJavaProject}/src/kotlinFile.kt (100%) rename jps-plugin/testData/{simpleKotlinProject => KotlinProject}/kotlinProject.iml (100%) rename jps-plugin/testData/{simpleKotlinProject => KotlinProject}/kotlinProject.ipr (100%) rename jps-plugin/testData/{simpleKotlinProject => KotlinProject}/src/test1.kt (100%) rename jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/kotlinProject.iml (100%) rename jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/kotlinProject.ipr (100%) rename jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/src/src.kt (100%) rename jps-plugin/testData/{testOnlyDependency => TestDependencyLibrary}/test/test.kt (100%) diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java index 21ba13e51a1..50426cc6a6b 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/AbstractKotlinJpsBuildTestCase.java @@ -53,7 +53,7 @@ public abstract class AbstractKotlinJpsBuildTestCase extends JpsBuildTestCase { } protected static File copyTestDataToTmpDir(File testDataDir) throws IOException { - assert testDataDir.exists() : "Cannot find source folder"; + assert testDataDir.exists() : "Cannot find source folder " + testDataDir.getAbsolutePath(); File tmpDir = FileUtil.createTempDirectory("jps-build", null); FileUtil.copyDir(testDataDir, tmpDir); return tmpDir; diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java index cebba67b408..7def715e90a 100644 --- a/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java +++ b/jps-plugin/test/org/jetbrains/jet/jps/build/KotlinJpsBuildTestCase.java @@ -29,7 +29,7 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { @Override public void setUp() throws Exception { super.setUp(); - File sourceFilesRoot = new File(TEST_DATA_PATH + File.separator + getTestName(true)); + File sourceFilesRoot = new File(TEST_DATA_PATH + getTestName(false)); workDir = copyTestDataToTmpDir(sourceFilesRoot); } @@ -49,11 +49,11 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { makeAll().assertSuccessful(); } - public void testSimpleKotlinProject() { + public void testKotlinProject() { doTest(); } - public void testSimpleKotlinJavaProject() { + public void testKotlinJavaProject() { doTest(); } @@ -69,11 +69,7 @@ public class KotlinJpsBuildTestCase extends AbstractKotlinJpsBuildTestCase { doTest(); } - public void testTwoModules() { - doTest(); - } - - public void testTestOnlyDependency() throws Throwable { + public void testTestDependencyLibrary() throws Throwable { initProject(); addKotlinRuntimeDependency(JpsJavaDependencyScope.TEST); makeAll().assertSuccessful(); diff --git a/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml b/jps-plugin/testData/KotlinJavaProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.iml rename to jps-plugin/testData/KotlinJavaProject/kotlinProject.iml diff --git a/jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr b/jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/simpleKotlinJavaProject/kotlinProject.ipr rename to jps-plugin/testData/KotlinJavaProject/kotlinProject.ipr diff --git a/jps-plugin/testData/simpleKotlinJavaProject/src/Test.java b/jps-plugin/testData/KotlinJavaProject/src/Test.java similarity index 100% rename from jps-plugin/testData/simpleKotlinJavaProject/src/Test.java rename to jps-plugin/testData/KotlinJavaProject/src/Test.java diff --git a/jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt b/jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt similarity index 100% rename from jps-plugin/testData/simpleKotlinJavaProject/src/kotlinFile.kt rename to jps-plugin/testData/KotlinJavaProject/src/kotlinFile.kt diff --git a/jps-plugin/testData/simpleKotlinProject/kotlinProject.iml b/jps-plugin/testData/KotlinProject/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/simpleKotlinProject/kotlinProject.iml rename to jps-plugin/testData/KotlinProject/kotlinProject.iml diff --git a/jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr b/jps-plugin/testData/KotlinProject/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/simpleKotlinProject/kotlinProject.ipr rename to jps-plugin/testData/KotlinProject/kotlinProject.ipr diff --git a/jps-plugin/testData/simpleKotlinProject/src/test1.kt b/jps-plugin/testData/KotlinProject/src/test1.kt similarity index 100% rename from jps-plugin/testData/simpleKotlinProject/src/test1.kt rename to jps-plugin/testData/KotlinProject/src/test1.kt diff --git a/jps-plugin/testData/testOnlyDependency/kotlinProject.iml b/jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml similarity index 100% rename from jps-plugin/testData/testOnlyDependency/kotlinProject.iml rename to jps-plugin/testData/TestDependencyLibrary/kotlinProject.iml diff --git a/jps-plugin/testData/testOnlyDependency/kotlinProject.ipr b/jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr similarity index 100% rename from jps-plugin/testData/testOnlyDependency/kotlinProject.ipr rename to jps-plugin/testData/TestDependencyLibrary/kotlinProject.ipr diff --git a/jps-plugin/testData/testOnlyDependency/src/src.kt b/jps-plugin/testData/TestDependencyLibrary/src/src.kt similarity index 100% rename from jps-plugin/testData/testOnlyDependency/src/src.kt rename to jps-plugin/testData/TestDependencyLibrary/src/src.kt diff --git a/jps-plugin/testData/testOnlyDependency/test/test.kt b/jps-plugin/testData/TestDependencyLibrary/test/test.kt similarity index 100% rename from jps-plugin/testData/testOnlyDependency/test/test.kt rename to jps-plugin/testData/TestDependencyLibrary/test/test.kt