Skip to content

jeg56 tdy refactor/bugfix of containerclass #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/ContainerArray.java
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
import java.util.ArrayList;

public class ContainerArray<E> {
private int initialCapacity = 10;
private int currentSize = 0;
private Object[] internalArray;
private ArrayList<Object> internalArray;

public ContainerArray () {
this(10);
}

public ContainerArray (int initialCapacity) {
internalArray = new Object[initialCapacity];
internalArray = new ArrayList<>(initialCapacity);
}

public void add (E element) {
internalArray[currentSize++] = element;
internalArray.add(element);
}

public int size () {
return currentSize;
return internalArray.size();
}

public void remove (E objectToRemove) {
currentSize--;
internalArray.remove(objectToRemove);
}

@SuppressWarnings("unchecked")
public E get (int index) {
return (E)internalArray[index];
return (E)internalArray.get(index);
}
}
33 changes: 33 additions & 0 deletions src/ContainerArrayTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,37 @@ public void testObjectIsRemoved () {
myContainer.remove("Bear");
assertEquals("Should be same reference", alligator, myContainer.get(0));
}

@Test
public void testAddingMultiple() {
for(int i=0; i<11; i++){
myContainer.add("");
}
}

@Test
public void testObjectActuallyGone() {
String alligator = "Alligator";
String bear = "Bear";
myContainer.add("Alligator");
myContainer.add("Bear");
myContainer.remove("Bear");
myContainer.add("Iguana");
assertTrue(!myContainer.get(1).equals(bear));
}

@Test
public void testSizePositive() {
myContainer.remove("NULL");
assertTrue(myContainer.size()>0);
}

@Test
public void testSizeChangeOnlyIfPresent() {
myContainer.add("Bear");
int size = myContainer.size();
myContainer.remove("Tiger");
assertEquals(size, myContainer.size());
}

}
4 changes: 4 additions & 0 deletions stupid.MD
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
I'm adding this.


LOLOLOLOLOL