MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

artifact builder tests: duplicated method removed

Browse Source
This commit is contained in:
nik
2015-07-30 11:31:41 +03:00
parent e86e1256de
commit 534894ae37
3 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTest.java
-4
View File
@@ -416,8 +416,4 @@ public class ArtifactBuilderTest extends ArtifactBuilderTestCase {
buildAll();
assertOutput(a, fs().archive("a.jar").file("a.txt"));
}
private static void createFileInArtifactOutput(JpsArtifact a, final String fileName) throws IOException {
assertTrue(new File(a.getOutputPath(), fileName).createNewFile());
}
}
jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/ArtifactBuilderTestCase.java
+23
View File
@@ -26,12 +26,15 @@ import org.jetbrains.jps.model.JpsElementFactory;
import org.jetbrains.jps.model.artifact.DirectoryArtifactType;
import org.jetbrains.jps.model.artifact.JpsArtifact;
import org.jetbrains.jps.model.artifact.JpsArtifactService;
import org.jetbrains.jps.model.java.JpsJavaExtensionService;
import org.jetbrains.jps.model.java.JpsJavaLibraryType;
import org.jetbrains.jps.model.library.JpsLibrary;
import org.jetbrains.jps.model.library.JpsOrderRootType;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.util.JpsPathUtil;
import java.io.File;
import java.io.IOException;
import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
@@ -42,6 +45,26 @@ import static com.intellij.util.io.TestFileSystemItem.fs;
* @author nik
*/
public abstract class ArtifactBuilderTestCase extends JpsBuildTestCase {
protected static void createFileInArtifactOutput(JpsArtifact a, final String relativePath) {
createFileInOutputDir(a.getOutputPath(), relativePath);
}
protected static void createFileInModuleOutput(JpsModule m, final String relativePath) {
File outputDirectory = JpsJavaExtensionService.getInstance().getOutputDirectory(m, false);
assertNotNull(outputDirectory);
createFileInOutputDir(outputDirectory.getAbsolutePath(), relativePath);
}
private static void createFileInOutputDir(final String outputPath, final String relativePath) {
try {
boolean created = new File(outputPath, relativePath).createNewFile();
assertTrue(created);
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
@Override
protected void tearDown() throws Exception {
for (JpsArtifact artifact : JpsArtifactService.getInstance().getArtifacts(myProject)) {
jps/jps-builders/testSrc/org/jetbrains/jps/incremental/artifacts/CleanArtifactOutputOnRebuildTest.java
-23
View File
@@ -21,9 +21,6 @@ import org.jetbrains.jps.model.java.JpsJavaExtensionService;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.util.JpsPathUtil;
import java.io.File;
import java.io.IOException;
import static com.intellij.util.io.TestFileSystemBuilder.fs;
import static org.jetbrains.jps.incremental.artifacts.LayoutElementTestUtil.root;
@@ -95,24 +92,4 @@ public class CleanArtifactOutputOnRebuildTest extends ArtifactBuilderTestCase {
rebuildAll();
assertOutput(m, fs().file("A.class"));
}
private static void createFileInArtifactOutput(JpsArtifact a, final String name) {
createFileInOutputDir(a.getOutputPath(), name);
}
private static void createFileInModuleOutput(JpsModule m, final String name) {
File outputDirectory = JpsJavaExtensionService.getInstance().getOutputDirectory(m, false);
assertNotNull(outputDirectory);
createFileInOutputDir(outputDirectory.getAbsolutePath(), name);
}
private static void createFileInOutputDir(final String outputPath, final String fileName) {
try {
boolean created = new File(outputPath, fileName).createNewFile();
assertTrue(created);
}
catch (IOException e) {
throw new RuntimeException(e);
}
}
}