修改版

PigTS · PigTS · commit 15d3661abc3e · 2017-02-25T23:28:32.000+08:00
diff --git a/group01/1814014897/zhouhui/src/week01/BasicDataStructure/ArrayList.java b/group01/1814014897/zhouhui/src/week01/BasicDataStructure/ArrayList.java
@@ -44,10 +44,11 @@ public Object get(int index){
 	
 	public Object remove(int index){
 		if(index < 0 || index >= size) throw new IndexOutOfBoundsException("Index:"+index+",Size:"+size);
+		Object data_index = elementData[index];
 		System.arraycopy(elementData, index + 1, elementData, index, size - index - 1);
 		elementData[size - 1] = null;
 		size--;
-		return elementData;
+		return data_index;
 	}
 	
 	public int size(){
diff --git a/group01/1814014897/zhouhui/src/week01/BasicDataStructureTest/ArrayListTest.java b/group01/1814014897/zhouhui/src/week01/BasicDataStructureTest/ArrayListTest.java
@@ -47,13 +47,10 @@ public void testGet() {
 
 	@Test
 	public void testRemove() {
-		arrayList.remove(0);
-		Assert.assertEquals(arrayList.get(0), 1);
-		arrayList.remove(50);
-		Assert.assertEquals(arrayList.get(50), 52);
-		arrayList.remove(97);
+		Assert.assertEquals(arrayList.remove(0), 0);
+		Assert.assertEquals(arrayList.remove(0), 1);
+		Assert.assertEquals(arrayList.remove(97), 99);
 		Assert.assertEquals(arrayList.size(), 97);
-		Assert.assertEquals(arrayList.get(96), 98);
 	}
 
 	@Test
diff --git a/group01/1814014897/zhouhui/src/week01/BasicDataStructureTest/StackTest.java b/group01/1814014897/zhouhui/src/week01/BasicDataStructureTest/StackTest.java
@@ -30,9 +30,9 @@ public void testPush() {
 
 	@Test
 	public void testPop() {
-		stack.pop();
-		Assert.assertEquals(stack.peek(), 98);
-		for(int i=0;i<99;i++){
+		Assert.assertEquals(stack.pop(), 99);
+		Assert.assertEquals(stack.pop(), 98);
+		for(int i=0;i<98;i++){
 			stack.pop();
 		}
 		Assert.assertEquals(stack.size(), 0);
@@ -46,6 +46,7 @@ public void testPeek() {
 		}
 		stack.pop();
 		Assert.assertEquals(stack.peek(), 98);
+		Assert.assertEquals(stack.peek(), 98);
 	}
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ public void testPush() {`
`30`	`30`
`31`	`31`	`@Test`
`32`	`32`	`public void testPop() {`
`33`		`- stack.pop();`
`34`		`- Assert.assertEquals(stack.peek(), 98);`
`35`		`- for(int i=0;i<99;i++){`
	`33`	`+ Assert.assertEquals(stack.pop(), 99);`
	`34`	`+ Assert.assertEquals(stack.pop(), 98);`
	`35`	`+ for(int i=0;i<98;i++){`
`36`	`36`	`stack.pop();`
`37`	`37`	`}`
`38`	`38`	`Assert.assertEquals(stack.size(), 0);`
`@@ -46,6 +46,7 @@ public void testPeek() {`
`46`	`46`	`}`
`47`	`47`	`stack.pop();`
`48`	`48`	`Assert.assertEquals(stack.peek(), 98);`
	`49`	`+ Assert.assertEquals(stack.peek(), 98);`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`@Test`