Merge pull request #98 from UCSDOalads/addRedobyDYB

Add redoby dyb, ignoring Travis Junit fail for now

Author: chenggong03

?/.java/fonts/1.8.0_121/fcinfo-1-its-cseb260-18.ucsd.edu-null-null-en.properties

@@ -0,0 +1,48 @@
+package actions;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import ui.PaintPanel;
+import actions.global.ActionName;
+import actions.global.GlobalPaintActionExecuter;
+import actions.global.globalactions.AddLazyJavaClassGlobalAction;
+
+/**
+ * RedoActionTest
+ * 
+ * @author DYB Test the functionality of redo
+ */
+public class RedoActionTest {
+
+	@Test
+	public void test() {
+		PaintPanel panel = new PaintPanel();
+
+		// perform one action
+		AddLazyJavaClassGlobalAction action = (AddLazyJavaClassGlobalAction) ActionName.ADD_LAZY_JAVA_CLASS_ACTION
+				.getAssiciatedAction();
+		action.setClassToCreate(this.getClass());
+		GlobalPaintActionExecuter.getSharedInstance().execute(action, panel);
+
+		// new redo action
+		RedoAction action1 = new RedoAction(panel);
+
+		// determine whether can redo or not
+		assertFalse(action1.canPerformAction());
+		// do an undo action
+		
+		new UndoAction(panel).performAction();
+		// can redo now
+		assertTrue(action1.canPerformAction());
+		// do a redo
+		action1.performAction();
+		// cannot redo
+		assertFalse(action1.canPerformAction());
+		
+
+	}
+
+}

src/actions/RedoActionTest.java

@@ -0,0 +1,41 @@
+package actions;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+import ui.PaintPanel;
+import actions.global.ActionName;
+import actions.global.GlobalPaintActionExecuter;
+import actions.global.globalactions.AddLazyJavaClassGlobalAction;
+
+/**
+ * UndoActionTest
+ * 
+ * @author DYB Test the functionality of undo
+ */
+public class UndoActionTest {
+
+	@Test
+	public void test() {
+		PaintPanel panel = new PaintPanel();
+
+		// perform one action
+		AddLazyJavaClassGlobalAction action = (AddLazyJavaClassGlobalAction) ActionName.ADD_LAZY_JAVA_CLASS_ACTION
+				.getAssiciatedAction();
+		action.setClassToCreate(this.getClass());
+		GlobalPaintActionExecuter.getSharedInstance().execute(action, panel);
+
+		// new undo action
+		UndoAction action1 = new UndoAction(panel);
+		// determine whether can undo or not
+		assertTrue(action1.canPerformAction());
+		// perform one undo action
+		action1.performAction();
+		// determine again whether can undo or not
+		assertFalse(action1.canPerformAction());
+
+	}
+
+}

src/actions/UndoActionTest.java

@@ -50,7 +50,6 @@ public void redo() {
 		else {
 			System.out.println("empty redo stack");
 		}
-
 	}
 
 	public boolean canUndo() {

src/actions/edit/undoredo/SharedUndoRedoActionManager.java

@@ -1,14 +1,15 @@
 package actions.global.globalactions;
 
-import actions.global.GlobalPaintAction;
 import ui.PaintPanel;
+import actions.edit.undoredo.SharedUndoRedoActionManager;
+import actions.global.GlobalPaintAction;
 
 public class EditRedoGlobalAction extends GlobalPaintAction {
-
+	SharedUndoRedoActionManager manager = SharedUndoRedoActionManager
+			.getSharedInstance();
 	@Override
 	protected void execute(PaintPanel panel) {
-		// TODO Auto-generated method stub
-
+		manager.redo();
 	}
 
 }

src/actions/global/globalactions/EditRedoGlobalAction.java

@@ -0,0 +1,42 @@
+package actions.global.globalactions;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import ui.PaintPanel;
+import actions.global.ActionName;
+import actions.global.GlobalPaintActionExecuter;
+
+/**
+ * EditUndoActionTest
+ * 
+ * @author cs30xsd Test the functionality of global undo
+ */
+public class EditUndoActionTest {
+
+	@Test
+	public void test() {
+		PaintPanel panel = new PaintPanel();
+
+		// perform one action
+		AddLazyJavaClassGlobalAction action = (AddLazyJavaClassGlobalAction) ActionName.ADD_LAZY_JAVA_CLASS_ACTION
+				.getAssiciatedAction();
+		action.setClassToCreate(this.getClass());
+		GlobalPaintActionExecuter.getSharedInstance().execute(action, panel);
+
+		// new undo action
+		EditRedoGlobalAction action1 = new EditRedoGlobalAction();
+		EditUndoGlobalAction action2 = new EditUndoGlobalAction();
+
+		assertEquals(1, panel.getPaintComponents().size());
+		// perform one undo action
+		action2.execute(panel);
+		assertEquals(0, panel.getPaintComponents().size());
+		action1.execute(panel);
+		assertEquals(1, panel.getPaintComponents().size());
+		action2.execute(panel);
+		assertEquals(0, panel.getPaintComponents().size());
+	}
+
+}

src/actions/global/globalactions/EditUndoActionTest.java

@@ -1,14 +1,15 @@
 package actions.global.globalactions;
 
-import actions.global.GlobalPaintAction;
 import ui.PaintPanel;
+import actions.edit.undoredo.SharedUndoRedoActionManager;
+import actions.global.GlobalPaintAction;
 
 public class EditUndoGlobalAction extends GlobalPaintAction {
-
+	SharedUndoRedoActionManager manager = SharedUndoRedoActionManager
+			.getSharedInstance();
 	@Override
 	protected void execute(PaintPanel panel) {
-		// TODO Auto-generated method stub
-
+		manager.undo();
 	}
 
 }

src/actions/global/globalactions/EditUndoGlobalAction.java

@@ -0,0 +1,41 @@
+package actions.global.globalactions;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import ui.PaintPanel;
+import actions.global.ActionName;
+import actions.global.GlobalPaintActionExecuter;
+
+/**
+ * RedoActionGlobalTest
+ * 
+ * @author cs30xsd Test the functionality of global redo action
+ *
+ */
+public class RedoActionGlobalTest {
+
+	@Test
+	public void test() {
+		PaintPanel panel = new PaintPanel();
+
+		// perform one action
+		AddLazyJavaClassGlobalAction action = (AddLazyJavaClassGlobalAction) ActionName.ADD_LAZY_JAVA_CLASS_ACTION
+				.getAssiciatedAction();
+		action.setClassToCreate(this.getClass());
+		GlobalPaintActionExecuter.getSharedInstance().execute(action, panel);
+
+		// new redo action
+		EditRedoGlobalAction action1 = new EditRedoGlobalAction();
+		EditUndoGlobalAction action2 = new EditUndoGlobalAction();
+
+		assertEquals(1, panel.getPaintComponents().size());
+		// perform one redo action
+		action2.execute(panel);
+		assertEquals(0, panel.getPaintComponents().size());
+		action1.execute(panel);
+		assertEquals(1, panel.getPaintComponents().size());
+	}
+
+}