### Eclipse Workspace Patch 1.0
#P ScenarioTests.ScaleLog
Index: src/net/ssehub/easy/scaleLog/RealTests.java
===================================================================
--- src/net/ssehub/easy/scaleLog/RealTests.java	(revision 248)
+++ src/net/ssehub/easy/scaleLog/RealTests.java	(working copy)
@@ -8,7 +8,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.junit.Assert;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -72,6 +71,11 @@
     protected File getTestFolder() {
         return new File(getTestDataDir(), "real");
     }
+    
+    @Override
+    protected String getMeasurementFileName() {
+        return "measurements-scaleLog.tsv";
+    }
 
     /**
      * Executes an ScaleLog case.
@@ -79,18 +83,19 @@
      * @param projectName the name of the project
      * @param ivmlVersion the version of the IVML file (may be <b>null</b>)
      * @param vilVersion the version of the VIL build file (may be <b>null</b>)
-     * @param doReasoning whether reasoning shall be performed and no conflicts asserted
+     * @param mode the execution mode
      * @param makeExecutable those files (in relative paths) within the temporary copy of the project to be 
      *   made executable
-     * @return the base directory of the instantiated project
+     * @return the base directory of the instantiated project (<b>null</b> for no asserts)
      * @throws IOException in case of I/O problems
      */
     protected File executeScaleLogCase(String projectName, String ivmlVersion, String vilVersion, 
-        boolean doReasoning, String... makeExecutable) throws IOException {
+        Mode mode, String... makeExecutable) throws IOException {
         String[] curModelPaths = modelPaths;
         modelPaths = SCALELOG_MODEL_PATHS;
         String[] versions = {ivmlVersion, vilVersion};
-        File result = executeCase(projectName, versions, "ScaleLog/", null, doReasoning, makeExecutable);
+        File result = executeCase(projectName, versions, "ScaleLog/", null, mode, 
+            new MakeExecutableTestModifier(makeExecutable));
         modelPaths = curModelPaths;
         return result;
     }
@@ -105,26 +110,27 @@
         final String[] gradleExe = {"gradle.bat", "gradle.sh"};
         
         String projectName = "PL_ScaleLog_VIL";
-        File base = executeScaleLogCase(projectName, "0", "0", false, gradleExe); // no reasoning, keep original test
-        Assert.assertNotNull(projectName + " execution failed, thus no base file available", base);
-
-        TextTestUtils.assertFileEquality(
-            new File(base, "src/main/java/de/klug_is/scalelog/wm/inquiry.blacklist"), 
-            new File(base, "expected/inquiry.blacklist"));
-        
-        assertFileEqualityRec(
-            new File(base, "expected/workflows"), 
-            new File(base, "src/main/java/de/klug_is/scalelog/wm/goodsreceipt/workflows"));
-
-        TextTestUtils.assertFileEquality(
-            new File(base, "src/main/resources/ScaleLogResourcesPrj_de.properties"), 
-            new File(base, "expected/ScaleLogResourcesPrj_de.properties"));
-
-        TextTestUtils.assertFileEquality(
-            new File(base, "config/menubar.xml"), 
-            new File(base, "expected/menubar.xml"));
-
-        cleanup(base);
+        // no reasoning here, keep original test
+        File base = executeScaleLogCase(projectName, "0", "0", Mode.INSTANTIATE, gradleExe);
+        if (null != base) {
+            TextTestUtils.assertFileEquality(
+                new File(base, "src/main/java/de/klug_is/scalelog/wm/inquiry.blacklist"), 
+                new File(base, "expected/inquiry.blacklist"));
+            
+            assertFileEqualityRec(
+                new File(base, "expected/workflows"), 
+                new File(base, "src/main/java/de/klug_is/scalelog/wm/goodsreceipt/workflows"));
+    
+            TextTestUtils.assertFileEquality(
+                new File(base, "src/main/resources/ScaleLogResourcesPrj_de.properties"), 
+                new File(base, "expected/ScaleLogResourcesPrj_de.properties"));
+    
+            TextTestUtils.assertFileEquality(
+                new File(base, "config/menubar.xml"), 
+                new File(base, "expected/menubar.xml"));
+    
+            cleanup(base);
+        }
     }
 
     /**
@@ -198,25 +204,25 @@
         throws IOException {
         String projectName = NAME_DEC_13;
         
-        File base = executeScaleLogCase(projectName, ivmlVersion, vilVersion, true);
-        Assert.assertNotNull(projectName + " execution failed, thus no base file available", base);
-
-        final String srcEasyResources = "src/easy/resources/";
-        final String srcEasyWfTest = "src/easy/java/de/klug_is/scalelog/wm/goodsreceipt/workflows/test/";
-        final String srcEasyStorageLoc = "src/easy/java/de/klug_is/scalelog/wm/warehouse/storagelocation/";
-        final String expectedFolder = "expected/" + expectedVersion + "/";
-        final String expectedFolderWfTest = expectedFolder + "test/";
-        final String expectedFolderStorageLoc = expectedFolder + "storagelocation/";
-        
-        assertFileEquality(base, expectedFolder, srcEasyResources, "inquiry.blacklist");
-        assertFileEquality(base, expectedFolder, srcEasyResources, "menubar.xml");
-        assertFileEquality(base, expectedFolder, srcEasyResources, "scalelog-context_customer_gen.xml");
-        assertFileEquality(base, expectedFolder, srcEasyResources, "ScaleLogResourcesPrj_de.properties");
-        assertFileEquality(base, expectedFolder, srcEasyResources, "TO_Sku.xsd");
-        assertFileEqualityRec(new File(base, expectedFolderWfTest), new File(base, srcEasyWfTest));
-        assertFileEquality(base, expectedFolderStorageLoc, srcEasyStorageLoc, "StorageLocationType.java");
-
-        cleanup(base);
+        File base = executeScaleLogCase(projectName, ivmlVersion, vilVersion, Mode.REASON_INSTANTIATE);
+        if (null != base) {
+            final String srcEasyResources = "src/easy/resources/";
+            final String srcEasyWfTest = "src/easy/java/de/klug_is/scalelog/wm/goodsreceipt/workflows/test/";
+            final String srcEasyStorageLoc = "src/easy/java/de/klug_is/scalelog/wm/warehouse/storagelocation/";
+            final String expectedFolder = "expected/" + expectedVersion + "/";
+            final String expectedFolderWfTest = expectedFolder + "test/";
+            final String expectedFolderStorageLoc = expectedFolder + "storagelocation/";
+            
+            assertFileEquality(base, expectedFolder, srcEasyResources, "inquiry.blacklist");
+            assertFileEquality(base, expectedFolder, srcEasyResources, "menubar.xml");
+            assertFileEquality(base, expectedFolder, srcEasyResources, "scalelog-context_customer_gen.xml");
+            assertFileEquality(base, expectedFolder, srcEasyResources, "ScaleLogResourcesPrj_de.properties");
+            assertFileEquality(base, expectedFolder, srcEasyResources, "TO_Sku.xsd");
+            assertFileEqualityRec(new File(base, expectedFolderWfTest), new File(base, srcEasyWfTest));
+            assertFileEquality(base, expectedFolderStorageLoc, srcEasyStorageLoc, "StorageLocationType.java");
+    
+            cleanup(base);
+        }
     }
 
     /**
@@ -241,9 +247,11 @@
     @Test
     public void classpathTest() throws IOException {
         String[] versions = {"0", "0"};
-        File base = executeCase("cp", versions, "", null, true);
-        assertFileEquality(base, "expected/", "", "testfile.txt");
-        cleanup(base);
+        File base = executeCase("cp", versions, "", null, Mode.REASON_INSTANTIATE);
+        if (null != base) {
+            assertFileEquality(base, "expected/", "", "testfile.txt");
+            cleanup(base);
+        }
     }
     
     @Override
