Stack and Queue test pass

congcongcong250 · congcongcong250 · commit 91971831070e · 2017-02-27T02:21:38.000+11:00
diff --git a/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basic/Queue.java b/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basic/Queue.java
@@ -27,4 +27,8 @@ public boolean isEmpty(){
 	public int size(){
 		return elementData.size();
 	}
+	
+	public void clear(){
+		elementData.clear();
+	}
 }
diff --git a/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basic/Stack.java b/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basic/Stack.java
@@ -25,4 +25,8 @@ public boolean isEmpty(){
 	public int size(){
 		return elementData.size();
 	}
+	
+	public void clear(){
+		elementData.clear();
+	}
 }
diff --git a/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basicTest/QueueTest.java b/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basicTest/QueueTest.java
@@ -0,0 +1,76 @@
+package com.github.congcongcong250.coding2017.basicTest;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.github.congcongcong250.coding2017.basic.Queue;
+
+public class QueueTest implements testCase {
+
+	Queue testqueue = new Queue();
+	
+	@Override
+	@Before
+	public void setUp() {
+		
+		for(int i = 0; i < 20; i++){
+			testqueue.enQueue(i);
+		}
+	}
+
+	@Override
+	@After
+	public void tearDown() {
+		testqueue.clear();
+	}
+	
+
+	@Override
+	@Test
+	public void testAdd() {
+		assertEquals(20,testqueue.size());
+		assertEquals(0,testqueue.peek());
+		assertEquals(20,testqueue.size());
+		assertFalse(testqueue.isEmpty());
+	}
+
+	@Override
+	@Test
+	public void testRemove() {
+		assertEquals(20,testqueue.size());
+		assertEquals(0,testqueue.deQueue());
+		assertEquals(19,testqueue.size());
+		assertEquals(1,testqueue.peek());
+		assertFalse(testqueue.isEmpty());
+	}
+
+	@Override
+	@Test
+	public void testFunctional() {
+		for(int i = 0; i < 20; i++){
+			testqueue.deQueue();
+		}
+		assertTrue(testqueue.isEmpty());
+		testqueue.enQueue(100);
+		testqueue.enQueue(200);
+		assertEquals(100,testqueue.deQueue());
+		testqueue.enQueue(400);
+		assertEquals(200,testqueue.deQueue());
+		assertFalse(testqueue.isEmpty());
+		assertEquals(400,testqueue.deQueue());
+		
+		boolean hasExp = false;
+		try{
+			testqueue.deQueue();
+		}catch (IndexOutOfBoundsException e){
+			hasExp = true;
+		}
+		assertTrue(hasExp);
+	}
+
+}
diff --git a/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basicTest/StackTest.java b/group02/609990377/DataStructure/src/com/github/congcongcong250/coding2017/basicTest/StackTest.java
@@ -0,0 +1,75 @@
+package com.github.congcongcong250.coding2017.basicTest;
+
+import static org.junit.Assert.*;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.github.congcongcong250.coding2017.basic.Stack;
+
+public class StackTest implements testCase {
+
+	Stack teststack = new Stack();
+	
+	@Override
+	@Before
+	public void setUp() {
+		
+		for(int i = 0; i < 20; i++){
+			teststack.push(i);
+		}
+	}
+
+	@Override
+	@After
+	public void tearDown() {
+		teststack.clear();
+	}
+	
+
+	@Override
+	@Test
+	public void testAdd() {
+		assertEquals(20,teststack.size());
+		assertEquals(19,teststack.peek());
+		assertEquals(20,teststack.size());
+		assertFalse(teststack.isEmpty());
+	}
+
+	@Override
+	@Test
+	public void testRemove() {
+		assertEquals(20,teststack.size());
+		assertEquals(19,teststack.pop());
+		assertEquals(19,teststack.size());
+		assertEquals(18,teststack.peek());
+		assertFalse(teststack.isEmpty());
+	}
+
+	@Override
+	@Test
+	public void testFunctional() {
+		for(int i = 0; i < 20; i++){
+			teststack.pop();
+		}
+		assertTrue(teststack.isEmpty());
+		teststack.push(100);
+		teststack.push(200);
+		assertEquals(200,teststack.pop());
+		teststack.push(400);
+		assertEquals(400,teststack.pop());
+		assertFalse(teststack.isEmpty());
+		assertEquals(100,teststack.pop());
+		
+		
+		boolean hasExp = false;
+		try{
+			teststack.pop();
+		}catch (IndexOutOfBoundsException e){
+			hasExp = true;
+		}
+		assertTrue(hasExp);
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -27,4 +27,8 @@ public boolean isEmpty(){`
`27`	`27`	`public int size(){`
`28`	`28`	`return elementData.size();`
`29`	`29`	`}`
	`30`	`+`
	`31`	`+ public void clear(){`
	`32`	`+ elementData.clear();`
	`33`	`+ }`
`30`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,4 +25,8 @@ public boolean isEmpty(){`
`25`	`25`	`public int size(){`
`26`	`26`	`return elementData.size();`
`27`	`27`	`}`
	`28`	`+`
	`29`	`+ public void clear(){`
	`30`	`+ elementData.clear();`
	`31`	`+ }`
`28`	`32`	`}`