Aufgrund einer Störung des s3 Storage, könnten in nächster Zeit folgende GitLab Funktionen nicht zur Verfügung stehen: LFS, Container Registry, Job Artifacs, Uploads (Wiki, Bilder, Projekt-Exporte). Wir bitten um Verständnis. Es wird mit Hochdruck an der Behebung des Problems gearbeitet. Weitere Informationen zur Störung des Object Storage finden Sie hier: https://maintenance.itc.rwth-aachen.de/ticket/status/messages/59-object-storage-pilot

Commit 17aed126 authored by vonWenckstern's avatar vonWenckstern
Browse files

fixed tests (runs with SE profile)

parent e8ec63d6
......@@ -87,16 +87,19 @@
<version>4.3.1</version>
</dependency>
<!-- .. Test Libraries ............................................... -->
<!-- .. Test Libraries ............................................... -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>de.monticore</groupId>
<artifactId>monticore-runtime</artifactId>
<version>${monticore.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
......@@ -104,12 +107,13 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<scope>test</scope>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>de.se_rwth.commons</groupId>
<artifactId>se-commons-groovy</artifactId>
<version>${se-commons.version}</version>
<groupId>org.jscience</groupId>
<artifactId>jscience</artifactId>
<version>${jscience.version}</version>
</dependency>
</dependencies>
......@@ -133,6 +137,12 @@
<!-- Other Configuration -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>${compiler.plugin}</version>
<configuration>
<useIncrementalCompilation>true</useIncrementalCompilation>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
......
......@@ -7,7 +7,7 @@ package de.monticore.lang;
*/
grammar TagSchema extends de.monticore.common.Common {
TagSchemaUnit@! =
TagSchemaUnit =
("package" package:(Name& || ".")+ ";")?
(ImportStatement)*
"tagschema" Name "{" TagType+ "}";
......@@ -55,7 +55,7 @@ grammar TagSchema extends de.monticore.common.Common {
Scope = "for" (ScopeIdentifier || ",")+;
SimpleTagType implements TagType = ("private")? "tagtype" Name Scope? ";" ;
symbol SimpleTagType implements TagType = ("private")? "tagtype" Name Scope? ";" ;
// modification form ML's tagging language (replaced String by Name --> is more to Java feeling)
EnumeratedTagType implements TagType = ("private")? "tagtype" name:Name ":" enumText:Enum Scope? ";" ;
......
......@@ -7,7 +7,7 @@ package de.monticore.lang;
*/
grammar Tagging extends de.monticore.common.Common {
TaggingUnit@! =
TaggingUnit =
("package" package:(Name& || ".")+ ";")?
(ImportStatement)*
"conforms" "to" (QualifiedName || ",")+ ";"
......@@ -23,7 +23,7 @@ grammar Tagging extends de.monticore.common.Common {
// interface TagElement;
Tag = "tag" (Scope || ",")+ "with" TagElement+;
TagElement = Name (TagValue | ";");
symbol TagElement = Name (TagValue | ";");
fragment token WSS = (' ' | '\t' | '\r' | '\n');
......
......@@ -2,8 +2,7 @@ package de.monticore.lang.tagging._symboltable;
import java.util.ArrayList;
import java.util.List;
import de.monticore.lang.montiarc.helper.IndentPrinter;
import java.util.stream.Collectors;
/**
* Symboltable entry for tag.
......@@ -48,9 +47,14 @@ public class TagSymbol extends de.monticore.symboltable.CommonSymbol {
@Override
public String toString() {
return IndentPrinter.groups("{0}: ", "{1:'{':',':'}'}")
.<String, ArrayList<Object>>params(KIND.getName(), values)
.toString();
StringBuilder sb = new StringBuilder();
sb.append(KIND.getName());
if (!values.isEmpty()) {
sb.append("{")
.append(values.stream().map(v -> v.toString()).collect(Collectors.joining(";")))
.append("}");
}
return sb.toString();
}
@Override
......
......@@ -98,7 +98,7 @@ public class TagSchemaGenerator extends GeneratorEngine {
}
public void generateTagSchema(ASTTagSchemaUnit tagSchemaUnit, String packageName, List<String> tagTypeNames) {
generate("templates.de.monticore.lang.montiarc.tagschema.TagSchema",
generate("templates.de.monticore.lang.tagschema.TagSchema",
Paths.get(createPackagePath(packageName).toString(), tagSchemaUnit.getName(), tagSchemaUnit.getName() + ".java"),
tagSchemaUnit, packageName, tagSchemaUnit.getName(), tagTypeNames);
}
......@@ -134,13 +134,13 @@ public class TagSchemaGenerator extends GeneratorEngine {
}
}
Log.errorIfNull(dataType, "Not supported data type in generator");
generate("templates.de.monticore.lang.montiarc.tagschema.ValuedTagType",
generate("templates.de.monticore.lang.tagschema.ValuedTagType",
Paths.get(createPackagePath(packageName).toString(), tagSchemaUnit.getName(), valuedTagType.getName() + "Symbol.java"),
tagSchemaUnit, packageName, tagSchemaUnit.getName(), valuedTagType.getName(), dataType, isUnit);
String importSymbols = "de.monticore.lang.montiarc.montiarc._symboltable.*";
String importSymbols = "de.monticore.lang.montiarc._symboltable.*";
String scopeSymbol = valuedTagType.getScope().get().getScopeIdentifiers().get(0).getScopeName();
String nameScopeType = Log.errorIfNull(symbolScopeMap.get(scopeSymbol), String.format("For the scope symbol '%s' is no scope type defined.", scopeSymbol));
generate("templates.de.monticore.lang.montiarc.tagschema.ValuedTagTypeCreator",
generate("templates.de.monticore.lang.tagschema.ValuedTagTypeCreator",
Paths.get(createPackagePath(packageName).toString(),tagSchemaUnit.getName(), valuedTagType.getName() + "SymbolCreator.java"),
tagSchemaUnit, packageName, tagSchemaUnit.getName(), valuedTagType.getName(), importSymbols, scopeSymbol + "Symbol", nameScopeType, dataType, isUnit);
}
......@@ -156,13 +156,13 @@ public class TagSchemaGenerator extends GeneratorEngine {
protected void generateSimpleTagType(ASTSimpleTagType simpleTagType, ASTTagSchemaUnit tagSchemaUnit,
String packageName, Map<String, String> symbolScopeMap) {
generate("templates.de.monticore.lang.montiarc.tagschema.SimpleTagType",
generate("templates.de.monticore.lang.tagschema.SimpleTagType",
Paths.get(createPackagePath(packageName).toString(), tagSchemaUnit.getName(), simpleTagType.getName() + "Symbol.java"),
tagSchemaUnit, packageName, tagSchemaUnit.getName(), simpleTagType.getName());
String importSymbols = "de.monticore.lang.montiarc.montiarc._symboltable.*";
String importSymbols = "de.monticore.lang.montiarc._symboltable.*";
String scopeSymbol = simpleTagType.getScope().get().getScopeIdentifiers().get(0).getScopeName();
String nameScopeType = Log.errorIfNull(symbolScopeMap.get(scopeSymbol), String.format("For the scope symbol '%s' is no scope type defined.", scopeSymbol));
generate("templates.de.monticore.lang.montiarc.tagschema.SimpleTagTypeCreator",
generate("templates.de.monticore.lang.tagschema.SimpleTagTypeCreator",
Paths.get(createPackagePath(packageName).toString(), tagSchemaUnit.getName(), simpleTagType.getName() + "SymbolCreator.java"),
tagSchemaUnit, packageName, tagSchemaUnit.getName(), simpleTagType.getName(), importSymbols, scopeSymbol + "Symbol", nameScopeType);
}
......
......@@ -3,11 +3,10 @@
*
* http://www.se-rwth.de/
*/
package de.monticore.lang.montiarc.generator;
package de.monticore.lang.tagging.generator;
import java.io.File;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
import de.se_rwth.commons.configuration.Configuration;
......
package de.monticore.lang.montiarc.tagschema._ast;
package de.monticore.lang.tagschema._ast;
/**
* Created by MichaelvonWenckstern on 28.06.2016.
......
package de.monticore.lang.montiarc.tagschema._ast;
package de.monticore.lang.tagschema._ast;
import java.util.ArrayList;
import java.util.LinkedHashSet;
......
......@@ -8,11 +8,11 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import ${importSymbols};
import de.monticore.lang.montiarc.tagging._ast.ASTNameScope;
import de.monticore.lang.montiarc.tagging._ast.ASTScope;
import de.monticore.lang.montiarc.tagging._ast.ASTTag;
import de.monticore.lang.montiarc.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbolCreator;
import de.monticore.lang.tagging._ast.ASTNameScope;
import de.monticore.lang.tagging._ast.ASTScope;
import de.monticore.lang.tagging._ast.ASTTag;
import de.monticore.lang.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.tagging._symboltable.TagSymbolCreator;
import de.monticore.symboltable.Scope;
import de.se_rwth.commons.Joiners;
import de.se_rwth.commons.logging.Log;
......
......@@ -2,8 +2,8 @@ ${tc.signature("packageName", "schemaName", "tagTypeName")}
package ${packageName}.${schemaName};
import de.monticore.lang.montiarc.tagging._symboltable.TagKind;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbol;
import de.monticore.lang.tagging._symboltable.TagKind;
import de.monticore.lang.tagging._symboltable.TagSymbol;
/**
* Created by SimpleTagType.ftl
......
......@@ -7,11 +7,11 @@ import java.util.Optional;
import java.util.stream.Collectors;
import ${importSymbols};
import de.monticore.lang.montiarc.tagging._ast.ASTNameScope;
import de.monticore.lang.montiarc.tagging._ast.ASTScope;
import de.monticore.lang.montiarc.tagging._ast.ASTTag;
import de.monticore.lang.montiarc.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbolCreator;
import de.monticore.lang.tagging._ast.ASTNameScope;
import de.monticore.lang.tagging._ast.ASTScope;
import de.monticore.lang.tagging._ast.ASTTag;
import de.monticore.lang.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.tagging._symboltable.TagSymbolCreator;
import de.monticore.symboltable.Scope;
import de.monticore.symboltable.Symbol;
import de.monticore.symboltable.SymbolKind;
......
......@@ -3,7 +3,7 @@ ${tc.signature("packageName", "schemaName", "tagTypeNames")}
package ${packageName}.${schemaName};
import de.monticore.CommonModelingLanguage;
import de.monticore.lang.montiarc.tagging._symboltable.TagableModelingLanguage;
import de.monticore.lang.tagging._symboltable.TagableModelingLanguage;
import de.monticore.symboltable.resolving.CommonResolvingFilter;
/**
......
......@@ -2,8 +2,8 @@ ${tc.signature("packageName", "schemaName", "tagTypeName", "dataType", "isUnit")
package ${packageName}.${schemaName};
import de.monticore.lang.montiarc.tagging._symboltable.TagKind;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbol;
import de.monticore.lang.tagging._symboltable.TagKind;
import de.monticore.lang.tagging._symboltable.TagSymbol;
<#if isUnit>
import org.jscience.physics.amount.Amount;
......
......@@ -7,31 +7,31 @@ import java.util.Optional;
import java.util.stream.Collectors;
import ${importSymbols};
import de.monticore.lang.montiarc.montiarc._symboltable.ConnectorSymbol;
import de.monticore.lang.montiarc.tagging._ast.ASTNameScope;
import de.monticore.lang.montiarc.tagging._ast.ASTScope;
import de.monticore.lang.montiarc.tagging._ast.ASTTag;
import de.monticore.lang.montiarc.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbolCreator;
import de.monticore.lang.montiarc._symboltable.ConnectorSymbol;
import de.monticore.lang.tagging._ast.ASTNameScope;
import de.monticore.lang.tagging._ast.ASTScope;
import de.monticore.lang.tagging._ast.ASTTag;
import de.monticore.lang.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.tagging._symboltable.TagSymbolCreator;
import de.monticore.symboltable.Scope;
import de.monticore.symboltable.Symbol;
import de.monticore.symboltable.SymbolKind;
import de.se_rwth.commons.Joiners;
import de.se_rwth.commons.logging.Log;
import de.monticore.lang.montiarc.tagvalue._parser.TagValueParser;
import de.monticore.lang.tagvalue._parser.TagValueParser;
<#if isUnit>
import javax.measure.quantity.${dataType};
import javax.measure.unit.Unit;
import de.monticore.lang.montiarc.tagging.helper.NumericLiteral;
import de.monticore.lang.montiarc.tagvalue._ast.ASTUnitTagValue;
import de.monticore.lang.tagging.helper.NumericLiteral;
import de.monticore.lang.tagvalue._ast.ASTUnitTagValue;
<#elseif dataType = "String">
import de.monticore.lang.montiarc.tagvalue._ast.ASTStringTagValue;
import de.monticore.lang.tagvalue._ast.ASTStringTagValue;
<#elseif dataType = "Boolean">
import de.monticore.lang.montiarc.tagvalue._ast.ASTBooleanTagValue;
import de.monticore.lang.tagvalue._ast.ASTBooleanTagValue;
<#else>
import de.monticore.lang.montiarc.tagging.helper.NumericLiteral;
import de.monticore.lang.montiarc.tagvalue._ast.ASTNumericTagValue;
import de.monticore.lang.tagging.helper.NumericLiteral;
import de.monticore.lang.tagvalue._ast.ASTNumericTagValue;
</#if>
/**
......
......@@ -5,14 +5,14 @@ package ${packageName}.${schemaName};
import java.util.Optional;
import ${importSymbols};
import de.monticore.lang.montiarc.tagging._ast.ASTNameScope;
import de.monticore.lang.montiarc.tagging._ast.ASTScope;
import de.monticore.lang.montiarc.tagging._ast.ASTTag;
import de.monticore.lang.montiarc.tagging._ast.ASTTagElement;
import de.monticore.lang.montiarc.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.montiarc.tagging._ast.ASTTargetElement;
import de.monticore.lang.montiarc.tagging._ast.ASTValuedTag;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbolCreator;
import de.monticore.lang.tagging._ast.ASTNameScope;
import de.monticore.lang.tagging._ast.ASTScope;
import de.monticore.lang.tagging._ast.ASTTag;
import de.monticore.lang.tagging._ast.ASTTagElement;
import de.monticore.lang.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.tagging._ast.ASTTargetElement;
import de.monticore.lang.tagging._ast.ASTValuedTag;
import de.monticore.lang.tagging._symboltable.TagSymbolCreator;
import de.monticore.literals.literals._ast.ASTDoubleLiteral;
import de.monticore.literals.literals._ast.ASTFloatLiteral;
import de.monticore.literals.literals._ast.ASTIntLiteral;
......@@ -26,14 +26,14 @@ import de.monticore.symboltable.Scope;
import de.se_rwth.commons.Joiners;
import de.se_rwth.commons.logging.Log;
<#if isUnit>
import de.monticore.lang.montiarc.unit.*;
import de.monticore.lang.montiarc.tagging._ast.ASTUnitTagValue;
import de.monticore.lang.unit.*;
import de.monticore.lang.tagging._ast.ASTUnitTagValue;
<#elseif dataType = "String">
import de.monticore.lang.montiarc.tagging._ast.ASTStringTagValue;
import de.monticore.lang.tagging._ast.ASTStringTagValue;
<#elseif dataType = "Boolean">
import de.monticore.lang.montiarc.tagging._ast.ASTBooleanTagValue;
import de.monticore.lang.tagging._ast.ASTBooleanTagValue;
<#else>
import de.monticore.lang.montiarc.tagging._ast.ASTNumericTagValue;
import de.monticore.lang.tagging._ast.ASTNumericTagValue;
</#if>
/**
......
/* generated by template templates.de.monticore.lang.montiarc.tagschema.SimpleTagType*/
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagType*/
package de.monticore.lang.montiarc.tag.drawing.TraceabilityTagSchema;
import de.monticore.lang.montiarc.tagging._symboltable.TagKind;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbol;
import de.monticore.lang.tagging._symboltable.TagKind;
import de.monticore.lang.tagging._symboltable.TagSymbol;
/**
* Created by SimpleTagType.ftl
......
/* generated by template templates.de.monticore.lang.montiarc.tagschema.SimpleTagTypeCreator*/
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagTypeCreator*/
package de.monticore.lang.montiarc.tag.drawing.TraceabilityTagSchema;
......@@ -7,12 +7,12 @@ import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
import de.monticore.lang.montiarc.montiarc._symboltable.*;
import de.monticore.lang.montiarc.tagging._ast.ASTNameScope;
import de.monticore.lang.montiarc.tagging._ast.ASTScope;
import de.monticore.lang.montiarc.tagging._ast.ASTTag;
import de.monticore.lang.montiarc.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbolCreator;
import de.monticore.lang.montiarc._symboltable.*;
import de.monticore.lang.tagging._ast.ASTNameScope;
import de.monticore.lang.tagging._ast.ASTScope;
import de.monticore.lang.tagging._ast.ASTTag;
import de.monticore.lang.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.tagging._symboltable.TagSymbolCreator;
import de.monticore.symboltable.Scope;
import de.monticore.symboltable.Symbol;
import de.monticore.symboltable.SymbolKind;
......
/* generated by template templates.de.monticore.lang.montiarc.tagschema.TagSchema*/
/* generated by template templates.de.monticore.lang.tagschema.TagSchema*/
package de.monticore.lang.montiarc.tag.drawing.TraceabilityTagSchema;
import de.monticore.CommonModelingLanguage;
import de.monticore.lang.montiarc.tagging._symboltable.TagableModelingLanguage;
import de.monticore.lang.tagging._symboltable.TagableModelingLanguage;
import de.monticore.symboltable.resolving.CommonResolvingFilter;
/**
......
/* generated by template templates.de.monticore.lang.montiarc.tagschema.SimpleTagType*/
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagType*/
package de.monticore.lang.montiarc.tag.drawing.TraceabilityTagSchema;
import de.monticore.lang.montiarc.tagging._symboltable.TagKind;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbol;
import de.monticore.lang.tagging._symboltable.TagKind;
import de.monticore.lang.tagging._symboltable.TagSymbol;
/**
* Created by SimpleTagType.ftl
......
/* generated by template templates.de.monticore.lang.montiarc.tagschema.SimpleTagTypeCreator*/
/* generated by template templates.de.monticore.lang.tagschema.SimpleTagTypeCreator*/
package de.monticore.lang.montiarc.tag.drawing.TraceabilityTagSchema;
......@@ -7,12 +7,12 @@ import java.util.Collection;
import java.util.Optional;
import java.util.stream.Collectors;
import de.monticore.lang.montiarc.montiarc._symboltable.*;
import de.monticore.lang.montiarc.tagging._ast.ASTNameScope;
import de.monticore.lang.montiarc.tagging._ast.ASTScope;
import de.monticore.lang.montiarc.tagging._ast.ASTTag;
import de.monticore.lang.montiarc.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.montiarc.tagging._symboltable.TagSymbolCreator;
import de.monticore.lang.montiarc._symboltable.*;
import de.monticore.lang.tagging._ast.ASTNameScope;
import de.monticore.lang.tagging._ast.ASTScope;
import de.monticore.lang.tagging._ast.ASTTag;
import de.monticore.lang.tagging._ast.ASTTaggingUnit;
import de.monticore.lang.tagging._symboltable.TagSymbolCreator;
import de.monticore.symboltable.Scope;
import de.monticore.symboltable.Symbol;
import de.monticore.symboltable.SymbolKind;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment