Skip to content
Snippets Groups Projects
Commit 85a9a3ec authored by VIOLA Anthony's avatar VIOLA Anthony
Browse files

TP1

parent 9c41c77e
No related branches found
No related tags found
No related merge requests found
Pipeline #17384 passed
...@@ -86,11 +86,9 @@ public class Vector { ...@@ -86,11 +86,9 @@ public class Vector {
* @param element entier à ajouter * @param element entier à ajouter
*/ */
public void add(int element) { public void add(int element) {
if (!isEmpty()){ elements[size] = element;
this.elements[this.size] = element;
size+=1; size+=1;
} }
}
/** /**
* Ajoute l'entier element à la position index dans le tableau. * Ajoute l'entier element à la position index dans le tableau.
* Si le tableau contient moins de index+1 éléments, la méthode ne fait rien. * Si le tableau contient moins de index+1 éléments, la méthode ne fait rien.
......
...@@ -40,16 +40,15 @@ public class VectorTest { ...@@ -40,16 +40,15 @@ public class VectorTest {
Vector vector = new Vector(23); Vector vector = new Vector(23);
vector.ensureCapacity(120); vector.ensureCapacity(120);
assertThat(vector.capacity()).isEqualTo(120); assertThat(vector.capacity()).isEqualTo(120);
// TODO : add code // Valide
} }
@Test @Test
void testResize() { void testResize() {
Vector vector = new Vector(); Vector vector = new Vector(10);
vector.resize(120); vector.resize(20);
vector.add(2); assertThat(vector.size()).isEqualTo(20);
assertThat(vector.get(119)).isEqualTo(2); // Valide
// TODO : add code
} }
@Test @Test
...@@ -57,27 +56,28 @@ public class VectorTest { ...@@ -57,27 +56,28 @@ public class VectorTest {
Vector vector = new Vector(1); Vector vector = new Vector(1);
vector.add(2); vector.add(2);
vector.resize(0); vector.resize(0);
vector.resize(1); assertThat(vector.size()).isEqualTo(0);
assertThat(vector.get(0)).isEqualTo(0); // Valide
} }
@Test @Test
@Disabled
void testResize_CapacityIncreased() { void testResize_CapacityIncreased() {
/* TODO */ Vector vector = new Vector(5);
fail("not yet implemented"); vector.ensureCapacity(10);
assertThat(vector.capacity()).isEqualTo(10);
// Valide
} }
@Test @Test
@Disabled //@Disabled
void testResize_CapacityNeverDecreaseWhenSizeDecrease() { void testResize_CapacityNeverDecreaseWhenSizeDecrease() {
Vector vector = new Vector(8); Vector vector = new Vector(8);
vector.add(1); vector.add(1);
vector.add(3); vector.add(3);
vector.add(12); vector.add(12);
vector.ensureCapacity(5);
// TODO : add code assertThat(vector.capacity()).isEqualTo(8);
fail("not yet implemented"); // Valide
} }
@Test @Test
...@@ -100,41 +100,46 @@ public class VectorTest { ...@@ -100,41 +100,46 @@ public class VectorTest {
assertThat(vector.get(2)).isEqualTo(10); assertThat(vector.get(2)).isEqualTo(10);
vector.resize(1); vector.resize(1);
vector.add(2); vector.add(2);
// TODO : add code assertThat(vector.size()).isEqualTo(2);
fail("not yet implemented"); assertThat(vector.get(0)).isEqualTo(12);
assertThat(vector.get(1)).isEqualTo(2);
// Valide
} }
@Test @Test
@Disabled
void testSet() { void testSet() {
Vector vector = new Vector(); Vector vector = new Vector();
vector.add(12); vector.add(12);
vector.add(13); vector.add(13);
vector.add(10); vector.add(10);
assertThat(vector.get(0)).isEqualTo(12);
assertThat(vector.get(1)).isEqualTo(13);
assertThat(vector.get(2)).isEqualTo(10);
vector.set(0, 2); vector.set(0, 2);
vector.set(2, 4); vector.set(2, 4);
vector.set(3, 123); vector.set(3, 123);
// TODO : add code assertThat(vector.get(0)).isEqualTo(2);
fail("not yet implemented"); assertThat(vector.get(2)).isEqualTo(4);
assertThat(vector.get(3)).isEqualTo(123);
// Valide
} }
@Test @Test
@Disabled
void testGet_WhenInRange() { void testGet_WhenInRange() {
Vector vector = new Vector(); Vector vector = new Vector();
vector.add(12); vector.add(12);
vector.add(13); vector.add(13);
// TODO : add test assertThat(vector.get(0)).isEqualTo(12);
fail("not yet implemented"); assertThat(vector.get(1)).isEqualTo(13);
// Valide
} }
@Test @Test
@Disabled
void testGet_WhenOutsideRange() { void testGet_WhenOutsideRange() {
Vector vector = new Vector(); Vector vector = new Vector();
vector.add(12); vector.add(12);
vector.add(13); vector.add(13);
// TODO : add test for indices outside of the size of the vector assertThat(vector.get(3)).isEqualTo(0);
fail("not yet implemented"); //fail("not yet implemented");
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment