Merge branch 'testing'

Author: brinegjr

src/edu/rosehulman/cjjb/javaModel/checks/SingletonCheck.java

@@ -12,7 +12,6 @@
 import edu.rosehulman.cjjb.javaModel.Interface;
 import edu.rosehulman.cjjb.javaModel.JavaModel;
 import edu.rosehulman.cjjb.javaModel.Method;
-import edu.rosehulman.cjjb.javaModel.modifier.AbstractModifier;
 import edu.rosehulman.cjjb.javaModel.modifier.IModifier;
 import edu.rosehulman.cjjb.javaModel.modifier.StaticModifier;
 
@@ -35,6 +34,7 @@ public boolean check(JavaModel model, AbstractJavaStructure structure) {
 
 	private boolean checkForStaticInstance(AbstractJavaStructure structure) {
 		for(AbstractJavaElement element: structure.subElements) {
+			System.out.println(element.name);
 			if(element.name.equalsIgnoreCase("instance"))
 				if(checkForModifier(element.modifiers, StaticModifier.class))
 					return true;

test/SingletonTesting.java

@@ -0,0 +1,54 @@
+import static org.junit.Assert.*;
+
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.Set;
+
+import org.junit.Test;
+
+import edu.rosehulman.cjjb.javaModel.checks.IModelStructureBooleanCheck;
+import edu.rosehulman.cjjb.javaModel.checks.SingletonCheck;
+import edu.rosehulman.cjjb.javaModel.*;
+import edu.rosehulman.cjjb.javaModel.Class;
+import edu.rosehulman.cjjb.javaModel.modifier.IModifier;
+import edu.rosehulman.cjjb.javaModel.modifier.PrivateModifier;
+import edu.rosehulman.cjjb.javaModel.modifier.PublicModifier;
+import edu.rosehulman.cjjb.javaModel.modifier.StaticModifier;;
+
+public class SingletonTesting {
+	
+	@Test
+	public void testCheckForStaticFieldInstance() {
+		IModelStructureBooleanCheck singleCheck = new SingletonCheck();
+		Set<String> classes = new HashSet<String>();
+		classes.add("sampleClasses.Singleton");
+		JavaModel model = new JavaModel(classes);
+		Class struct = new Class("sampleClasses.Singleton");
+		assertTrue(!singleCheck.check(model, struct));
+		
+		LinkedList<IModifier> modifiers = new LinkedList<IModifier>();
+		modifiers.add(new StaticModifier());
+		struct.addSubElement(new Field(struct, "instance", new PrivateModifier(), modifiers, struct));
+		model.putStructure("sampleClasses.Singleton", struct);
+		
+		assertTrue(singleCheck.check(model, struct));
+	}
+	
+	@Test
+	public void testCheckForGetInstanceMethod() {
+		IModelStructureBooleanCheck singleCheck = new SingletonCheck();
+		Set<String> classes = new HashSet<String>();
+		classes.add("sampleClasses.Singleton");
+		JavaModel model = new JavaModel(classes);
+		Class struct = new Class("sampleClasses.Singleton");
+		
+		LinkedList<IModifier> list = new LinkedList<IModifier>();
+		list.add(new StaticModifier());
+		struct.addSubElement(new Method(struct, "getInstance", new PublicModifier(), list, 
+				struct, new LinkedList<AbstractJavaStructure>(), false));
+		model.putStructure("sampleClasses.Singleton", struct);
+		
+		assertTrue(singleCheck.check(model, struct));
+	}
+
+}

test/sampleClasses/Singleton.java

@@ -0,0 +1,11 @@
+package sampleClasses;
+
+public class Singleton {
+	
+	private static Singleton instance = new Singleton();
+	
+	public static Singleton getInstance() {
+		return instance;
+	}
+
+}