From 111feb257451c204e52065788d5e7dd68ad47872 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Fri, 20 Jun 2014 14:33:47 +0400
Subject: [PATCH] Added tests with removing files and changing packages.

---
 .../build/IncrementalJpsTestGenerated.java    | 20 +++++++++++++++++++
 .../incremental/filesExchangePackages/a.kt    |  3 +++
 .../incremental/filesExchangePackages/b.kt    |  3 +++
 .../filesExchangePackages/b.kt.new            |  3 +++
 .../filesExchangePackages/build.log           | 17 ++++++++++++++++
 .../incremental/filesExchangePackages/c.kt    |  3 +++
 .../filesExchangePackages/c.kt.new            |  3 +++
 .../multiplePackagesModified/a1.kt            |  3 +++
 .../multiplePackagesModified/a2.kt.new        |  3 +++
 .../multiplePackagesModified/b1.kt            |  3 +++
 .../multiplePackagesModified/b2.kt            |  3 +++
 .../multiplePackagesModified/b2.kt.delete     |  0
 .../multiplePackagesModified/build.log        | 17 ++++++++++++++++
 .../testData/incremental/packageRemoved/a.kt  |  3 +++
 .../incremental/packageRemoved/a.kt.delete    |  0
 .../testData/incremental/packageRemoved/b.kt  |  3 +++
 .../incremental/packageRemoved/b.kt.delete    |  0
 .../incremental/packageRemoved/build.log      |  9 +++++++++
 .../incremental/soleFileChangesPackage/a.kt   |  3 +++
 .../soleFileChangesPackage/a.kt.new           |  4 ++++
 .../soleFileChangesPackage/build.log          |  7 +++++++
 21 files changed, 110 insertions(+)
 create mode 100644 jps-plugin/testData/incremental/filesExchangePackages/a.kt
 create mode 100644 jps-plugin/testData/incremental/filesExchangePackages/b.kt
 create mode 100644 jps-plugin/testData/incremental/filesExchangePackages/b.kt.new
 create mode 100644 jps-plugin/testData/incremental/filesExchangePackages/build.log
 create mode 100644 jps-plugin/testData/incremental/filesExchangePackages/c.kt
 create mode 100644 jps-plugin/testData/incremental/filesExchangePackages/c.kt.new
 create mode 100644 jps-plugin/testData/incremental/multiplePackagesModified/a1.kt
 create mode 100644 jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new
 create mode 100644 jps-plugin/testData/incremental/multiplePackagesModified/b1.kt
 create mode 100644 jps-plugin/testData/incremental/multiplePackagesModified/b2.kt
 create mode 100644 jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete
 create mode 100644 jps-plugin/testData/incremental/multiplePackagesModified/build.log
 create mode 100644 jps-plugin/testData/incremental/packageRemoved/a.kt
 create mode 100644 jps-plugin/testData/incremental/packageRemoved/a.kt.delete
 create mode 100644 jps-plugin/testData/incremental/packageRemoved/b.kt
 create mode 100644 jps-plugin/testData/incremental/packageRemoved/b.kt.delete
 create mode 100644 jps-plugin/testData/incremental/packageRemoved/build.log
 create mode 100644 jps-plugin/testData/incremental/soleFileChangesPackage/a.kt
 create mode 100644 jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new
 create mode 100644 jps-plugin/testData/incremental/soleFileChangesPackage/build.log

diff --git a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
index c8359bf9773..8ac2e37fa69 100644
--- a/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
+++ b/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java
@@ -56,11 +56,21 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/constantValue/");
     }
     
+    @TestMetadata("filesExchangePackages")
+    public void testFilesExchangePackages() throws Exception {
+        doTest("jps-plugin/testData/incremental/filesExchangePackages/");
+    }
+    
     @TestMetadata("independentClasses")
     public void testIndependentClasses() throws Exception {
         doTest("jps-plugin/testData/incremental/independentClasses/");
     }
     
+    @TestMetadata("multiplePackagesModified")
+    public void testMultiplePackagesModified() throws Exception {
+        doTest("jps-plugin/testData/incremental/multiplePackagesModified/");
+    }
+    
     @TestMetadata("packageFileAdded")
     public void testPackageFileAdded() throws Exception {
         doTest("jps-plugin/testData/incremental/packageFileAdded/");
@@ -86,6 +96,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/packageFilesChangedInTurn/");
     }
     
+    @TestMetadata("packageRemoved")
+    public void testPackageRemoved() throws Exception {
+        doTest("jps-plugin/testData/incremental/packageRemoved/");
+    }
+    
     @TestMetadata("returnTypeChanged")
     public void testReturnTypeChanged() throws Exception {
         doTest("jps-plugin/testData/incremental/returnTypeChanged/");
@@ -96,6 +111,11 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
         doTest("jps-plugin/testData/incremental/simpleClassDependency/");
     }
     
+    @TestMetadata("soleFileChangesPackage")
+    public void testSoleFileChangesPackage() throws Exception {
+        doTest("jps-plugin/testData/incremental/soleFileChangesPackage/");
+    }
+    
     @TestMetadata("topLevelFunctionSameSignature")
     public void testTopLevelFunctionSameSignature() throws Exception {
         doTest("jps-plugin/testData/incremental/topLevelFunctionSameSignature/");
diff --git a/jps-plugin/testData/incremental/filesExchangePackages/a.kt b/jps-plugin/testData/incremental/filesExchangePackages/a.kt
new file mode 100644
index 00000000000..058137655b8
--- /dev/null
+++ b/jps-plugin/testData/incremental/filesExchangePackages/a.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun a() = "a"
diff --git a/jps-plugin/testData/incremental/filesExchangePackages/b.kt b/jps-plugin/testData/incremental/filesExchangePackages/b.kt
new file mode 100644
index 00000000000..d838bdff1a4
--- /dev/null
+++ b/jps-plugin/testData/incremental/filesExchangePackages/b.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun b() = "b"
diff --git a/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new b/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new
new file mode 100644
index 00000000000..75675fcebb4
--- /dev/null
+++ b/jps-plugin/testData/incremental/filesExchangePackages/b.kt.new
@@ -0,0 +1,3 @@
+package bar
+
+fun b() = "b"
diff --git a/jps-plugin/testData/incremental/filesExchangePackages/build.log b/jps-plugin/testData/incremental/filesExchangePackages/build.log
new file mode 100644
index 00000000000..492218cc4a6
--- /dev/null
+++ b/jps-plugin/testData/incremental/filesExchangePackages/build.log
@@ -0,0 +1,17 @@
+Cleaning output files:
+out/production/module/bar/BarPackage-c-*.class
+out/production/module/bar/BarPackage.class
+out/production/module/foo/FooPackage-b-*.class
+out/production/module/foo/FooPackage.class
+End of files
+Compiling files:
+src/b.kt
+src/c.kt
+End of files
+Cleaning output files:
+out/production/module/foo/FooPackage-a-*.class
+out/production/module/foo/FooPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
diff --git a/jps-plugin/testData/incremental/filesExchangePackages/c.kt b/jps-plugin/testData/incremental/filesExchangePackages/c.kt
new file mode 100644
index 00000000000..ba081bb0bbd
--- /dev/null
+++ b/jps-plugin/testData/incremental/filesExchangePackages/c.kt
@@ -0,0 +1,3 @@
+package bar
+
+fun c() = "c"
diff --git a/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new b/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new
new file mode 100644
index 00000000000..e51d910bb9d
--- /dev/null
+++ b/jps-plugin/testData/incremental/filesExchangePackages/c.kt.new
@@ -0,0 +1,3 @@
+package foo
+
+fun c() = "c"
diff --git a/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt b/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt
new file mode 100644
index 00000000000..2bd705934bc
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiplePackagesModified/a1.kt
@@ -0,0 +1,3 @@
+package a
+
+fun a1() = ":)"
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new b/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new
new file mode 100644
index 00000000000..4e46bd9087f
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiplePackagesModified/a2.kt.new
@@ -0,0 +1,3 @@
+package a
+
+fun a2() = ":))"
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt b/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt
new file mode 100644
index 00000000000..21999b4bfe6
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiplePackagesModified/b1.kt
@@ -0,0 +1,3 @@
+package b
+
+fun b1() = ":("
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt b/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt
new file mode 100644
index 00000000000..d2f49a90033
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt
@@ -0,0 +1,3 @@
+package b
+
+fun b2() = ":(("
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete b/jps-plugin/testData/incremental/multiplePackagesModified/b2.kt.delete
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/multiplePackagesModified/build.log b/jps-plugin/testData/incremental/multiplePackagesModified/build.log
new file mode 100644
index 00000000000..914a8b69528
--- /dev/null
+++ b/jps-plugin/testData/incremental/multiplePackagesModified/build.log
@@ -0,0 +1,17 @@
+Cleaning output files:
+out/production/module/b/BPackage-b2-*.class
+out/production/module/b/BPackage.class
+End of files
+Compiling files:
+src/a2.kt
+End of files
+Cleaning output files:
+out/production/module/a/APackage-a1-*.class
+out/production/module/a/APackage.class
+out/production/module/b/BPackage-b1-*.class
+out/production/module/b/BPackage.class
+End of files
+Compiling files:
+src/a1.kt
+src/b1.kt
+End of files
diff --git a/jps-plugin/testData/incremental/packageRemoved/a.kt b/jps-plugin/testData/incremental/packageRemoved/a.kt
new file mode 100644
index 00000000000..30ca24b5576
--- /dev/null
+++ b/jps-plugin/testData/incremental/packageRemoved/a.kt
@@ -0,0 +1,3 @@
+package test
+
+fun a() = "a"
diff --git a/jps-plugin/testData/incremental/packageRemoved/a.kt.delete b/jps-plugin/testData/incremental/packageRemoved/a.kt.delete
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/packageRemoved/b.kt b/jps-plugin/testData/incremental/packageRemoved/b.kt
new file mode 100644
index 00000000000..5c782f47a25
--- /dev/null
+++ b/jps-plugin/testData/incremental/packageRemoved/b.kt
@@ -0,0 +1,3 @@
+package test
+
+fun b() = "b"
diff --git a/jps-plugin/testData/incremental/packageRemoved/b.kt.delete b/jps-plugin/testData/incremental/packageRemoved/b.kt.delete
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/jps-plugin/testData/incremental/packageRemoved/build.log b/jps-plugin/testData/incremental/packageRemoved/build.log
new file mode 100644
index 00000000000..c307a197264
--- /dev/null
+++ b/jps-plugin/testData/incremental/packageRemoved/build.log
@@ -0,0 +1,9 @@
+Cleaning output files:
+out/production/module/test/TestPackage-a-*.class
+out/production/module/test/TestPackage.class
+End of files
+Cleaning output files:
+out/production/module/test/TestPackage-b-*.class
+End of files
+Compiling files:
+End of files
\ No newline at end of file
diff --git a/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt b/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt
new file mode 100644
index 00000000000..058137655b8
--- /dev/null
+++ b/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt
@@ -0,0 +1,3 @@
+package foo
+
+fun a() = "a"
diff --git a/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new b/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new
new file mode 100644
index 00000000000..eb3b7b757d2
--- /dev/null
+++ b/jps-plugin/testData/incremental/soleFileChangesPackage/a.kt.new
@@ -0,0 +1,4 @@
+package bar
+
+fun a() = "a"
+fun aa() = "aa"
diff --git a/jps-plugin/testData/incremental/soleFileChangesPackage/build.log b/jps-plugin/testData/incremental/soleFileChangesPackage/build.log
new file mode 100644
index 00000000000..3c8fdd9ea17
--- /dev/null
+++ b/jps-plugin/testData/incremental/soleFileChangesPackage/build.log
@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/foo/FooPackage-a-*.class
+out/production/module/foo/FooPackage.class
+End of files
+Compiling files:
+src/a.kt
+End of files
\ No newline at end of file