From e02236fcd6b910c54edc721cb5a95d8103181e7b Mon Sep 17 00:00:00 2001 From: Nathalia Barbosa Date: Tue, 23 Jul 2024 15:52:36 -0300 Subject: [PATCH 1/2] Refactor methods to correct behavior and add constructor --- .../cic/analysis/samples/DFPBaseSample.java | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java b/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java index ba9c4af..bb26370 100644 --- a/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java @@ -6,15 +6,18 @@ public class DFPBaseSample { private String text; + public DFPBaseSample(String text){ + this.text = text; + } + public void cleanText(){ - DFPBaseSample inst = new DFPBaseSample(); - inst.normalizeWhiteSpace(); //Left - inst.removeComments(); - inst.removeDuplicateWords(); //Right + this.normalizeWhiteSpace(); //Left + this.removeComments(); + this.removeDuplicateWords(); //Right } private void normalizeWhiteSpace(){ - text.replace(" ", ""); + text = text.replace(" ", " "); } private void removeComments(){ @@ -34,13 +37,13 @@ private void removeComments(){ } private void removeDuplicateWords(){ - String[] words = text.split(" "); - StringBuilder result = new StringBuilder(words[0]); - for (int i = 1; i < words.length; i++) { - if (!words[i].equals(words[i - 1])) { - result.append(" "); + String[] words = text.split(" ", -1); + StringBuilder result = new StringBuilder(); + for (int i = 0; i < words.length; i++) { + if (i == 0 || !words[i].equals(words[i - 1])) result.append(words[i]); - } + if (i < words.length - 1) + result.append(" "); } text = result.toString(); From 422829eef257af1960e4fef630d71a183ef63d27 Mon Sep 17 00:00:00 2001 From: Galileu Santos Date: Thu, 1 Aug 2024 12:09:56 -0700 Subject: [PATCH 2/2] fixing motivating example tests --- pom.xml | 6 +- .../cic/analysis/dfp/DFPAnalysisBaseTest.java | 4 +- .../dfp/DFPAnalysisMotivantingTest.java | 56 +++++++++++++++++++ .../cic/analysis/samples/DFPBaseSample.java | 7 ++- .../cic/analysis/samples/DFPMotivating.java | 26 +++++++++ 5 files changed, 91 insertions(+), 8 deletions(-) create mode 100644 src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisMotivantingTest.java create mode 100644 src/test/java/br/unb/cic/analysis/samples/DFPMotivating.java diff --git a/pom.xml b/pom.xml index 68ddc42..5442faf 100644 --- a/pom.xml +++ b/pom.xml @@ -13,9 +13,9 @@ https://maven.pkg.github.com/spgroup/soot/ - rbonifacio + svfa-scala Temporary repository for the SVFA library - https://maven.pkg.github.com/rbonifacio/svfa-scala/ + https://maven.pkg.github.com/spgroup/svfa-scala/ @@ -41,7 +41,7 @@ br.unb.cic svfa-scala_2.12 - 0.5.9 + 0.5.10 diff --git a/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisBaseTest.java b/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisBaseTest.java index 8c44c9d..0bbe23e 100644 --- a/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisBaseTest.java +++ b/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisBaseTest.java @@ -26,7 +26,7 @@ public void configure() { protected Map> sourceDefinitions() { Map> res = new HashMap<>(); List lines = new ArrayList<>(); - lines.add(11); + lines.add(15); res.put("br.unb.cic.analysis.samples.DFPBaseSample", lines); return res; } @@ -35,7 +35,7 @@ protected Map> sourceDefinitions() { protected Map> sinkDefinitions() { Map> res = new HashMap<>(); List lines = new ArrayList<>(); - lines.add(13); + lines.add(17); res.put("br.unb.cic.analysis.samples.DFPBaseSample", lines); return res; diff --git a/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisMotivantingTest.java b/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisMotivantingTest.java new file mode 100644 index 0000000..80c8a38 --- /dev/null +++ b/src/test/java/br/unb/cic/analysis/dfp/DFPAnalysisMotivantingTest.java @@ -0,0 +1,56 @@ +package br.unb.cic.analysis.dfp; + +import br.unb.cic.analysis.AbstractMergeConflictDefinition; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class DFPAnalysisMotivantingTest { + + private DFPAnalysisSemanticConflicts analysis; + AbstractMergeConflictDefinition definition; + @Before + public void configure() { + definition = new AbstractMergeConflictDefinition(true) { + @Override + protected Map> sourceDefinitions() { + Map> res = new HashMap<>(); + List lines = new ArrayList<>(); + lines.add(9); + res.put("br.unb.cic.analysis.samples.DFPMotivating", lines); + return res; + } + + @Override + protected Map> sinkDefinitions() { + Map> res = new HashMap<>(); + List lines = new ArrayList<>(); + lines.add(11); + res.put("br.unb.cic.analysis.samples.DFPMotivating", lines); + + return res; + } + }; + + String cp = "target/test-classes"; + analysis = new DFPInterProcedural(cp, definition); + } + + @Test + public void testDFPAnalysisExpectingOneMoreConflict() { + analysis.configureSoot(); + + analysis.buildDFP(); + System.out.println(analysis.svg().reportConflicts().size()); + analysis.reportDFConflicts(); + System.out.println(analysis.svgToDotModel()); + System.out.println(analysis.findSourceSinkPaths()); + System.out.println(analysis.svg().findConflictingPaths()); + Assert.assertTrue(analysis.svg().reportConflicts().size() == 1); + } +} diff --git a/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java b/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java index bb26370..c67d8fa 100644 --- a/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java +++ b/src/test/java/br/unb/cic/analysis/samples/DFPBaseSample.java @@ -11,9 +11,10 @@ public DFPBaseSample(String text){ } public void cleanText(){ - this.normalizeWhiteSpace(); //Left - this.removeComments(); - this.removeDuplicateWords(); //Right + DFPBaseSample inst = new DFPBaseSample("the the dog"); + inst.normalizeWhiteSpace(); //Left + inst.removeComments(); + inst.removeDuplicateWords(); //Right } private void normalizeWhiteSpace(){ diff --git a/src/test/java/br/unb/cic/analysis/samples/DFPMotivating.java b/src/test/java/br/unb/cic/analysis/samples/DFPMotivating.java new file mode 100644 index 0000000..90b2045 --- /dev/null +++ b/src/test/java/br/unb/cic/analysis/samples/DFPMotivating.java @@ -0,0 +1,26 @@ +package br.unb.cic.analysis.samples; + +public class DFPMotivating { + public String text; + public int fixes, comments; + + public void generateReport(){ + DFPMotivating inst = new DFPMotivating(); + inst.countDupWhitespace(); //RIGHT + inst.countComments(); + inst.countDupWords(); // LEFT + } + + private void countDupWords() { + fixes = fixes + 2; + } + + private void countComments() { + comments = comments +1; + } + + private void countDupWhitespace() { + fixes = fixes + 1; + } + +}