[jscover] 16/69: Minor tidying

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch master
in repository jscover.

commit 7d76b21e75344a2d0d7f23f767d4155709cd0710
Author: tntim96 <tntim96 at gmail.com>
Date:   Sun Jun 15 14:04:52 2014 +1000

    Minor tidying
---
 src/main/java/jscover/instrument/NodeProcessor.java                   | 2 +-
 src/main/java/jscover/report/coberturaxml/CoberturaData.java          | 3 ++-
 .../java/jscover/instrument/BranchInstrumentorIntegrationTest.java    | 4 ++--
 src/test/java/jscover/report/MainTest.java                            | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/jscover/instrument/NodeProcessor.java b/src/main/java/jscover/instrument/NodeProcessor.java
index f9bd53d..83d8f07 100644
--- a/src/main/java/jscover/instrument/NodeProcessor.java
+++ b/src/main/java/jscover/instrument/NodeProcessor.java
@@ -435,7 +435,7 @@ class NodeProcessor {
                     parent.addChildBefore(buildInstrumentationStatement(node.getLineno()), node);
                 }
             }
-        } else if (node instanceof SwitchStatement || node instanceof WithStatement) {
+        } else if (node instanceof WithStatement) {
             parent.addChildBefore(buildInstrumentationStatement(node.getLineno()), node);
         } else if (node instanceof SwitchCase) {
             List<AstNode> statements = ((SwitchCase) node).getStatements();
diff --git a/src/main/java/jscover/report/coberturaxml/CoberturaData.java b/src/main/java/jscover/report/coberturaxml/CoberturaData.java
index 7091866..06bb35e 100644
--- a/src/main/java/jscover/report/coberturaxml/CoberturaData.java
+++ b/src/main/java/jscover/report/coberturaxml/CoberturaData.java
@@ -351,6 +351,7 @@ public class CoberturaData extends SummaryData {
     private Map<String, Set<? extends Coverable>> packageMap = new HashMap<String, Set<? extends Coverable>>();
     private Collection<? extends Coverable> files;
 
+    @SuppressWarnings(value = "unchecked")
     public CoberturaData(Collection<? extends Coverable> files) {
         super(files);
         this.files = files;
@@ -364,7 +365,7 @@ public class CoberturaData extends SummaryData {
     }
 
     protected String getPackage(String uri) {
-        if (uri == null || uri.indexOf("/") == -1)
+        if (uri == null || !uri.contains("/"))
             return "";
         return uri.substring(0, uri.lastIndexOf("/"));
     }
diff --git a/src/test-integration/java/jscover/instrument/BranchInstrumentorIntegrationTest.java b/src/test-integration/java/jscover/instrument/BranchInstrumentorIntegrationTest.java
index 0f389ff..d948247 100644
--- a/src/test-integration/java/jscover/instrument/BranchInstrumentorIntegrationTest.java
+++ b/src/test-integration/java/jscover/instrument/BranchInstrumentorIntegrationTest.java
@@ -354,8 +354,8 @@ import static org.hamcrest.MatcherAssert.assertThat;
 
 public class BranchInstrumentorIntegrationTest {
     private static IoUtils ioUtils = IoUtils.getInstance();
-    private static String branchObjectHeader = ioUtils.loadFromClassPath("/jscoverage-branch.js");
-    private static String header = "var _$jscoverage = {};\n" +
+    private static final String branchObjectHeader = ioUtils.loadFromClassPath("/jscoverage-branch.js");
+    private static final String header = "var _$jscoverage = {};\n" +
             "_$jscoverage['test.js'] = {};\n";
 
     private BranchInstrumentor branchInstrumentor = new BranchInstrumentor("test.js");
diff --git a/src/test/java/jscover/report/MainTest.java b/src/test/java/jscover/report/MainTest.java
index 8dcd7ad..95c8164 100644
--- a/src/test/java/jscover/report/MainTest.java
+++ b/src/test/java/jscover/report/MainTest.java
@@ -538,7 +538,7 @@ public class MainTest {
         given(ioUtils.loadFromFileSystem(new File(dir1, "jscoverage.json"))).willReturn("json1");
         given(ioUtils.loadFromFileSystem(new File(dir2,"jscoverage.json"))).willReturn("json2");
         SortedMap<String, FileData> mergedMap = new TreeMap<String, FileData>();
-        given(jsonDataMerger.mergeJSONCoverageStrings(new String[]{"json1","json2"})).willReturn(mergedMap);
+        given(jsonDataMerger.mergeJSONCoverageStrings("json1","json2")).willReturn(mergedMap);
         given(jsonDataMerger.toJSON(mergedMap)).willReturn("mergedJSON");
 
         main.runMain(new String[]{});

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jscover.git