azalea/fixminer_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

srcml path

Browse Source
This commit is contained in:
fixminer
2020-04-10 14:58:25 +02:00
parent 26ee9c2a23
commit 8fcb841858
2 changed files with 99 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.idea/workspace.xml
Generated
+93 -66
View File
@@ -2,11 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="75ef5724-93bc-4ed4-82b2-ff12411188dc" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java" beforeDir="false" afterPath="$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java" beforeDir="false" afterPath="$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/TestRealCases.java" afterDir="false" />
</list>
<ignored path="$PROJECT_DIR$/classes/" />
<ignored path="$PROJECT_DIR$/target/" />
@@ -31,8 +27,17 @@
<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="217">
<caret line="162" column="83" selection-start-line="162" selection-start-column="83" selection-end-line="162" selection-end-column="83" />
<state relative-caret-position="95">
<caret line="72" selection-start-line="72" selection-end-line="72" />
</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/EDiffHunkParser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="32" column="71" lean-forward="true" selection-start-line="32" selection-start-column="71" selection-end-line="32" selection-end-column="71" />
</state>
</provider>
</entry>
@@ -67,8 +72,8 @@
<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">
<state relative-caret-position="290">
<caret line="71" selection-start-line="71" selection-end-line="71" />
<state relative-caret-position="202">
<caret line="52" column="33" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
<folding>
<element signature="e#2020#2029#0" expanded="true" />
</folding>
@@ -76,6 +81,37 @@
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="36" column="11" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
<folding>
<element signature="e#1559#1560#0" expanded="true" />
<element signature="e#1585#1586#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="28" />
</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/HierarchicalRegrouperForC.java">
<provider selected="true" editor-type-id="text-editor">
@@ -85,18 +121,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/Tree.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
<caret line="113" selection-start-line="113" selection-end-line="113" />
<folding>
<element signature="e#3143#3144#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FindInProjectRecents">
@@ -126,6 +150,8 @@
<find>import</find>
<find>selector</find>
<find>setPos</find>
<find>parseChangedSourceCodeWithGumTree2</find>
<find>compareCFilesWithGumTree</find>
</findStrings>
<replaceStrings>
<replace>fixminer</replace>
@@ -588,9 +614,6 @@
<servers />
</component>
<component name="TestHistory">
<history-entry file="TestPredefinedCases_testWhileCase1 - 2020.04.10 at 14h 40m 23s.xml">
<configuration name="TestPredefinedCases.testWhileCase1" configurationId="JUnit" />
</history-entry>
<history-entry file="TestPredefinedCases_testWhileCase1 - 2020.04.10 at 14h 41m 22s.xml">
<configuration name="TestPredefinedCases.testWhileCase1" configurationId="JUnit" />
</history-entry>
@@ -618,6 +641,9 @@
<history-entry file="TestPredefinedCases - 2020.04.10 at 14h 47m 52s.xml">
<configuration name="TestPredefinedCases" configurationId="JUnit" />
</history-entry>
<history-entry file="TestPredefinedCases - 2020.04.10 at 14h 48m 13s.xml">
<configuration name="TestPredefinedCases" configurationId="JUnit" />
</history-entry>
</component>
<component name="ToolWindowManager">
<frame x="0" y="0" width="1680" height="1050" extended-state="0" />
@@ -1057,13 +1083,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-102">
<caret line="20" column="13" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/HunkParserTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="66">
@@ -1078,13 +1097,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="54" selection-start-line="54" selection-end-line="54" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.travis_native_dependencies.sh">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="30">
@@ -1099,13 +1111,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="23" column="24" selection-start-line="23" selection-start-column="24" selection-end-line="23" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/richedit/src/test/java/edu/lu/uni/serval/BaseTest.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="22">
@@ -1140,16 +1145,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="165">
<caret line="38" selection-start-line="38" selection-end-line="38" />
<folding>
<element signature="e#1585#1586#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/NodeMap_new.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="3267">
@@ -1185,16 +1180,6 @@
</state>
</provider>
</entry>
<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">
<state relative-caret-position="290">
<caret line="71" selection-start-line="71" selection-end-line="71" />
<folding>
<element signature="e#2020#2029#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/HierarchicalRegrouperForC.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="186">
@@ -1215,10 +1200,52 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/ediff/EDiffHunkParser.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
<caret line="32" column="71" lean-forward="true" selection-start-line="32" selection-start-column="71" selection-end-line="32" selection-end-column="71" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="135">
<caret line="36" column="11" selection-start-line="36" selection-start-column="11" selection-end-line="36" selection-end-column="11" />
<folding>
<element signature="e#1559#1560#0" expanded="true" />
<element signature="e#1585#1586#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/GumTreeCComparer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="120">
<caret line="22" column="24" selection-start-line="22" selection-start-column="24" selection-end-line="22" selection-end-column="24" />
</state>
</provider>
</entry>
<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">
<state relative-caret-position="202">
<caret line="52" column="33" selection-start-line="52" selection-start-column="33" selection-end-line="52" selection-end-column="33" />
<folding>
<element signature="e#2020#2029#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/gumtree/gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeComparer.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="19" column="19" lean-forward="true" selection-start-line="19" selection-start-column="13" selection-end-line="19" selection-end-column="28" />
</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="217">
<caret line="162" column="83" selection-start-line="162" selection-start-column="83" selection-end-line="162" selection-end-column="83" />
<state relative-caret-position="95">
<caret line="72" selection-start-line="72" selection-end-line="72" />
</state>
</provider>
</entry>
richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java
+6 -7
View File
@@ -70,13 +70,12 @@ public class TestPredefinedCases {
"------------DEL continue@@continue; @AT@ 62 @LENGTH@ 9\n");
}
//TODO
// @Ignore
@Test
public void testWhileCase1() 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/while_example_1.c");
File prevFile = new File("src/main/resource/testFiles/prev_while_example_1.c");
@@ -84,7 +83,7 @@ public class TestPredefinedCases {
EDiffHunkParser parser = new EDiffHunkParser();
List<HierarchicalActionSet> hierarchicalActionSets = parser.parseChangedSourceCodeWithGumTree2(prevFile, revFile, "",false);
List<HierarchicalActionSet> hierarchicalActionSets = parser.parseChangedSourceCodeWithGumTree2(prevFile, revFile, srcMLPath,false);
hierarchicalActionSets.size();
Assert.assertEquals(hierarchicalActionSets.size(), 1);
@@ -106,7 +105,7 @@ public class TestPredefinedCases {
public void testIFRetrun() 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_return.c");
File prevFile =new File("src/main/resource/testFiles/prev_if_return.c");
@@ -144,7 +143,7 @@ public class TestPredefinedCases {
public void testIfElse() 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_else.c");
File prevFile =new File("src/main/resource/testFiles/prev_if_else.c");
@@ -167,7 +166,7 @@ public class TestPredefinedCases {
public void testStruct() 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/struct.c");
File prevFile =new File("src/main/resource/testFiles/prev_struct.c");