update javalang

Author: nange

java/arraylist/MyArrayList.java

@@ -1,81 +1,79 @@
-package myarraylist
+package arraylist;
 
 import java.lang.ArrayIndexOutOfBoundsException;
-import java.lang.String;
 
 public class MyArrayList<AnyType> {
 	private static final int DEFAULT_CAPACITY = 10;
 
 	private int size;
-    private AnyType[] items;
-
-    public MyArrayList() {
-        clear();
-    }
-
-    public void clear() {
-        this.size = 0;
-        this.ensureCapacity(DEFAULT_CAPACITY);
-    }
-
-    public int size() {
-        return this.size;
-    }
-
-    public AnyType get(int index) {
-        if (index < 0 || index >= this.size()) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        return this.items[index];
-    }
-
-    public void set(int index, AnyType newVal) {
-        if (index < 0 || index >= this.size()) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        this.items[index] = newVal;
-    }
-
-    public void add(int index, AnyType item) {
-        if (this.size() == this.items.length) {
-            ensureCapacity(2*this.size());
-        }
-        for (int i = this.size; i > index; i--) {
-            this.items[i] = this.items[i-1];
-        }
-        this.items[index] = item;
-
-        this.size++;
-    }
-
-    public void add(AnyType item) {
-        this.add(this.size(), item);
-    }
-
-    public AnyType remove(int index) {
-        if (index < 0 || index >= this.size()) {
-            throw new ArrayIndexOutOfBoundsException();
-        }
-        AnyType removedItem = this.items[index];
-        for (int i = index; i < this.size(); i++) {
-            this.items[i] = this.items[i+1];
-        }
-
-        this.size--;
-        return removedItem;
-    }
-
-    public String toString() {
-        return this.items.toString();
-    }
-
-    private void ensureCapacity(int newCapacity) {
-        if (newCapacity < this.size) return;
-
-        AnyType[] old = this.items;
-        items = new AnyType[newCapacity];
-        for (int i = 0; i < this.size(); i++) {
-            items[i] = old[i];
-        }
-    }
+	private AnyType[] items;
+
+	public MyArrayList() {
+		clear();
+	}
+
+	public void clear() {
+		this.size = 0;
+		this.ensureCapacity(DEFAULT_CAPACITY);
+	}
+
+	public int size() {
+		return this.size;
+	}
+
+	public AnyType get(int index) {
+		if (index < 0 || index >= this.size()) {
+			throw new ArrayIndexOutOfBoundsException();
+		}
+		return this.items[index];
+	}
+
+	public void set(int index, AnyType newVal) {
+		if (index < 0 || index >= this.size()) {
+			throw new ArrayIndexOutOfBoundsException();
+		}
+		this.items[index] = newVal;
+	}
+
+	public void add(int index, AnyType item) {
+		if (this.size() == this.items.length) {
+			ensureCapacity(2 * this.size());
+		}
+
+		for (int i = this.size; i > index; i--) {
+			this.items[i] = this.items[i - 1];
+		}
+		this.items[index] = item;
+
+		this.size++;
+	}
+
+	public void add(AnyType item) {
+		this.add(this.size(), item);
+	}
+
+	public AnyType remove(int index) {
+		if (index < 0 || index >= this.size()) {
+			throw new ArrayIndexOutOfBoundsException();
+		}
+		AnyType removedItem = this.items[index];
+		for (int i = index; i < this.size(); i++) {
+			this.items[i] = this.items[i + 1];
+		}
+
+		this.size--;
+		return removedItem;
+	}
+
+	@SuppressWarnings("unchecked")
+	private void ensureCapacity(int newCapacity) {
+		if (newCapacity < this.size)
+			return;
+
+		AnyType[] old = this.items;
+		items = (AnyType[]) new Object[newCapacity];
+		for (int i = 0; i < this.size(); i++) {
+			items[i] = old[i];
+		}
+	}
 }

java/arraylist/MyArrayListTest.java

@@ -0,0 +1,76 @@
+package arraylist;
+
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
+
+public class MyArrayListTest {
+	
+	private static MyArrayList<String> list = new MyArrayList<String>();
+	
+	@Before
+	public void setUp() throws Exception {
+		list.clear();
+	}
+
+	@Test
+	public void testClear() {
+		list.clear();
+		assertEquals(0, list.size());
+	}
+
+	@Test
+	public void testSize() {
+		assertEquals(0, list.size());
+		list.add("1");
+		assertEquals(1, list.size());
+	}
+
+	@Test
+	public void testGet() {
+		list.add("1");
+		list.add("2");
+		list.add("3");
+		String item = list.get(0);
+		assertEquals("1", item);
+	}
+
+	@Test
+	public void testSet() {
+		list.add("1");
+		list.add("2");
+		list.add("3");
+		list.set(2, "4");
+		assertEquals("4", list.get(2));
+	}
+
+	@Test
+	public void testAddIntAnyType() {
+		list.add("1");
+		list.add("2");
+		list.add("3");
+		list.add(0, "4");
+		assertEquals("4", list.get(0));
+	}
+
+	@Test
+	public void testAddAnyType() {
+		list.add("1");
+		list.add("2");
+		list.add("3");
+		assertEquals(3, list.size());
+		assertEquals("3", list.get(2));
+	}
+
+	@Test
+	public void testRemove() {
+		list.add("1");
+		list.add("2");
+		list.add("3");
+		list.remove(2);
+		assertEquals(2, list.size());
+		assertEquals("2", list.get(1));
+	}
+	
+}