Continue retooling incremental tests to the new builders (compiler server).
authordboulytchev <gjhjctyjr>
Mon, 30 Jan 2012 22:01:52 +0000 (02:01 +0400)
committerdboulytchev <gjhjctyjr>
Mon, 30 Jan 2012 22:02:30 +0000 (02:02 +0400)
28 files changed:
jps/jps-builders/src/org/jetbrains/jps/incremental/IncProjectBuilder.java
jps/jps-builders/testSrc/org/jetbrains/ether/AnnotationTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestAnnotations.java with 95% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/ClassModifierTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestClassModifiers.java with 86% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestClassProperties.java with 86% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/ClassRenameTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestClassRename.java with 72% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestCommon.java with 92% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestFieldModifiers.java with 85% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestFieldProperties.java with 93% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestGenerics.java with 96% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestMarkDirty.java with 73% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/MemberChangeTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestMembersChange.java with 96% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/MethodModifierTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestMethodModifiers.java with 88% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/MethodPropertyTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestMethodProperties.java with 83% similarity]
jps/jps-builders/testSrc/org/jetbrains/ether/PackageInfoTest.java [moved from jps/jps-builders/testSrc/org/jetbrains/ether/TestPackageInfo.java with 81% similarity]
jps/testData/incremental/annotations/changeAnnotationRetentionPolicy2.log
jps/testData/incremental/annotations/changeAnnotationRetentionPolicy3.log
jps/testData/incremental/annotations/conservativeNonIncremental.log
jps/testData/incremental/annotations/conservativeNonIncremental1.log
jps/testData/incremental/common/deleteClass.log
jps/testData/incremental/common/deleteClass1.log
jps/testData/incremental/common/deleteClassPackageDoesntMatchRoot.log
jps/testData/incremental/fieldProperties/constantChain1.log
jps/testData/incremental/fieldProperties/constantChain2.log
jps/testData/incremental/fieldProperties/innerConstantChange.log
jps/testData/incremental/fieldProperties/stringConstantLessAccessible.log
jps/testData/incremental/generics/changeBoundClass1.log
jps/testData/incremental/markDirty/recompileDependent.log
jps/testData/incremental/packageInfo/packageInfoRecompileOnConstantChange.log

index 7beeac50794ef0d8453fed83eea14b229e95cbf6..792d5104830d5d0f91262371b7abdac58dfd0c51 100644 (file)
@@ -287,6 +287,23 @@ public class IncProjectBuilder {
           for (String deletedSource : deletedPaths) {
             // deleting outputs corresponding to non-existing source
             final Collection<String> outputs = sourceToOutputStorage.getState(deletedSource);
+            
+            if (LOG.isDebugEnabled()) {
+              if (outputs.size() > 0) {
+                final String[] buffer = new String[outputs.size()];
+                int i = 0;
+                for (final String o : outputs) {
+                  buffer[i++] = o;
+                }
+                Arrays.sort(buffer);
+                LOG.info("Cleaning output files:");
+                for(final String o : buffer) {
+                  LOG.info(o);
+                }
+                LOG.info("End of files");
+              }
+            }
+            
             if (outputs != null) {
               for (String output : outputs) {
                 FileUtil.delete(new File(output));
similarity index 95%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestAnnotations.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/AnnotationTest.java
index 89470fbfede1ac4750a9d6080ed7521fe2e631fd..638c570e7b5a0b12f59a63c97383546b0512f573 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 0:35
  * To change this template use File | Settings | File Templates.
  */
-public class TestAnnotations extends IncrementalTestCase {
-  public TestAnnotations() throws Exception {
+public class AnnotationTest extends IncrementalTestCase {
+  public AnnotationTest() throws Exception {
     super("annotations");
   }
 
similarity index 86%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestClassModifiers.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/ClassModifierTest.java
index a29edb74f19088648ec79eb487b991e0e615b9b0..e6b690dee3f85e775740afc55fa148e6601b1887 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 13:07
  * To change this template use File | Settings | File Templates.
  */
-public class TestClassModifiers extends IncrementalTestCase {
-  public TestClassModifiers() throws Exception {
+public class ClassModifierTest extends IncrementalTestCase {
+  public ClassModifierTest() throws Exception {
     super("classModifiers");
   }
 
similarity index 86%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestClassProperties.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/ClassPropertyTest.java
index ed4da587ca25503beb41a4815bf3ea7a76b580d0..a652b11ab437e9b12198a9ae778444dea89b75ba 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 13:30
  * To change this template use File | Settings | File Templates.
  */
-public class TestClassProperties extends IncrementalTestCase {
-  public TestClassProperties() throws Exception {
+public class ClassPropertyTest extends IncrementalTestCase {
+  public ClassPropertyTest() throws Exception {
     super("classProperties");
   }
 
similarity index 72%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestClassRename.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/ClassRenameTest.java
index 85ededbae714eefceec8816ab8439f810157cc05..2158293c8733459368f58f3d56375526082a07ed 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 12:57
  * To change this template use File | Settings | File Templates.
  */
-public class TestClassRename extends IncrementalTestCase {
-  public TestClassRename() throws Exception {
+public class ClassRenameTest extends IncrementalTestCase {
+  public ClassRenameTest() throws Exception {
     super("changeName");
   }
 
similarity index 92%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestCommon.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/CommonTest.java
index eb1427811c3e65ebfc4358acd147cd9f0a625cdf..801876e84232f35b07d5b2e303cdc8558ebf790c 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 3:13
  * To change this template use File | Settings | File Templates.
  */
-public class TestCommon extends IncrementalTestCase {
-  public TestCommon() throws Exception {
+public class CommonTest extends IncrementalTestCase {
+  public CommonTest() throws Exception {
     super("common");
   }
 
similarity index 85%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestFieldModifiers.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/FieldModifierTest.java
index dd2b873fe1b68a958f5eb79e176ac20f3b4a1573..8927c97b9403ecaf7af44acb84e79f28ab1e0c14 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 15:53
  * To change this template use File | Settings | File Templates.
  */
-public class TestFieldModifiers extends IncrementalTestCase {
-  public TestFieldModifiers() throws Exception {
+public class FieldModifierTest extends IncrementalTestCase {
+  public FieldModifierTest() throws Exception {
     super("fieldModifiers");
   }
 
similarity index 93%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestFieldProperties.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/FieldPropertyTest.java
index db0d1342074808ee40457f1b4ad3849b270ed2f9..9355a4a554d185bd42a270563af1aab1b4c58a13 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 20:49
  * To change this template use File | Settings | File Templates.
  */
-public class TestFieldProperties extends IncrementalTestCase {
-  public TestFieldProperties() throws Exception {
+public class FieldPropertyTest extends IncrementalTestCase {
+  public FieldPropertyTest() throws Exception {
     super("fieldProperties");
   }
 
similarity index 96%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestGenerics.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/GenericTest.java
index 2bdbcf22ec8e6cfc344579e8adeb17828e02ca8d..f0d26d288733a67352510d965c14f18adf9a917e 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 17:40
  * To change this template use File | Settings | File Templates.
  */
-public class TestGenerics extends IncrementalTestCase {
-  public TestGenerics() throws Exception {
+public class GenericTest extends IncrementalTestCase {
+  public GenericTest() throws Exception {
     super("generics");
   }
 
similarity index 73%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestMarkDirty.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/MarkDirtyTest.java
index e654c13c353008fabb2725a53d45e0da970df48c..249334d1bfdbbf4215c3d134644407c847f1b0d7 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 14:41
  * To change this template use File | Settings | File Templates.
  */
-public class TestMarkDirty extends IncrementalTestCase {
-  public TestMarkDirty() throws Exception {
+public class MarkDirtyTest extends IncrementalTestCase {
+  public MarkDirtyTest() throws Exception {
     super("markDirty");
   }
 
similarity index 96%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestMembersChange.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/MemberChangeTest.java
index c98668df39f10b3096265646c50f98da406a8a60..cfe091f05825efca7ecc451c31f0717413f6792e 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 21:32
  * To change this template use File | Settings | File Templates.
  */
-public class TestMembersChange extends IncrementalTestCase {
-  public TestMembersChange() throws Exception {
+public class MemberChangeTest extends IncrementalTestCase {
+  public MemberChangeTest() throws Exception {
     super("membersChange");
   }
 
similarity index 88%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestMethodModifiers.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/MethodModifierTest.java
index c644efbf4b762464e298f562ad70b8758d30b5e4..c4e593433ef92c60c9c54af03b08e23ce81c668d 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 16:06
  * To change this template use File | Settings | File Templates.
  */
-public class TestMethodModifiers extends IncrementalTestCase {
-  public TestMethodModifiers() throws Exception {
+public class MethodModifierTest extends IncrementalTestCase {
+  public MethodModifierTest() throws Exception {
     super("methodModifiers");
   }
 
similarity index 83%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestMethodProperties.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/MethodPropertyTest.java
index e44a31b424442c3594461ba7af39b6ff343bd5be..77fb5710ec8d5f3b2b7ba0707a49bf6a8a310c64 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 20:43
  * To change this template use File | Settings | File Templates.
  */
-public class TestMethodProperties extends IncrementalTestCase {
-  public TestMethodProperties() throws Exception {
+public class MethodPropertyTest extends IncrementalTestCase {
+  public MethodPropertyTest() throws Exception {
     super("methodProperties");
   }
 
similarity index 81%
rename from jps/jps-builders/testSrc/org/jetbrains/ether/TestPackageInfo.java
rename to jps/jps-builders/testSrc/org/jetbrains/ether/PackageInfoTest.java
index 9515b96f85b3a1019b5c11331df111797a70a9d3..3381df4e06d00aeaf8ce2f9e378c90965015ab23 100644 (file)
@@ -7,8 +7,8 @@ package org.jetbrains.ether;
  * Time: 14:48
  * To change this template use File | Settings | File Templates.
  */
-public class TestPackageInfo extends IncrementalTestCase {
-  public TestPackageInfo() throws Exception {
+public class PackageInfoTest extends IncrementalTestCase {
+  public PackageInfoTest() throws Exception {
     super("packageInfo");
   }
 
index e8b679581808fda19617e8ea4dac87e5d92af889..211ca93b892789d4e1f5a9b029e800c439e011cb 100644 (file)
@@ -5,11 +5,13 @@ Compiling files:
 src/A.java
 End of files
 Cleaning output files:
+out/production/ChangeAnnotationRetentionPolicy2/A.class
 out/production/ChangeAnnotationRetentionPolicy2/C.class
 out/production/ChangeAnnotationRetentionPolicy2/C1.class
 out/production/ChangeAnnotationRetentionPolicy2/C2.class
 End of files
 Compiling files:
+src/A.java
 src/C.java
 src/C1.java
 src/C2.java
index 80b747122d640c3284d99a0c4f1ef6ceef5b31b5..8dab2100519e77d225bb58998de1385be9d35490 100644 (file)
@@ -5,11 +5,13 @@ Compiling files:
 src/A.java
 End of files
 Cleaning output files:
+out/production/ChangeAnnotationRetentionPolicy3/A.class
 out/production/ChangeAnnotationRetentionPolicy3/C.class
 out/production/ChangeAnnotationRetentionPolicy3/C1.class
 out/production/ChangeAnnotationRetentionPolicy3/C2.class
 End of files
 Compiling files:
+src/A.java
 src/C.java
 src/C1.java
 src/C2.java
index 63a3d986d1cd6492cfede5e530a09ce059dc77d1..e5b98301009cc83cc1059358e175523ab5d7dd80 100644 (file)
@@ -5,10 +5,22 @@ Compiling files:
 a2/src/A2.java
 End of files
 Cleaning output files:
+out/production/a2/A2.class
 out/production/a2/C.class
 End of files
 Compiling files:
+a2/src/A2.java
 a2/src/C.java
 End of files
-Compiling chunk b21 non-incrementally.
-Compiling chunk b22 non-incrementally.
+Cleaning output files:
+out/production/b21/B21.class
+End of files
+Compiling files:
+b21/src/B21.java
+End of files
+Cleaning output files:
+out/production/b22/B22.class
+End of files
+Compiling files:
+b22/src/B22.java
+End of files
index 63a3d986d1cd6492cfede5e530a09ce059dc77d1..e5b98301009cc83cc1059358e175523ab5d7dd80 100644 (file)
@@ -5,10 +5,22 @@ Compiling files:
 a2/src/A2.java
 End of files
 Cleaning output files:
+out/production/a2/A2.class
 out/production/a2/C.class
 End of files
 Compiling files:
+a2/src/A2.java
 a2/src/C.java
 End of files
-Compiling chunk b21 non-incrementally.
-Compiling chunk b22 non-incrementally.
+Cleaning output files:
+out/production/b21/B21.class
+End of files
+Compiling files:
+b21/src/B21.java
+End of files
+Cleaning output files:
+out/production/b22/B22.class
+End of files
+Compiling files:
+b22/src/B22.java
+End of files
index 8c95468c0b5d90450f3ebd2abb43251ea762b741..79da1a6e906fa1619285625eb09b4725594007f6 100644 (file)
@@ -1,8 +1,6 @@
 Cleaning output files:
 out/production/DeleteClass/packageA/Server.class
 End of files
-Compiling files:
-End of files
 Cleaning output files:
 out/production/DeleteClass/packageA/Client.class
 End of files
index faea157979b3dafbca3e53a5c6b95e71d82758e3..4babb8ae296e612306caa3dc840cf946ca6ad848 100644 (file)
@@ -1,8 +1,6 @@
 Cleaning output files:
 out/production/DeleteClass1/packageA/Server.class
 End of files
-Compiling files:
-End of files
 Cleaning output files:
 out/production/DeleteClass1/packageA/Client.class
 End of files
index ac0a41b41e3120509687d8e9211b45b269f08e20..0a88af8a2419e683bed189f427db9a4942ffd1d5 100644 (file)
@@ -2,8 +2,6 @@ Cleaning output files:
 out/production/DeleteClassPackageDoesntMatchRoot/ppp/Server$1.class
 out/production/DeleteClassPackageDoesntMatchRoot/ppp/Server.class
 End of files
-Compiling files:
-End of files
 Cleaning output files:
 out/production/DeleteClassPackageDoesntMatchRoot/clientPackage/Client.class
 End of files
index c6f55ec9259bc5aa4d13568a183e7a71bd175f8d..106fea4239c9fc28277086bff7500b0155449d01 100644 (file)
@@ -5,11 +5,13 @@ Compiling files:
 src/A.java
 End of files
 Cleaning output files:
+out/production/ConstantChain1/A.class
 out/production/ConstantChain1/B.class
 out/production/ConstantChain1/C.class
 out/production/ConstantChain1/Client.class
 End of files
 Compiling files:
+src/A.java
 src/B.java
 src/C.java
 src/Client.java
index 53dc6d225b4307472fd1f0a389a44afd8a1adec2..7e6d45189a0364d3a9a3f84b36ad7c06add622ce 100644 (file)
@@ -7,8 +7,12 @@ src/Client.java
 src/Const1.java
 End of files
 Cleaning output files:
+out/production/ConstantChain2/Client.class
+out/production/ConstantChain2/Const1.class
 out/production/ConstantChain2/Const2.class
 End of files
 Compiling files:
+src/Client.java
+src/Const1.java
 src/Const2.java
 End of files
index b31a9a4461667d1f60abdf377ff9afa77627c702..ce8e480ec93754322bd8aa47758f3bf691e26044 100644 (file)
@@ -7,7 +7,10 @@ src/Server.java
 End of files
 Cleaning output files:
 out/production/InnerConstantChange/Client.class
+out/production/InnerConstantChange/Server$Inner.class
+out/production/InnerConstantChange/Server.class
 End of files
 Compiling files:
 src/Client.java
+src/Server.java
 End of files
index 15ce632a5a8eeea2e61f9e5202069399977b4320..9fc937afadac47337268be19810798946e1196d2 100644 (file)
@@ -6,7 +6,9 @@ src/Server.java
 End of files
 Cleaning output files:
 out/production/StringConstantLessAccessible/Client.class
+out/production/StringConstantLessAccessible/Server.class
 End of files
 Compiling files:
 src/Client.java
+src/Server.java
 End of files
index 17367db9e004e1caa0510a40fbdde0494142a0d5..cc5a1d10e130853a89db7c5b7146250c0ee4aebe 100644 (file)
@@ -1,8 +1,6 @@
 Cleaning output files:
 out/production/ChangeBoundClass1/Value.class
 End of files
-Compiling files:
-End of files
 Cleaning output files:
 out/production/ChangeBoundClass1/A.class
 End of files
index 835dd546ef1da3c08206e30f3da8e0336d0f3c58..15998eaa34d89218f983a501166a40ded70f309c 100644 (file)
@@ -6,7 +6,9 @@ src/Server.java
 End of files
 Cleaning output files:
 out/production/RecompileDependent/Client.class
+out/production/RecompileDependent/Server.class
 End of files
 Compiling files:
 src/Client.java
+src/Server.java
 End of files
index e4b101795b7f15478a1d045226ed32ebbf6b13ff..ccef33cf34610739c6df54a713bafc74a663befb 100644 (file)
@@ -6,9 +6,11 @@ src/bug/Namespace.java
 End of files
 Cleaning output files:
 out/production/PackageInfoRecompileOnConstantChange/bug/Ann.class
+out/production/PackageInfoRecompileOnConstantChange/bug/Namespace.class
 out/production/PackageInfoRecompileOnConstantChange/bug/package-info.class
 End of files
 Compiling files:
 src/bug/Ann.java
+src/bug/Namespace.java
 src/bug/package-info.java
 End of files