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

test added

Browse Source
This commit is contained in:
nik
2010-03-10 12:17:34 +03:00
parent fbed08ad00
commit d3dd03a624
14 changed files with 115 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/antLayout/src/jetbrains/antlayout/tasks/LayoutTask.java
+4
View File
@@ -33,6 +33,10 @@ public class LayoutTask extends Task {
containers.add(container);
}
public void addModule(IdeaModule module) {
containers.add(new FileSetContainer(module));
}
public void addFileset(FileSet fileSet) {
containers.add(new FileSetContainer(fileSet));
}
jps/src/org/jetbrains/jps/idea/IdeaProjectLoader.groovy
+1 -1
View File
@@ -138,7 +138,7 @@ public class IdeaProjectLoader {
}
private NodeList loadProjectLibraries(Node librariesComponent, Project project, String projectBasePath) {
return librariesComponent?.library.each {Node libTag ->
return librariesComponent?.library?.each {Node libTag ->
project.createLibrary(libTag."@name", libraryInitializer(libTag, projectBasePath, null))
}
}
jps/testData/overwriteTest/data/d1/x.txt
+1
View File
@@ -0,0 +1 @@
d1
jps/testData/overwriteTest/data/d2/x.txt
+1
View File
@@ -0,0 +1 @@
d2
jps/testData/overwriteTest/dep/dep.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps/testData/overwriteTest/dep/src/a.xml
+1
View File
@@ -0,0 +1 @@
<root2/>
jps/testData/overwriteTest/overwriteTest.iml
+12
View File
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
jps/testData/overwriteTest/overwriteTest.ipr
+49
View File
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ArtifactManager">
<artifact name="dirs">
<output-path>$PROJECT_DIR$/out/artifacts/dirs</output-path>
<root id="root">
<element id="dir-copy" path="$PROJECT_DIR$/data/d2" />
<element id="dir-copy" path="$PROJECT_DIR$/data/d1" />
</root>
</artifact>
<artifact name="classes">
<output-path>$PROJECT_DIR$/out/artifacts/classes</output-path>
<root id="root">
<element id="module-output" name="dep" />
<element id="module-output" name="overwriteTest" />
</root>
</artifact>
</component>
<component name="CompilerConfiguration">
<option name="DEFAULT_COMPILER" value="Javac" />
<resourceExtensions>
<entry name=".+\.(properties|xml|html|dtd|tld)" />
<entry name=".+\.(gif|png|jpeg|jpg)" />
</resourceExtensions>
<wildcardResourcePatterns>
<entry name="?*.properties" />
<entry name="?*.xml" />
<entry name="?*.gif" />
<entry name="?*.png" />
<entry name="?*.jpeg" />
<entry name="?*.jpg" />
<entry name="?*.html" />
<entry name="?*.dtd" />
<entry name="?*.tld" />
<entry name="?*.ftl" />
</wildcardResourcePatterns>
<annotationProcessing enabled="false" useClasspath="true" />
</component>
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/dep/dep.iml" filepath="$PROJECT_DIR$/dep/dep.iml" />
<module fileurl="file://$PROJECT_DIR$/overwriteTest.iml" filepath="$PROJECT_DIR$/overwriteTest.iml" />
</modules>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
jps/testData/overwriteTest/src/a.xml
+1
View File
@@ -0,0 +1 @@
<root1/>
jps/testSrc/org/jetbrains/jps/JpsBuildTestCase.groovy
+3 -1
View File
@@ -2,7 +2,9 @@ package org.jetbrains.jps
import junit.framework.TestCase
import org.codehaus.gant.GantBinding
import org.jetbrains.jps.idea.IdeaProjectLoader;
import org.jetbrains.jps.idea.IdeaProjectLoader
import org.jetbrains.jps.util.FileSystemItem
import org.jetbrains.jps.util.FileUtil;
/**
* @author nik
jps/testSrc/org/jetbrains/jps/OverwriteTest.groovy
+27
View File
@@ -0,0 +1,27 @@
package org.jetbrains.jps
/**
* @author nik
*/
class OverwriteTest extends JpsBuildTestCase {
public void testOverwriteArtifacts() throws Exception {
doTest("testData/overwriteTest/overwriteTest.ipr", {}, {
dir("artifacts") {
dir("classes") {
file("a.xml", "<root2/>")
}
dir("dirs") {
file("x.txt", "d2")
}
}
dir("production") {
dir("dep") {
file("a.xml", "<root2/>")
}
dir("overwriteTest") {
file("a.xml", "<root1/>")
}
}
})
}
}
jps/testSrc/org/jetbrains/jps/FileSystemItem.groovy → jps/testSrc/org/jetbrains/jps/util/FileSystemItem.groovy
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jps
package org.jetbrains.jps.util
import junit.framework.Assert
jps/testSrc/org/jetbrains/jps/FileUtil.groovy → jps/testSrc/org/jetbrains/jps/util/FileUtil.groovy
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jps
package org.jetbrains.jps.util
/**
* @author nik
jps/testSrc/org/jetbrains/jps/ZipUtil.groovy → jps/testSrc/org/jetbrains/jps/util/ZipUtil.groovy
+1 -1
View File
@@ -1,4 +1,4 @@
package org.jetbrains.jps
package org.jetbrains.jps.util
import java.util.zip.ZipEntry
import java.util.zip.ZipFile