Fixed bug in len print; added generated models for unit tests

Author: SundermannC

src/main/java/de/vill/model/expression/LengthAggregateFunctionExpression.java

@@ -5,6 +5,7 @@
 import de.vill.model.Feature;
 import de.vill.model.building.VariableReference;
 import de.vill.util.Constants;
+import de.vill.util.Util;
 
 import java.util.*;
 
@@ -18,7 +19,7 @@ public LengthAggregateFunctionExpression(final VariableReference reference) {
 
     @Override
     public String toString(final boolean withSubmodels, final String currentAlias) {
-        return String.format("len(%s)", reference.getIdentifier());
+        return String.format("len(%s)", Util.addNecessaryQuotes(reference.getIdentifier()));
     }
 
     @Override

src/test/java/de/vill/parsing/ParsingTests.java

@@ -65,6 +65,11 @@ public class ParsingTests {
 
     private static final String NESTED_SUB_COMPOSITION_ROOT = NESTED_MODEL_PREFIX  + "nested_sub.uvl";
 
+
+    // Generated models
+
+    private static final String GENERATED_DIRECTORY = TEST_MODEL_PREFIX + "generated";
+
     @Test
     void testBooleanModel() throws Exception {
         testModelParsing(SIMPLE_BOOLEAN);
@@ -124,6 +129,11 @@ void checkComplexModels() throws Exception {
         checkAllModelsInDirectory(COMPLEX_MODEL_PREFIX);
     }
 
+    @Test
+    void checkGeneratedModels() throws Exception {
+        checkAllModelsInDirectory(GENERATED_DIRECTORY);
+    }
+
     @Test
     void checkFaultyModels() throws Exception {
         testModelParsing(ILLEGAL_NAME, false);