From 23ae05c4078edb858c136e20f9a0c60f71ab5f7c Mon Sep 17 00:00:00 2001
From: fixminer <fixminer@fixminer.com>
Date: Fri, 10 Apr 2020 15:08:49 +0200
Subject: [PATCH] fix srcml path in test

---
 .idea/workspace.xml                           | 51 +++++++++++--------
 .../lu/uni/serval/TestPredefinedCases.java    |  4 +-
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 88ec0c0..b058727 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -27,8 +27,20 @@
       <file pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="95">
-              <caret line="72" selection-start-line="72" selection-end-line="72" />
+            <state relative-caret-position="193">
+              <caret line="24" column="28" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="28" />
+            </state>
+          </provider>
+        </entry>
+      </file>
+      <file pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestGumtreeMatcher.java">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="132">
+              <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
@@ -60,15 +72,6 @@
           </provider>
         </entry>
       </file>
-      <file pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/tree/ITree.java">
-          <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="186">
-              <caret line="166" column="9" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" />
-            </state>
-          </provider>
-        </entry>
-      </file>
       <file pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffParser.java">
           <provider selected="true" editor-type-id="text-editor">
@@ -152,6 +155,7 @@
       <find>setPos</find>
       <find>parseChangedSourceCodeWithGumTree2</find>
       <find>compareCFilesWithGumTree</find>
+      <find>TestGumtreeMatcher</find>
     </findStrings>
     <replaceStrings>
       <replace>fixminer</replace>
@@ -658,12 +662,12 @@
       <window_info id="Favorites" order="6" side_tool="true" />
       <window_info anchor="bottom" id="Message" order="0" />
       <window_info anchor="bottom" id="Find" order="1" sideWeight="0.4993895" weight="0.32959184" />
-      <window_info active="true" anchor="bottom" id="Run" order="2" sideWeight="0.4920635" visible="true" weight="0.32959184" />
+      <window_info anchor="bottom" id="Run" order="2" sideWeight="0.4920635" weight="0.32959184" />
       <window_info anchor="bottom" id="Debug" order="3" sideWeight="0.4981685" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
       <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Terminal" order="7" sideWeight="0.71428573" weight="0.32959184" />
+      <window_info active="true" anchor="bottom" id="Terminal" order="7" sideWeight="0.71428573" visible="true" weight="0.32959184" />
       <window_info anchor="bottom" id="Event Log" order="8" sideWeight="0.50183153" side_tool="true" weight="0.4" />
       <window_info anchor="bottom" id="Version Control" order="9" />
       <window_info anchor="bottom" id="Messages" order="10" sideWeight="0.498779" weight="0.32959184" />
@@ -860,13 +864,6 @@
     </expressions>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="173">
-          <caret line="35" column="34" selection-start-line="35" selection-start-column="29" selection-end-line="35" selection-end-column="34" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="396">
@@ -1242,10 +1239,20 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestGumtreeMatcher.java">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="132">
+          <caret line="32" column="13" selection-start-line="32" selection-start-column="13" selection-end-line="32" selection-end-column="13" />
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="95">
-          <caret line="72" selection-start-line="72" selection-end-line="72" />
+        <state relative-caret-position="193">
+          <caret line="24" column="28" selection-start-line="24" selection-start-column="28" selection-end-line="24" selection-end-column="28" />
         </state>
       </provider>
     </entry>
diff --git a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
index 1e77a34..25395a9 100644
--- a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
+++ b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
@@ -22,7 +22,7 @@ public class TestPredefinedCases {
     public void testIFCase1() throws IOException {
         Properties appProps = new Properties();
         appProps.load(new FileInputStream("src/main/resource/app.properties"));
-        String srcMLPath = appProps.getProperty("srcMLPath","FORKJOIN");
+        String srcMLPath = "";
 
         File revFile = new File("src/main/resource/testFiles/if_example_1.c");
         File prevFile =new File("src/main/resource/testFiles/prev_if_example_1.c");
@@ -45,7 +45,7 @@ public class TestPredefinedCases {
     public void testForCase1() throws IOException {
         Properties appProps = new Properties();
         appProps.load(new FileInputStream("src/main/resource/app.properties"));
-        String srcMLPath = appProps.getProperty("srcMLPath","FORKJOIN");
+        String srcMLPath = "";
 
         File revFile = new File("src/main/resource/testFiles/for_example_1.c");
         File prevFile =new File("src/main/resource/testFiles/prev_for_example_1.c");