change HashMap to Map and remove catch

Author: Thibault Falque

src/test/java/fr/univartois/sonargo/FunctionFinderTest.java

@@ -4,12 +4,10 @@
 package fr.univartois.sonargo;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Paths;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 import org.junit.Before;
@@ -32,25 +30,20 @@ public void init() {
 
     @Test
     public void testSearchInFile() {
-	try {
-	    String path = new File(testerContext.fileSystem().baseDir(), "test_test.go").getPath();
-
-	    FunctionFinder f = new FunctionFinder(testerContext);
-	    f.searchFunctionInFile(Paths.get(path));
-	    HashMap<String, String> result = f.getResult();
-	    Set<String> expected = new java.util.HashSet<String>();
-	    expected.add("TestEasyDef");
-	    expected.add("TestSpaceDef");
-	    expected.add("TestNoSpaceDef");
-	    expected.add("TestTwoLines1");
-	    expected.add("TestTwoLines2");
-	    expected.add("TestNested");
-	    expected.add("TestSuite");
-	    assertEquals(expected, result.keySet());
-
-	} catch (IOException e) {
-	    fail("IOException thrown in test.");
-	}
+	String path = new File(testerContext.fileSystem().baseDir(), "test_test.go").getPath();
+
+	FunctionFinder f = new FunctionFinder(testerContext);
+	f.searchFunctionInFile(Paths.get(path));
+	Map<String, String> result = f.getResult();
+	Set<String> expected = new java.util.HashSet<String>();
+	expected.add("TestEasyDef");
+	expected.add("TestSpaceDef");
+	expected.add("TestNoSpaceDef");
+	expected.add("TestTwoLines1");
+	expected.add("TestTwoLines2");
+	expected.add("TestNested");
+	expected.add("TestSuite");
+	assertEquals(expected, result.keySet());
 
     }
 

src/test/java/fr/univartois/sonargo/gotest/FunctionFinderTest.java

@@ -5,12 +5,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
 
 import java.io.File;
-import java.io.IOException;
 import java.nio.file.Paths;
-import java.util.HashMap;
+import java.util.Map;
 import java.util.Set;
 
 import org.junit.Before;
@@ -36,40 +34,31 @@ public void init() {
 
     @Test
     public void testSearchInFile() {
-	try {
-	    String path = new File(TestUtils.getTestBaseDir().baseDir(), "test_test.go").getAbsolutePath();
-	    LOGGER.info("testSearchInFile " + path);
-	    FunctionFinder f = new FunctionFinder(testerContext);
-	    f.searchFunctionInFile(Paths.get(path));
-	    HashMap<String, String> result = f.getResult();
-	    Set<String> expected = new java.util.HashSet<String>();
-	    expected.add("TestEasyDef");
-	    expected.add("TestSpaceDef");
-	    expected.add("TestNoSpaceDef");
-	    expected.add("TestTwoLines1");
-	    expected.add("TestTwoLines2");
-	    expected.add("TestNested");
-	    expected.add("TestSuite");
-	    assertEquals(expected, result.keySet());
+	String path = new File(TestUtils.getTestBaseDir().baseDir(), "test_test.go").getAbsolutePath();
+	LOGGER.info("testSearchInFile " + path);
+	FunctionFinder f = new FunctionFinder(testerContext);
+	f.searchFunctionInFile(Paths.get(path));
+	Map<String, String> result = f.getResult();
+	Set<String> expected = new java.util.HashSet<String>();
+	expected.add("TestEasyDef");
+	expected.add("TestSpaceDef");
+	expected.add("TestNoSpaceDef");
+	expected.add("TestTwoLines1");
+	expected.add("TestTwoLines2");
+	expected.add("TestNested");
+	expected.add("TestSuite");
+	assertEquals(expected, result.keySet());
 
-	} catch (IOException e) {
-	    fail("IOException thrown in test.");
-	}
     }
 
     @Test
     public void testSearchFunction() {
-	try {
-	    LOGGER.info("testSearchFunction " + testerContext.fileSystem().baseDir());
-	    FunctionFinder f = new FunctionFinder(testerContext);
-	    HashMap<String, String> nameFunction = f.searchFunction();
+	LOGGER.info("testSearchFunction " + testerContext.fileSystem().baseDir());
+	FunctionFinder f = new FunctionFinder(testerContext);
+	Map<String, String> nameFunction = f.searchFunction();
 
-	    assertTrue(nameFunction.containsKey("TestAverage"));
+	assertTrue(nameFunction.containsKey("TestAverage"));
 
-	} catch (IOException e) {
-	    // TODO Auto-generated catch block
-	    e.printStackTrace();
-	}
     }
 
 }