refactoring

Author: aminmf

src/main/java/TestCodePropertyAnalyzer.java

@@ -39,8 +39,9 @@ public class TestCodePropertyAnalyzer {
 	private static int NumTests;
 	private static int NumAsyncTests;
 	private static int NumAssertions;
-	private static int MaxFunCall;
-	private static float AveFunCall;
+	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;
@@ -116,8 +117,10 @@ private static void analyseJSTestFile(String canonicalPath) throws Exception {
 		NumTests += codeAnalyzer.getNumTests();
 		NumAsyncTests += codeAnalyzer.getNumAsyncTests();
 		NumAssertions += codeAnalyzer.getNumAssertions();
-		MaxFunCall += codeAnalyzer.getMaxFunCall();
-		AveFunCall += codeAnalyzer.getAveFunCall();
+		NumFunCall += codeAnalyzer.getNumFunCall();
+		if (codeAnalyzer.getNumFunCall() > MaxFunCall)
+			MaxFunCall = codeAnalyzer.getNumFunCall();
+		AveFunCall = (float)NumFunCall/(float)NumTests;
 		NumDOMFixture += codeAnalyzer.getNumDOMFixture();
 		NumTriggerTest += codeAnalyzer.getNumTriggerTest();
 		NumObjCreate += codeAnalyzer.getNumObjCreate();

src/main/java/core/JSAnalyzer.java

@@ -26,8 +26,7 @@ public class JSAnalyzer {
 	private static int NumTests = 0;
 	private static int NumAsyncTests = 0;
 	private static int NumAssertions = 0;
-	private static int MaxFunCall = 0;
-	private static float AveFunCall = 0;
+	private static int NumFunCall = 0;
 	private static int NumDOMFixture = 0;
 	private static int NumTriggerTest = 0;
 	private static int NumObjCreate = 0;
@@ -527,16 +526,15 @@ public void analyzeTestCodeProperties() throws Exception {
 			NumTests = astVisitor.getTestCounter();
 			NumAsyncTests = astVisitor.getAsynchTestCounter();
 			NumAssertions = astVisitor.getAssertionCounter();
-			//MaxFunCall = astVisitor.getMaxFunCall();
-			//AveFunCall = astVisitor.getAveFunCall();
-			//NumDOMFixture = astVisitor.getNumDOMFixture();
+			NumFunCall = astVisitor.getFunCallCounter();
 			NumTriggerTest = astVisitor.getTriggerCounetr();
 			NumObjCreate = astVisitor.getNewExpressionCounter();
 
-			System.out.println("assertionCounter: " + astVisitor.getAssertionCounter());
-			System.out.println("newExpressionCounter: " + astVisitor.getNewExpressionCounter());
 			System.out.println("testCounter: " + astVisitor.getTestCounter());
 			System.out.println("asynchTestCounter: " + astVisitor.getAsynchTestCounter());
+			System.out.println("assertionCounter: " + astVisitor.getAssertionCounter());
+			System.out.println("funCallCounter: " + astVisitor.getFunCallCounter());
+			System.out.println("newExpressionCounter: " + astVisitor.getNewExpressionCounter());
 			System.out.println("trieggerCounter: " + astVisitor.getTriggerCounetr());
 
 			/* clean up */
@@ -563,12 +561,8 @@ public int getNumAssertions() {
 		return NumAssertions;
 	}
 
-	public int getMaxFunCall() {
-		return MaxFunCall;
-	}
-
-	public float getAveFunCall() {
-		return AveFunCall;
+	public int getNumFunCall() {
+		return NumFunCall;
 	}
 
 	public int getNumDOMFixture() {

src/main/java/instrumentor/JSASTInstrumentor.java

@@ -39,6 +39,7 @@ public class JSASTInstrumentor implements NodeVisitor{
 	private int testCounter = 0;
 	private int asyncTestCounter = 0;
 	private int assertionCounter = 0;
+	private int funCallCounter = 0;
 	private int newExpressionCounter = 0;
 	private int triggerCounetr = 0;
 
@@ -656,14 +657,16 @@ private void analyzeTestCodeFunctionCallNode(AstNode node) {
 					TestCaseInfo t = testCaseInfoList.get(testCaseInfoList.size()-1);
 					t.setNumFunCall(t.getNumFunCall()+1);
 					System.out.println("Test case " + t.getTestNumber() + " has " + t.getNumFunCall() + " function calls!");
+					funCallCounter++;
 				}else{
 					TestUtilityFunctionInfo tufi = testUtilityFunctionInfoList.get(testUtilityFunctionInfoList.size()-1);
 					tufi.setNumFunCall(tufi.getNumFunCall()+1);
 					System.out.println("Test utility function " + tufi.getFuncName() + " has " + tufi.getNumFunCall() + " function calls!");
 					//System.out.println("A function call found out of a test case");
 				}
+			}else{
+				System.out.println("Repeated!");
 			}
-
 		}
 
 	}
@@ -1064,5 +1067,14 @@ public ArrayList<TestUtilityFunctionInfo> getTestUtilityFunctions() {
 	}
 
 
+	
+	
+	public void setFunCallCounter(int funCallCounter) {
+		this.funCallCounter = funCallCounter;
+	}
+	public int getFunCallCounter() {
+		return funCallCounter;
+	}
+
 }