From 163227c22f49f918f61879da28177189c7443cdb Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 4 Sep 2012 12:19:19 +0400 Subject: [PATCH] external compiler: test data simplified --- .../src/A2.java.new} | 0 .../src/A2.java.new} | 0 .../impl/Service.java.new} | 0 .../packageA/Server.java.remove} | 0 .../packageA/Server.java.remove} | 0 .../packageA/Server.java.new} | 0 .../{M-src$A.java.new => M/src/A.java.new} | 0 .../src/C.java.remove} | 0 .../packageA/Server.java.remove} | 0 .../{src-A$A.java.new => src/A/A.java.new} | 0 .../{src-A$A.java.new => src/A/A.java.new} | 0 .../{src-A$A.java.new => src/A/A.java.new} | 0 .../maketest/BaseImplementation.java.new} | 0 .../maketest/BaseImplementation.java.new} | 0 .../maketest/BaseImplementation.java.new} | 0 .../packageA/Base.java.new} | 0 .../packageA/Base.java.new} | 0 .../packageA/Base.java.new} | 0 .../packageA/Base.java.new} | 0 .../packageA/Base.java.new} | 0 .../packageA/A.java.remove} | 0 .../packageA/A.java.remove} | 0 .../packageA/BaseServer.java.new} | 0 .../packageA/IFace.java.new} | 0 .../packageA/Server.java.new} | 0 .../packageA/Server.java.new} | 0 .../impl/Server.java.new} | 0 .../packageA/Server.java.new} | 0 .../bug/Namespace.java.new} | 0 .../jetbrains/ether/IncrementalTestCase.java | 50 ++++++++----------- 30 files changed, 22 insertions(+), 28 deletions(-) rename java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/{a2-src$A2.java.new => a2/src/A2.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/{a2-src$A2.java.new => a2/src/A2.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/{src-impl$Service.java.new => src/impl/Service.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/common/deleteClass/{src-packageA$Server.java.remove => src/packageA/Server.java.remove} (100%) rename java/java-tests/testData/compileServer/incremental/common/deleteClass1/{src-packageA$Server.java.remove => src/packageA/Server.java.remove} (100%) rename java/java-tests/testData/compileServer/incremental/common/deleteClass2/{src-packageA$Server.java.new => src/packageA/Server.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/common/deleteClass3/{M-src$A.java.new => M/src/A.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/common/deleteClass3/{N-src$C.java.remove => N/src/C.java.remove} (100%) rename java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/{src-packageA$Server.java.remove => src/packageA/Server.java.remove} (100%) rename java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/{src-A$A.java.new => src/A/A.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/{src-A$A.java.new => src/A/A.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/{src-A$A.java.new => src/A/A.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/{src-maketest$BaseImplementation.java.new => src/maketest/BaseImplementation.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/{src-maketest$BaseImplementation.java.new => src/maketest/BaseImplementation.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/{src-maketest$BaseImplementation.java.new => src/maketest/BaseImplementation.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/{src-packageA$Base.java.new => src/packageA/Base.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/{src-packageA$Base.java.new => src/packageA/Base.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/{src-packageA$Base.java.new => src/packageA/Base.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/{src-packageA$Base.java.new => src/packageA/Base.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/{src-packageA$Base.java.new => src/packageA/Base.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/imports/classImport/{src-packageA$A.java.remove => src/packageA/A.java.remove} (100%) rename java/java-tests/testData/compileServer/incremental/imports/staticImport/{src-packageA$A.java.remove => src/packageA/A.java.remove} (100%) rename java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/{src-packageA$BaseServer.java.new => src/packageA/BaseServer.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/{src-packageA$IFace.java.new => src/packageA/IFace.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/{src-packageA$Server.java.new => src/packageA/Server.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/{src-packageA$Server.java.new => src/packageA/Server.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/{src-impl$Server.java.new => src/impl/Server.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/{src-packageA$Server.java.new => src/packageA/Server.java.new} (100%) rename java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/{src-bug$Namespace.java.new => src/bug/Namespace.java.new} (100%) diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2-src$A2.java.new b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/src/A2.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2-src$A2.java.new rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental/a2/src/A2.java.new diff --git a/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2-src$A2.java.new b/java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/src/A2.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2-src$A2.java.new rename to java/java-tests/testData/compileServer/incremental/annotations/conservativeNonIncremental1/a2/src/A2.java.new diff --git a/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src-impl$Service.java.new b/java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src/impl/Service.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src-impl$Service.java.new rename to java/java-tests/testData/compileServer/incremental/classModifiers/decAccess/src/impl/Service.java.new diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass/src-packageA$Server.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClass/src/packageA/Server.java.remove similarity index 100% rename from java/java-tests/testData/compileServer/incremental/common/deleteClass/src-packageA$Server.java.remove rename to java/java-tests/testData/compileServer/incremental/common/deleteClass/src/packageA/Server.java.remove diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass1/src-packageA$Server.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClass1/src/packageA/Server.java.remove similarity index 100% rename from java/java-tests/testData/compileServer/incremental/common/deleteClass1/src-packageA$Server.java.remove rename to java/java-tests/testData/compileServer/incremental/common/deleteClass1/src/packageA/Server.java.remove diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass2/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/common/deleteClass2/src/packageA/Server.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/common/deleteClass2/src-packageA$Server.java.new rename to java/java-tests/testData/compileServer/incremental/common/deleteClass2/src/packageA/Server.java.new diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M-src$A.java.new b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/src/A.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/common/deleteClass3/M-src$A.java.new rename to java/java-tests/testData/compileServer/incremental/common/deleteClass3/M/src/A.java.new diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N-src$C.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/src/C.java.remove similarity index 100% rename from java/java-tests/testData/compileServer/incremental/common/deleteClass3/N-src$C.java.remove rename to java/java-tests/testData/compileServer/incremental/common/deleteClass3/N/src/C.java.remove diff --git a/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src-packageA$Server.java.remove b/java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Server.java.remove similarity index 100% rename from java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src-packageA$Server.java.remove rename to java/java-tests/testData/compileServer/incremental/common/deleteClassPackageDoesntMatchRoot/src/packageA/Server.java.remove diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src-A$A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/A/A.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src-A$A.java.new rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental1/src/A/A.java.new diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src-A$A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/A/A.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src-A$A.java.new rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental2/src/A/A.java.new diff --git a/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src-A$A.java.new b/java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/A.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src-A$A.java.new rename to java/java-tests/testData/compileServer/incremental/fieldProperties/nonIncremental3/src/A/A.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src-maketest$BaseImplementation.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/BaseImplementation.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src-maketest$BaseImplementation.java.new rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase/src/maketest/BaseImplementation.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src-maketest$BaseImplementation.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/BaseImplementation.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src-maketest$BaseImplementation.java.new rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase2/src/maketest/BaseImplementation.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src-maketest$BaseImplementation.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/BaseImplementation.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src-maketest$BaseImplementation.java.new rename to java/java-tests/testData/compileServer/incremental/generics/changeToCovariantMethodInBase3/src/maketest/BaseImplementation.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src/packageA/Base.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src-packageA$Base.java.new rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature/src/packageA/Base.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src/packageA/Base.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src-packageA$Base.java.new rename to java/java-tests/testData/compileServer/incremental/generics/changeVarargSignature1/src/packageA/Base.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Base.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src-packageA$Base.java.new rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymous/src/packageA/Base.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Base.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src-packageA$Base.java.new rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedAnonymousNotRecompile/src/packageA/Base.java.new diff --git a/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src-packageA$Base.java.new b/java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src/packageA/Base.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src-packageA$Base.java.new rename to java/java-tests/testData/compileServer/incremental/generics/overrideAnnotatedInner/src/packageA/Base.java.new diff --git a/java/java-tests/testData/compileServer/incremental/imports/classImport/src-packageA$A.java.remove b/java/java-tests/testData/compileServer/incremental/imports/classImport/src/packageA/A.java.remove similarity index 100% rename from java/java-tests/testData/compileServer/incremental/imports/classImport/src-packageA$A.java.remove rename to java/java-tests/testData/compileServer/incremental/imports/classImport/src/packageA/A.java.remove diff --git a/java/java-tests/testData/compileServer/incremental/imports/staticImport/src-packageA$A.java.remove b/java/java-tests/testData/compileServer/incremental/imports/staticImport/src/packageA/A.java.remove similarity index 100% rename from java/java-tests/testData/compileServer/incremental/imports/staticImport/src-packageA$A.java.remove rename to java/java-tests/testData/compileServer/incremental/imports/staticImport/src/packageA/A.java.remove diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src-packageA$BaseServer.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/BaseServer.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src-packageA$BaseServer.java.new rename to java/java-tests/testData/compileServer/incremental/membersChange/addAbstractMethod/src/packageA/BaseServer.java.new diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/src-packageA$IFace.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/src/packageA/IFace.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/src-packageA$IFace.java.new rename to java/java-tests/testData/compileServer/incremental/membersChange/changeMethodGenericReturnType/src/packageA/IFace.java.new diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src/packageA/Server.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src-packageA$Server.java.new rename to java/java-tests/testData/compileServer/incremental/membersChange/changeStaticMethodSignature/src/packageA/Server.java.new diff --git a/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src/packageA/Server.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src-packageA$Server.java.new rename to java/java-tests/testData/compileServer/incremental/membersChange/renameMethod/src/packageA/Server.java.new diff --git a/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src-impl$Server.java.new b/java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src/impl/Server.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src-impl$Server.java.new rename to java/java-tests/testData/compileServer/incremental/methodModifiers/decConstructorAccess/src/impl/Server.java.new diff --git a/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src-packageA$Server.java.new b/java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src/packageA/Server.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src-packageA$Server.java.new rename to java/java-tests/testData/compileServer/incremental/methodProperties/addThrows/src/packageA/Server.java.new diff --git a/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src-bug$Namespace.java.new b/java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Namespace.java.new similarity index 100% rename from java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src-bug$Namespace.java.new rename to java/java-tests/testData/compileServer/incremental/packageInfo/packageInfoRecompileOnConstantChange/src/bug/Namespace.java.new diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java index aefca6349636..d29afbeb7baf 100644 --- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java +++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java @@ -60,7 +60,13 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase { baseDir = new File(PathManagerEx.getTestDataPath() + File.separator + "compileServer" + File.separator + "incremental" + File.separator + groupName + File.separator + getProjectName()); workDir = FileUtil.createTempDirectory("jps-build", null); - FileUtil.copyDir(baseDir, workDir); + FileUtil.copyDir(baseDir, workDir, new FileFilter() { + @Override + public boolean accept(File file) { + String name = file.getName(); + return !name.endsWith(".new") && !name.endsWith(".delete"); + } + }); String outputPath = getAbsolutePath("out"); JpsJavaExtensionService.getInstance().getOrCreateProjectExtension(myJpsProject).setOutputUrl(JpsPathUtil.pathToUrl(outputPath)); @@ -85,19 +91,25 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase { } private void modify() throws Exception { - final File[] files = baseDir.listFiles(new FileFilter() { - public boolean accept(final File pathname) { - final String name = pathname.getName(); - return name.endsWith(".java.new") || name.endsWith(".java.remove"); - } - }); FileUtil.processFilesRecursively(baseDir, new Processor() { @Override public boolean process(File file) { try { - if (file.getName().endsWith(".form.new")) { - String relativePath = StringUtil.trimEnd(FileUtil.getRelativePath(baseDir, file), ".new"); - FileUtil.copyContent(file, new File(workDir, relativePath)); + String name = file.getName(); + boolean copy = name.endsWith(".new"); + boolean remove = name.endsWith(".remove"); + if (copy || remove) { + String path = FileUtil.getRelativePath(baseDir, file); + assertNotNull(path); + if (!path.contains(File.separator)) { + path = "src" + File.separator + path; + } + if (copy) { + FileUtil.copyContent(file, new File(workDir, StringUtil.trimEnd(path, ".new"))); + } + if (remove) { + FileUtil.delete(new File(workDir, StringUtil.trimEnd(path, ".remove"))); + } } } catch (IOException e) { @@ -106,24 +118,6 @@ public abstract class IncrementalTestCase extends JpsBuildTestCase { return true; } }); - - for (File input : files) { - final String name = input.getName(); - - final boolean copy = name.endsWith(".new"); - final String postfix = name.substring(0, name.length() - (copy ? ".new" : ".remove").length()); - final int pathSep = postfix.indexOf("$"); - final String baseName = pathSep == -1 ? postfix : postfix.substring(pathSep + 1); - final File path = new File(workDir, (pathSep == -1 ? "src" : postfix.substring(0, pathSep).replace('-', File.separatorChar))); - final File output = new File(path, baseName); - - if (copy) { - FileUtil.copyContent(input, output); - } - else { - FileUtil.delete(output); - } - } } public BuildResult doTest() throws Exception {