Adjusting code for junit tests.

Mariana Azevedo · Mariana Azevedo · commit 752d56f49303 · 2018-07-26T22:15:46.000-03:00
diff --git a/src/com/o3smeasures/measures/CouplingBetweenObjects.java b/src/com/o3smeasures/measures/CouplingBetweenObjects.java
@@ -5,6 +5,7 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.CouplingBetweenObjectsVisitor;
@@ -160,7 +161,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getCouplingBetweenObjectsValue(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/CyclomaticComplexity.java b/src/com/o3smeasures/measures/CyclomaticComplexity.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.CyclomaticComplexityVisitor;
@@ -144,7 +145,17 @@ public <T> void measure(T unit) {
 		
 		setCalculatedValue(getCyclomaticComplexityValue(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 
 	/**
diff --git a/src/com/o3smeasures/measures/FanOut.java b/src/com/o3smeasures/measures/FanOut.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.FanOutVisitor;
@@ -143,7 +144,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getFanOutValue(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/LinesOfCode.java b/src/com/o3smeasures/measures/LinesOfCode.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.LinesOfCodeVisitor;
@@ -141,7 +142,17 @@ public <T> void measure(T unit) {
 		
 		setCalculatedValue(getNumberOfLinesOfCodeValue(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/LooseClassCohesion.java b/src/com/o3smeasures/measures/LooseClassCohesion.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.LooseClassCohesionVisitor;
@@ -144,7 +145,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getLCCValue(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/NumberOfAttributes.java b/src/com/o3smeasures/measures/NumberOfAttributes.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.NumberOfAttributesVisitor;
@@ -142,7 +143,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getNumberOfAttributes(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/NumberOfClasses.java b/src/com/o3smeasures/measures/NumberOfClasses.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.structures.Measure;
@@ -150,7 +151,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getNumberOfClasses(visitor));
 		setMeanValue(0d);
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/NumberOfMethods.java b/src/com/o3smeasures/measures/NumberOfMethods.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.NumberOfMethodsVisitor;
@@ -143,7 +144,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getAllMethods(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/ResponseForClass.java b/src/com/o3smeasures/measures/ResponseForClass.java
@@ -6,6 +6,7 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaModelException;
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.ResponseForClassVisitor;
@@ -166,7 +167,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getResponseForClassValue(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/TightClassCohesion.java b/src/com/o3smeasures/measures/TightClassCohesion.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.TightClassCohesionVisitor;
@@ -143,7 +144,17 @@ public <T> void measure(T unit) {
 
 		setCalculatedValue(getTCCIndex(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/measures/WeightMethodsPerClass.java b/src/com/o3smeasures/measures/WeightMethodsPerClass.java
@@ -1,6 +1,7 @@
 package com.o3smeasures.measures;
 
 import org.eclipse.jdt.core.dom.CompilationUnit;
+import org.eclipse.jdt.core.dom.TypeDeclaration;
 
 import com.o3smeasures.astvisitors.ClassVisitor;
 import com.o3smeasures.astvisitors.WeightMethodsPerClassVisitor;
@@ -142,7 +143,17 @@ public <T> void measure(T unit) {
 		
 		setCalculatedValue(getWeightMethodsPerClassIndex(visitor));
 		setMeanValue(getCalculatedValue());
-		setMaxValue(getCalculatedValue(), parse.getJavaElement().getElementName());
+		
+		String elementName = "";
+		
+		if(parse.getJavaElement() == null) {
+			TypeDeclaration clazz = (TypeDeclaration) parse.types().get(0);
+			elementName = clazz.getName().toString();
+		}else{
+			elementName = parse.getJavaElement().getElementName();
+		}
+		
+		setMaxValue(getCalculatedValue(), elementName);
 	}
 	
 	/**
diff --git a/src/com/o3smeasures/util/JavaParser.java b/src/com/o3smeasures/util/JavaParser.java
@@ -63,7 +63,7 @@ public static void setCacheParser(boolean value) {
 	  * @return CompilationUnit
 	  * @throws ParseException
 	  */
-	 public static CompilationUnit parseAST(FileInputStream fileInputStream){
+	 public static CompilationUnit parseAST(FileInputStream fileInputStream, String className){
 		
 		 CompilationUnit cUnit = null; 
 		 ASTSession.getInstance().reset();
@@ -73,10 +73,11 @@ public static CompilationUnit parseAST(FileInputStream fileInputStream){
            astParser.setKind(ASTParser.K_COMPILATION_UNIT);
    		   astParser.setResolveBindings(true);
            char[] source = getFileContent(fileInputStream);
-           
 	       astParser.setSource(source);
+	       astParser.setUnitName(className);
 	       cUnit = (CompilationUnit) astParser.createAST(null);
         }
+		 
 		astParser = null; 
         
         return cUnit;
@@ -93,8 +94,8 @@ public static CompilationUnit parseAST(FileInputStream fileInputStream){
 	  */
 	 public static ICompilationUnit parseJDT(File file){
 		
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IPath path = Path.fromOSString(file.getAbsolutePath());
+		IWorkspace workspace = ResourcesPlugin.getWorkspace();
 		IFile source = workspace.getRoot().getFileForLocation(path);
 		return (ICompilationUnit) JavaCore.create(source);
 	 }
@@ -140,7 +141,7 @@ public static CompilationUnit getJavaFile(File javaFile, String className) throw
         FileInputStream inputStream = new FileInputStream(javaFile);
         try {
         	logger.info("The class '"+className+"' has: ");
-        	cUnit = parseAST(inputStream);
+        	cUnit = parseAST(inputStream, className);
         } finally {
             inputStream.close();
         }
