From 569fad19858fb6f1a3765f588a261e86ef961636 Mon Sep 17 00:00:00 2001 From: fixminer Date: Thu, 9 Apr 2020 14:11:21 +0200 Subject: [PATCH] test ricedit --- .idea/workspace.xml | 359 +++++++++--------- .travis.yml | 2 +- .travis_native_dependencies.sh | 2 + .../gen/srcml/AbstractSrcmlTreeGenerator.java | 4 +- .../gen/srcml/SrcmlCTreeGenerator.java | 4 +- .../lu/uni/serval/TestPredefinedCases.java | 6 +- 6 files changed, 199 insertions(+), 178 deletions(-) create mode 100644 .travis_native_dependencies.sh diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ee9b5cc..bf8c34d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -3,6 +3,9 @@ + + + @@ -33,20 +36,80 @@ - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -122,8 +185,11 @@ @@ -195,20 +261,20 @@ - + - + - + @@ -216,7 +282,7 @@ - + @@ -225,77 +291,11 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -348,7 +348,7 @@ - + + + + + + + + @@ -427,23 +444,6 @@ - - - - - - - @@ -554,12 +554,6 @@ - - - - - - @@ -584,13 +578,19 @@ + + + + + + - - + + @@ -599,11 +599,11 @@ - + - + @@ -712,11 +712,38 @@ + + System.getProperty("gt.srcml.path", "srcml"); + JAVA + CODE_FRAGMENT + + + !SRCML_CMD.equals("") + JAVA + CODE_FRAGMENT + + + SRCML_CMD.equals("") + JAVA + CODE_FRAGMENT + Integer.parseInt(s.getAttributeByName(TYPE).getValue()); JAVA @@ -747,62 +774,9 @@ Python CODE_FRAGMENT - - subjects[subjects.Repo.isin(pjList)] - Python - CODE_FRAGMENT - - - subjects.Repo.isin(pjList) - Python - CODE_FRAGMENT - - - subjects[['Repo','GitRepo']] - Python - CODE_FRAGMENT - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1014,13 +988,6 @@ - - - - - - - @@ -1125,17 +1092,65 @@ - + - - + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.travis.yml b/.travis.yml index e03c579..34b58ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: java +before_install: ./.travis_native_dependencies.sh jdk: - - oraclejdk8 - openjdk8 install: true script: mvn clean package #-DskipTests=true diff --git a/.travis_native_dependencies.sh b/.travis_native_dependencies.sh new file mode 100644 index 0000000..7edc83d --- /dev/null +++ b/.travis_native_dependencies.sh @@ -0,0 +1,2 @@ +wget http://131.123.42.38/lmcrs/v1.0.0/srcml_1.0.0-1_ubuntu18.04.deb +sudo gdebi srcml_1.0.0-1_ubuntu18.04.deb -n \ No newline at end of file diff --git a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java index 033952f..f62e4ce 100644 --- a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java +++ b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/AbstractSrcmlTreeGenerator.java @@ -44,8 +44,8 @@ public abstract class AbstractSrcmlTreeGenerator extends TreeGenerator { - // private static final String SRCML_CMD = System.getProperty("gumtree.srcml.path", "srcml"); - private String SRCML_CMD = "/Users/anil.koyuncu/Downloads22/srcML/src2srcml"; + private String SRCML_CMD = System.getProperty("gt.srcml.path", "srcml"); +// private String SRCML_CMD = "/Users/anil.koyuncu/Downloads22/srcML/src2srcml"; // private static String namespace = "http://www.sdml.info/srcML/position"; private static String namespace = "http://www.srcML.org/srcML/position"; private static final QName LINE = new QName(namespace, "line", "pos"); diff --git a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java index 8b93999..6078cf5 100644 --- a/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java +++ b/gumtree/gen.srcml/src/main/java/com/github/gumtreediff/gen/srcml/SrcmlCTreeGenerator.java @@ -35,7 +35,9 @@ import java.util.regex.Pattern; public class SrcmlCTreeGenerator extends AbstractSrcmlTreeGenerator { public SrcmlCTreeGenerator(String SRCML_CMD) { - super.setSRCML_CMD(SRCML_CMD); + if (!SRCML_CMD.equals("")){ + super.setSRCML_CMD(SRCML_CMD); + } } @Override 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 be570e2..cd8d5df 100644 --- a/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java +++ b/richedit/src/test/java/edu/lu/uni/serval/TestPredefinedCases.java @@ -12,7 +12,7 @@ import java.io.FileInputStream; import java.io.IOException; import java.util.List; import java.util.Properties; -@Ignore + public class TestPredefinedCases { @@ -68,6 +68,8 @@ public class TestPredefinedCases { "---------DEL continue@@continue; @AT@ 62 @LENGTH@ 9\n"); } + //TODO + @Ignore @Test public void testWhileCase1() throws IOException { Properties appProps = new Properties(); @@ -80,7 +82,7 @@ public class TestPredefinedCases { EDiffHunkParser parser = new EDiffHunkParser(); - List hierarchicalActionSets = parser.parseChangedSourceCodeWithGumTree2(prevFile, revFile, srcMLPath,false); + List hierarchicalActionSets = parser.parseChangedSourceCodeWithGumTree2(prevFile, revFile, "",false); hierarchicalActionSets.size(); Assert.assertEquals(hierarchicalActionSets.size(), 1);