From ba831d4e5e7c2621fe5c09838e21fcb18df92158 Mon Sep 17 00:00:00 2001 From: fixminer Date: Thu, 9 Apr 2020 13:31:56 +0200 Subject: [PATCH] fix gumtree test cases --- .gitignore | 3 + .idea/workspace.xml | 1003 ++++++++++------- README.md | 29 +- .../github/gumtreediff/io/TreeIoUtils.java | 6 +- .../gumtreediff/test/TestActionGenerator.java | 4 +- .../github/gumtreediff/test/TreeLoader.java | 1 + .../gen/srcml/TestSrcmlCGenerator.java | 3 + .../gen/srcml/TestSrcmlCppGenerator.java | 4 +- .../gen/srcml/TestSrcmlCsGenerator.java | 4 +- .../gen/srcml/TestSrcmlJavaGenerator.java | 4 +- .../serval/richedit/jobs/EnhancedASTDiff.java | 11 +- .../serval/{FixPatternMiner => }/AppTest.java | 2 +- .../{FixPatternMiner => }/BaseTest.java | 4 +- .../{FixPatternMiner => }/HunkParserTest.java | 2 +- .../{FixPatternMiner => }/TestInputCases.java | 2 +- .../{FixPatternMiner => }/TestIntroClass.java | 2 +- .../TestPredefinedCases.java | 2 +- .../{FixPatternMiner => }/TestRealCases.java | 7 +- src/main/resources/config.yml | 6 +- 19 files changed, 672 insertions(+), 427 deletions(-) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/AppTest.java (93%) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/BaseTest.java (97%) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/HunkParserTest.java (99%) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/TestInputCases.java (99%) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/TestIntroClass.java (99%) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/TestPredefinedCases.java (99%) rename richedit/src/test/java/edu/lu/uni/serval/{FixPatternMiner => }/TestRealCases.java (99%) diff --git a/.gitignore b/.gitignore index 3f18fc8..310ffdd 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,6 @@ OUTPUT/ Dataset/ logs/ gen.jdt/src/main/java/edu/lu/uni/serval/gumtree/GumTreeTester.java +*.pyc +app.log +*.rdb diff --git a/.idea/workspace.xml b/.idea/workspace.xml index d969d09..de281b3 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,19 @@ - + + + + + + + + + + + + + @@ -24,29 +36,20 @@ - - + + - - + + - + - - - - - - - - - - - + + @@ -54,77 +57,14 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - richedit + stopD + 'shapes' + TestTreeUtils fixminer @@ -141,8 +81,6 @@ @@ -225,6 +178,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -241,11 +258,11 @@ - + - + @@ -255,6 +272,7 @@ + @@ -270,57 +288,99 @@ - + - - @@ -453,12 +494,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + @@ -466,13 +539,13 @@ - - + + - - + + @@ -482,7 +555,7 @@ - + @@ -498,7 +571,7 @@ file://$PROJECT_DIR$/python/main.py - 31 + 33 @@ -507,9 +580,54 @@ - file://$PROJECT_DIR$/python/common/commons.py - 91 - + + file://$PROJECT_DIR$/python/javaDS.py + 20 + + + file://$PROJECT_DIR$/python/javaDS.py + 69 + + + file://$PROJECT_DIR$/python/javaDS.py + 76 + + + file://$PROJECT_DIR$/python/javaDS.py + 23 + + + file://$PROJECT_DIR$/python/javaDS.py + 60 + + + file://$PROJECT_DIR$/python/main.py + 51 + + + file://$PROJECT_DIR$/python/main.py + 49 + + + file://$PROJECT_DIR$/python/main.py + 50 + + + file://$PROJECT_DIR$/python/javaDS.py + 32 + file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/richedit/jobs/EnhancedASTDiff.java @@ -517,220 +635,77 @@ + + file://$PROJECT_DIR$/richedit/src/main/java/edu/lu/uni/serval/Launcher.java + 72 + + + + file://$PROJECT_DIR$/gumtree/core/src/main/java/com/github/gumtreediff/io/TreeIoUtils.java + 652 + + + + file://$PROJECT_DIR$/gumtree/core/src/test/java/com/github/gumtreediff/test/TestActionGenerator.java + 60 + + - fixminer.get("numOfWorkers") + Integer.parseInt(s.getAttributeByName(TYPE).getValue()); JAVA CODE_FRAGMENT - obj.get("fixminer") - JAVA - java.util.LinkedHashMap - CODE_FRAGMENT - - - obj.get("fixminer").get("numOfWorkers") - JAVA - java.util.LinkedHashMap.Entry,java.util.LinkedHashMap - CODE_FRAGMENT - - - obj.get("fixminer").get("numberOfWorkers") - JAVA - java.util.LinkedHashMap.Entry,java.util.LinkedHashMap - CODE_FRAGMENT - - - obj.get("fixminer") - JAVA - java.util.LinkedHashMap.Entry,java.util.LinkedHashMap - CODE_FRAGMENT - - - ((LinkedHashMap)((LinkedHashMap.Entry)((LinkedHashMap)obj).entrySet().toArray()[4]).getValue()).entrySet().toArray()[4] - JAVA - java.util.LinkedHashMap.Entry,java.util.LinkedHashMap - CODE_FRAGMENT - - - args.length == 0 + System.class.getResourceAsStream(name) JAVA CODE_FRAGMENT - args.equals("") - JAVA + str(cfg['fixminer']['portDumps']) + Python CODE_FRAGMENT - args == null - JAVA + cfg['fixminer']['portDumps'] + Python + CODE_FRAGMENT + + + os.environ["REDIS_PORT"] = cfg['fixminer']['portDumps'] + Python + CODE_FRAGMENT + + + subjects[subjects.Repo.isin(pjList)][['Repo', 'GitRepo']].values.tolist() + Python + CODE_FRAGMENT + + + subjects[subjects.Repo.isin(pjList)] + Python + CODE_FRAGMENT + + + subjects.Repo.isin(pjList) + Python + CODE_FRAGMENT + + + subjects[['Repo','GitRepo']] + Python CODE_FRAGMENT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -768,13 +743,6 @@ - - - - - - - @@ -789,23 +757,6 @@ - - - - - - - - - - - - - - - - - @@ -823,13 +774,6 @@ - - - - - - - @@ -837,13 +781,6 @@ - - - - - - - @@ -851,6 +788,304 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/README.md b/README.md index 0e31d5d..e2a7d6a 100644 --- a/README.md +++ b/README.md @@ -73,29 +73,25 @@ In order to launch FixMiner, execute [fixminer.sh](python/fixminer.sh) *FixMiner* needs to specify a job to run. 1. __dataset4j__ / __dataset4c__: Create a java/c mining dataset from the projects listed in [subjects.csv](python/data/subjects.csv) or [datasets.csv](python/data/datasets.csv) for c - - + 2. __richEditScript__: Calls the jar file produced as the results as maven package to compute Rich edit scripts. This step can be invoke natively from java or using the [Launcher](src/main/java/edu/lu/uni/serval/richedit/Launcher.java) with appropriate arguments. - - ```powershell - java -jar FixPatternMiner-1.0.0-jar-with-dependencies.jar /Users/projects/release/fixminer_source/src/main/resources/config.yml RICHEDITSCRIPT - ``` - - + ```powershell + java -jar FixPatternMiner-1.0.0-jar-with-dependencies.jar /Users/projects/release/fixminer_source/src/main/resources/config.yml RICHEDITSCRIPT + ``` + 3. __shapeSI__: Search index creation for shapes. The output of this step is written to __pairs__ folder which will be generated under __datapath__ in [config file](src/main/resources/config.yml) - 3. __shapeSI__: Search index creation for shapes. The output of this step is written to __pairs__ which will be generated under __datapath__ in [config file](src/main/resources/config.yml) - - 4. __compareShapes__ : Calls the jar file produced as the results as maven package to compare the trees. + 4. __compare__ : Calls the jar file produced as the results as maven package to compare the trees. This step can be invoke natively from java or using the [Launcher](src/main/java/edu/lu/uni/serval/richedit/Launcher.java) with appropriate arguments. ```powershell - java -jar FixPatternMiner-1.0.0-jar-with-dependencies.jar /Users/projects/release/fixminer_source/src/main/resources/config.yml COMPARETREES + java -jar FixPatternMiner-1.0.0-jar-with-dependencies.jar /Users/projects/release/fixminer_source/src/main/resources/config.yml COMPARE - ``` - - 5. 'cluster': Forms clusters of identical shapetree. The output of this step is written to [shapes](python/data/shapes) + ``` + 5. __cluster__ : Forms clusters of identical trees. The output of this step is written to __shapes__ folder which will be generated under __datapath__ in [config file](src/main/resources/config.yml) + +