azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix modules tests

Browse Source
This commit is contained in:
Alexey Tsvetkov
2015-09-03 14:17:17 +03:00
parent 0988b21e9c
commit b25dfabbcc
22 changed files with 41 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleBuilder.kt
+1 -2
View File
@@ -17,7 +17,7 @@
package org.jetbrains.kotlin.cli.common.modules
import org.jetbrains.kotlin.modules.Module
import java.util.ArrayList
import java.util.*
public class ModuleBuilder(
private val name: String,
@@ -53,4 +53,3 @@ public class ModuleBuilder(
override fun getModuleName(): String = name
override fun getModuleType(): String = type
}
compiler/cli/cli-common/src/org/jetbrains/kotlin/cli/common/modules/ModuleXmlParser.java
+5 -13
View File
@@ -19,7 +19,6 @@ package org.jetbrains.kotlin.cli.common.modules;
import com.intellij.openapi.util.io.StreamUtil;
import com.intellij.util.SmartList;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.jps.builders.java.JavaModuleBuildTargetType;
import org.jetbrains.kotlin.cli.common.messages.MessageCollector;
import org.jetbrains.kotlin.cli.common.messages.MessageCollectorUtil;
import org.jetbrains.kotlin.cli.common.messages.OutputMessageUtil;
@@ -43,6 +42,8 @@ public class ModuleXmlParser {
public static final String MODULE = "module";
public static final String NAME = "name";
public static final String TYPE = "type";
public static final String TYPE_PRODUCTION = "java-production";
public static final String TYPE_TEST = "java-test";
public static final String OUTPUT_DIR = "outputDir";
public static final String SOURCES = "sources";
public static final String JAVA_SOURCE_ROOTS = "javaSourceRoots";
@@ -127,24 +128,15 @@ public class ModuleXmlParser {
throw createError(qName);
}
String moduleType = getAttribute(attributes, TYPE, qName);
assert(TYPE_PRODUCTION.equals(moduleType) || TYPE_TEST.equals(moduleType)): "Unknown module type: " + moduleType;
setCurrentState(new InsideModule(
getAttribute(attributes, NAME, qName),
getAttribute(attributes, OUTPUT_DIR, qName),
getType(attributes, qName)
moduleType
));
}
@NotNull
private String getType(@NotNull Attributes attributes, @NotNull String tag) {
String value = attributes.getValue(TYPE);
assert value != null &&
(JavaModuleBuildTargetType.PRODUCTION.getTypeId().equals(value) ||
JavaModuleBuildTargetType.TEST.getTypeId().equals(value)): "Unknown value of module type: " + value;
return value;
}
@Override
public void endElement(String uri, @NotNull String localName, @NotNull String qName) throws SAXException {
if (MODULE.equalsIgnoreCase(qName) || MODULES.equalsIgnoreCase(qName)) {