added tests for sensor and parser

Author: mxsmith-godaddy

pom.xml

@@ -13,7 +13,7 @@
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-    <sonar.buildVersion>3.6</sonar.buildVersion>
+    <sonar.buildVersion>3.5.1</sonar.buildVersion>
     <jdk.min.version>1.5</jdk.min.version>
   </properties>
 

src/main/java/com/godaddy/sonar/ruby/core/RubyFile.java

@@ -2,8 +2,6 @@
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.builder.ToStringBuilder;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.sonar.api.resources.Language;
 import org.sonar.api.resources.Qualifiers;
 import org.sonar.api.resources.Resource;

src/main/java/com/godaddy/sonar/ruby/simplecovrcov/SimpleCovRcovJsonParserImpl.java

@@ -12,18 +12,16 @@
 
 import com.google.common.collect.Maps;
 
-public class SimpleCovRcovJsonParserImpl implements SimpleCovRcovJsonParser {
-
+public class SimpleCovRcovJsonParserImpl implements SimpleCovRcovJsonParser 
+{
 	public Map<String, CoverageMeasuresBuilder> parse(File file) throws IOException
-	{
-		
+	{		
 		Map<String, CoverageMeasuresBuilder> coveredFiles = Maps.newHashMap();
 
 		File fileToFindCoverage = file;
-		//read content of file as one string, assumes the content of the file is in json format
+
 		String fileString = FileUtils.readFileToString(fileToFindCoverage, "UTF-8");
 
-		//Parse the json string into a JSONObject, the coverageJsonObject will contain the map for files and their coverage
 		JSONObject resultJsonObject = (JSONObject) JSONValue.parse(fileString);			
 		JSONObject coverageJsonObj = (JSONObject) ((JSONObject) resultJsonObject.get("RSpec")).get("coverage");
 
@@ -38,15 +36,9 @@ public Map<String, CoverageMeasuresBuilder> parse(File file) throws IOException
 			//for each line in the coverage array
 			for(int i = 0; i < coverageArray.size(); i++)
 			{
-				//get the current line
 				Long line = (Long) coverageArray.toArray()[i];
-				//going to store that line as int, so it can be used with the setHits sonar api call
-				Integer intLine = 0;
-				
-				//the current line number will be the index of the array + 1, since there is not a line 0
-				int lineNumber = i+1;
-				
-				//if line is null, then that line was not covered, so set the value to 0
+				Integer intLine = 0;	
+				int lineNumber = i+1;	
 				if(line!=null)
 				{
 					intLine = line.intValue();
@@ -56,7 +48,5 @@ public Map<String, CoverageMeasuresBuilder> parse(File file) throws IOException
 			coveredFiles.put(filePath, fileCoverage);
 		}
 		return coveredFiles;
-	}
-	
-	
+	}	
 }

src/main/java/com/godaddy/sonar/ruby/simplecovrcov/SimpleCovRcovSensor.java

@@ -61,12 +61,9 @@ private void calculateMetrics(List<File> sourceDirs, File jsonFile, final Sensor
 		for (Entry<String, CoverageMeasuresBuilder> entry : jsonResults.entrySet()) 
 		{
             try 
-            {
-            	           	
-            	String fileName = entry.getKey();
-                 	
-            	sourceFile = new File(fileName);
-            	
+            {    	           	
+            	String fileName = entry.getKey();           	
+            	sourceFile = new File(fileName);    	
             	RubyFile rubyFile = new RubyFile(sourceFile, sourceDirs);
 
             	CoverageMeasuresBuilder fileCoverage = entry.getValue();

src/test/java/com/godaddy/sonar/ruby/simplecovrcov/SimpleCovRcovJsonParserTest.java

@@ -2,27 +2,19 @@
 
 import java.io.File;
 import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
 import java.util.Map;
-import java.util.SortedMap;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.sonar.api.measures.CoverageMeasuresBuilder;
-
 import junit.framework.TestCase;
 
-import org.junit.Assert;
-
 public class SimpleCovRcovJsonParserTest extends TestCase
 {
 	private final static String JSON_FILE_NAME = "src/test/resources/test-data/results.json";
-	private final static String JSON_INVALID_JSON= "src/test/resources/test-data/results-invalid-json.json";
 
 	private SimpleCovRcovJsonParserImpl parser = null;
+	
 	@Before
 	public void setUp() throws Exception
 	{
@@ -41,18 +33,17 @@ public void testParserWithValidJson() throws IOException
 		File reportFile = new File(JSON_FILE_NAME);
 		Map<String, CoverageMeasuresBuilder> coveredFiles = parser.parse(reportFile);
 
-		String coveredFile1 = "/home/mxsmith/Projects/Godaddy-Hosting/cPanel-common/lib/orion_api/orion_api.rb";
-		String coveredFile2 = "/home/mxsmith/Projects/Godaddy-Hosting/cPanel-common/lib/orion_api/orion_account_query.rb";
-		String coveredFile3 = "/home/mxsmith/Projects/Godaddy-Hosting/cPanel-common/lib/orion_api/soap_client.rb";
+		String coveredFile1 = "/project/source/subdir/file.rb";
+		String coveredFile2 = "/project/source/subdir/file1.rb";
+		String coveredFile3 = "/project/source/subdir/file1.rb";
 
 		assertEquals(coveredFiles.size(), 12);
 		assertEquals(coveredFiles.containsKey(coveredFile1), true);
 		assertEquals(coveredFiles.containsKey(coveredFile2), true);
 		assertEquals(coveredFiles.containsKey(coveredFile3), true);
 
-		CoverageMeasuresBuilder builder1 = coveredFiles.get(coveredFile1);
-		System.out.println(builder1);
-		assertEquals(builder1.getCoveredLines(), 13);		
+		CoverageMeasuresBuilder builder = coveredFiles.get(coveredFile1);
+		assertEquals(builder.getCoveredLines(), 13);		
 	}
 
 }

src/test/java/com/godaddy/sonar/ruby/simplecovrcov/SimpleCovRcovSensorTest.java

@@ -27,7 +27,6 @@ public class SimpleCovRcovSensorTest
 {
 	private static String RESULT_JSON_FILE_MUTLI_SRC_DIR = "src/test/resources/test-data/results.json";
 	private static String RESULT_JSON_FILE_ONE_SRC_DIR = "src/test/resources/test-data/results-one-src-dir.json";
-	private static String RESULT_NO_TESTS_JSON_FILE = "src/test/resources/test-data/results-zero-tests.json";
 
 	private IMocksControl mocksControl;
 	private ModuleFileSystem moduleFileSystem;
@@ -82,7 +81,7 @@ public void testShouldNotExecuteOnJavascriptProject()
 	}
 
 	@Test
-	public void testAnaluseWithOneSrcDir() throws IOException
+	public void testAnalyseWithOneSrcDir() throws IOException
 	{
 		Map<String, CoverageMeasuresBuilder> jsonResults = new SimpleCovRcovJsonParserImpl().parse(new File(RESULT_JSON_FILE_ONE_SRC_DIR));