Added unit tests for GraphDataGenerator

Removed method that wasn't needed

Author: jimbethancourt

cost-benefit-calculator/src/test/java/org/hjug/cbc/CostBenefitCalculatorTest.java

@@ -34,7 +34,7 @@ public void tearDown() {
         repository.close();
     }
 
-    @Test//TODO: failing
+    @Test
     public void testCostBenefitCalculation() throws IOException, GitAPIException, InterruptedException {
         String attributeHandler = "AttributeHandler.java";
         InputStream resourceAsStream = getClass().getClassLoader().getResourceAsStream(attributeHandler);

graph-data-generator/src/main/java/org/hjug/gdg/GraphDataGenerator.java

@@ -8,13 +8,6 @@
 
 public class GraphDataGenerator {
 
-    private final CostBenefitCalculator costBenefitCalculator;
-    private final List<RankedDisharmony> calculateCostBenefitValues = new ArrayList<>();
-
-    public GraphDataGenerator(CostBenefitCalculator costBenefitCalculator) {
-        this.costBenefitCalculator = costBenefitCalculator;
-    }
-
     public String getScriptStart() {
         return
                 "      google.charts.load('current', {'packages':['corechart']});\n" +
@@ -62,18 +55,10 @@ public String generateBubbleChartData(List<RankedDisharmony> rankedDisharmonies)
             chartData.append(",");
             chartData.append(rankedDisharmony.getWmc());
             chartData.append("]");
-            if (i < rankedDisharmonies.size()) {
+            if (i+1 < rankedDisharmonies.size()) {
                 chartData.append(",");
             }
         }
         return chartData.toString();
     }
-
-    public List<RankedDisharmony> getRankedDisharmonies(String repositoryPath) {
-        if(calculateCostBenefitValues.isEmpty()){
-            calculateCostBenefitValues.addAll(costBenefitCalculator.calculateCostBenefitValues(repositoryPath));
-        }
-
-        return calculateCostBenefitValues;
-    }
 }

graph-data-generator/src/test/java/org/hjug/gdg/GraphDataGeneratorTest.java

@@ -1,20 +1,26 @@
 package org.hjug.gdg;
 
 import org.hjug.cbc.CostBenefitCalculator;
+import org.hjug.cbc.RankedDisharmony;
+import org.hjug.git.ScmLogInfo;
+import org.hjug.metrics.GodClass;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import static org.junit.Assert.*;
 import static org.mockito.Mockito.mock;
 
 public class GraphDataGeneratorTest {
 
     private GraphDataGenerator graphDataGenerator;
-    private CostBenefitCalculator costBenefitCalculator = mock(CostBenefitCalculator.class);
 
     @Before
     public void setUp() {
-        graphDataGenerator = new GraphDataGenerator(costBenefitCalculator);
+        graphDataGenerator = new GraphDataGenerator();
     }
 
     @Test
@@ -52,10 +58,31 @@ public void getScriptEnd() {
     }
 
     @Test
-    public void generateBubbleChartData() {
+    public void generateBubbleChartDataOneDataPoint() {
+        GodClass godClass = new GodClass("AttributeHandler.java",
+                                    "org.apache.myfaces.tobago.facelets",
+                                    "(WMC=77, ATFD=105, TCC=15.555999755859375)");
+        godClass.setOverallRank(0);
+        ScmLogInfo scmLogInfo = new ScmLogInfo("org/apache/myfaces/tobago/facelets/AttributeHandler.java", 1595275997, 0, 1);
+        scmLogInfo.setChangePronenessRank(0);
+        RankedDisharmony rankedDisharmony = new RankedDisharmony(godClass, scmLogInfo);
+
+        List<RankedDisharmony> rankedDisharmonies = new ArrayList<>();
+
+        rankedDisharmonies.add(rankedDisharmony);
+
+        StringBuilder chartData = new StringBuilder();
+        chartData.append("[ 'ID', 'Effort', 'Change Proneness', 'Priority', 'Method Count'], ");
+        chartData.append("['AttributeHandler.java',0,0,0,77]");
+
+        Assert.assertEquals(chartData.toString(), graphDataGenerator.generateBubbleChartData(rankedDisharmonies));
+
     }
 
     @Test
-    public void getRankedDisharmonies() {
+    public void generateBubbleChartDataTwoDataPoints() {
+        StringBuilder chartData = new StringBuilder();
+        chartData.append("[ 'ID', 'Effort', 'Change Proneness', 'Priority', 'Method Count'], ");
+
     }
 }

refactor-first-maven-plugin/src/main/java/org/hjug/mavenreport/RefactorFirstMavenReport.java

@@ -102,10 +102,7 @@ protected void executeReport(Locale locale) throws MavenReportException {
         }
 
         CostBenefitCalculator costBenefitCalculator = new CostBenefitCalculator();
-        GraphDataGenerator graphDataGenerator = new GraphDataGenerator(costBenefitCalculator);
-
-        List<RankedDisharmony> rankedDisharmonies =
-                graphDataGenerator.getRankedDisharmonies(projectBaseDir);
+        List<RankedDisharmony> rankedDisharmonies = costBenefitCalculator.calculateCostBenefitValues(projectBaseDir);
 
         rankedDisharmonies.sort(Comparator.comparing(RankedDisharmony::getPriority).reversed());
 
@@ -131,7 +128,7 @@ protected void executeReport(Locale locale) throws MavenReportException {
         mainSink.text("Refactor First Report for " + projectName + " " + projectVersion);
         mainSink.title_();
 
-        generateChart(graphDataGenerator, rankedDisharmonies, mainSink);
+        generateChart(rankedDisharmonies, mainSink);
 
         mainSink.head_();
 
@@ -236,15 +233,16 @@ private void drawTableCell(String cellText, Sink mainSink) {
     /**
      * @See https://maven.apache.org/doxia/developers/sink.html#How_to_inject_javascript_code_into_HTML
      */
-    private void generateChart(GraphDataGenerator graphDataGenerator, List<RankedDisharmony> rankedDisharmonies, Sink mainSink) {
-
+    private void generateChart(List<RankedDisharmony> rankedDisharmonies, Sink mainSink) {
         SinkEventAttributeSet googleChartImport = new SinkEventAttributeSet();
         googleChartImport.addAttribute( SinkEventAttributes.TYPE, "text/javascript" );
         googleChartImport.addAttribute( SinkEventAttributes.SRC, "https://www.gstatic.com/charts/loader.js" );
 
         String script = "script";
         mainSink.unknown(script, new Object[]{HtmlMarkup.TAG_TYPE_START}, googleChartImport);
         mainSink.unknown(script, new Object[]{HtmlMarkup.TAG_TYPE_END}, null);
+
+        GraphDataGenerator graphDataGenerator = new GraphDataGenerator();
         String scriptStart = graphDataGenerator.getScriptStart();
         String bubbleChartData = graphDataGenerator.generateBubbleChartData(rankedDisharmonies);
         String scriptEnd = graphDataGenerator.getScriptEnd();