refactored

Author: aminmf

src/main/java/TestCodePropertyAnalyzer.java

@@ -42,7 +42,6 @@ public class TestCodePropertyAnalyzer {
 	private static int NumFunCall = 0;
 	private static int MaxFunCall = 0;
 	private static float AveFunCall = 0;
-	private static int NumDOMFixture;
 	private static int NumTriggerTest;
 	private static int NumObjCreate;
 
@@ -121,7 +120,6 @@ private static void analyseJSTestFile(String canonicalPath) throws Exception {
 		if (codeAnalyzer.getNumFunCall() > MaxFunCall)
 			MaxFunCall = codeAnalyzer.getNumFunCall();
 		AveFunCall = (float)NumFunCall/(float)NumTests;
-		NumDOMFixture += codeAnalyzer.getNumDOMFixture();
 		NumTriggerTest += codeAnalyzer.getNumTriggerTest();
 		NumObjCreate += codeAnalyzer.getNumObjCreate();
 
@@ -132,7 +130,6 @@ private static void analyseJSTestFile(String canonicalPath) throws Exception {
 		System.out.println("++++ NumAssertions: " + NumAssertions);
 		System.out.println("++++ MaxFunCall: " + MaxFunCall);
 		System.out.println("++++ AveFunCall: " + AveFunCall);
-		System.out.println("++++ NumDOMFixture: " + NumDOMFixture);
 		System.out.println("++++ NumTriggerTest: " + NumTriggerTest);
 		System.out.println("++++ NumObjCreate: " + NumObjCreate);
 		System.out.println("==========================");

src/main/java/core/JSAnalyzer.java

@@ -27,7 +27,6 @@ public class JSAnalyzer {
 	private static int NumAsyncTests = 0;
 	private static int NumAssertions = 0;
 	private static int NumFunCall = 0;
-	private static int NumDOMFixture = 0;
 	private static int NumTriggerTest = 0;
 	private static int NumObjCreate = 0;
 
@@ -439,7 +438,6 @@ public void analyzeTestCodeProperties() throws Exception {
 		astVisitor.setVisitType("AnalyzeTestCode");
 		astVisitor.setTestFramework(testsFramework); 
 
-
 		// reading js form the input file
 		String input = "";
 		FileInputStream inputStream = new FileInputStream(jsAddress);
@@ -461,10 +459,6 @@ public void analyzeTestCodeProperties() throws Exception {
 			//System.out.println("************** AST ******************");
 			//System.out.println(ast.toSource());
 			//System.out.println(ast.debugPrint());
-			//writeJSToFile(scopename, input);
-			//writeFunctionsToFile(input);
-			//System.out.println("AST BEFORE : ");
-			//System.out.println(ast.toSource());
 
 			astVisitor.setScopeName(scopeName);
 			/* recurse through AST */
@@ -477,7 +471,6 @@ public void analyzeTestCodeProperties() throws Exception {
 			ast.visit(astVisitor);
 
 			System.out.println("FunctionCallsInTests :" + astVisitor.getFunctionCallsInTests());
-			
 
 			NumTests = astVisitor.getTestCounter();
 			NumAsyncTests = astVisitor.getAsynchTestCounter();
@@ -521,10 +514,6 @@ public int getNumFunCall() {
 		return NumFunCall;
 	}
 
-	public int getNumDOMFixture() {
-		return NumDOMFixture;
-	}
-
 	public int getNumTriggerTest() {
 		return NumTriggerTest;
 	}

src/main/java/instrumentor/JSASTInstrumentor.java

@@ -93,15 +93,16 @@ public ArrayList<Integer> getMissedFunctionLines() {
 	}
 
 	private ArrayList<String> functionCalls = new ArrayList<String>();
-	public ArrayList<String> getFunctionCalls() {
+
+	public ArrayList<String> getFunctionCallsInTests() {
 		ArrayList<String> funCalls = new ArrayList<String>();
 		for (TestCaseInfo tc: testCaseInfoList){
 			funCalls.addAll(tc.getFunctionCalls());
 		}
 		return funCalls;
 	}
 
-	public ArrayList<String> getFunctionCallsInTests() {
+	public ArrayList<String> getFunctionCalls() {
 		return functionCalls;
 	}