Commit 15:18

javadoc

src/ecoparasite/input/DataParsing.java

@@ -4,6 +4,9 @@ import ecoparasite.poisson.Poisson;
 
 import java.util.HashSet;
 
+/**
+ * Interface définissant la fonction de Parsing des données
+ */
 public interface DataParsing {
 
     public HashSet<Poisson> parse(RawData data);

src/ecoparasite/input/RawDataTest.java

@@ -0,0 +1,43 @@
+package ecoparasite.input;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+import ecoparasite.input.RawData;
+
+import java.util.HashSet;
+
+class RawDataTest {
+
+
+    @Test
+    void getColumnsNames() throws InputFileException {
+        RawData test = InputFactory.readData("test.csv");
+
+        HashSet<String> d = new HashSet<>();
+
+        for (int i = 0; i < test.getData().size(); i++){
+            d.add(test.getData().get(i).getFirst());
+        }
+
+        System.out.println(test.getColumnsNames());
+        System.out.println(d);
+
+        assertIterableEquals(test.getColumnsNames(),d);
+    }
+
+    @Test
+    void getDataFromColumn() throws InputFileException {
+        RawData test = InputFactory.readData("test.csv");
+
+        System.out.println(test.getDataFromColumn("Sample_code"));
+
+    }
+
+    @Test
+    void getEntry() throws InputFileException, RawDataOverflow {
+        RawData test = InputFactory.readData("test.csv");
+
+        System.out.println(test.getEntry(2));
+    }
+}

src/ecoparasite/poisson/Mackerel.java

@@ -10,10 +10,21 @@ import java.util.HashSet;
  * Ajoute les fonctions de Parsing liés aux données collectées sur le Mackerel.
  */
 public class Mackerel extends Poisson implements DataParsing {
-    public Mackerel(String species, Double length, Double infestation) {
-        super(species, length, null, infestation);
+
+    /**
+     * Constructeur de Mackerel
+     * @param length
+     * @param infestation
+     */
+    public Mackerel(Double length, Double infestation) {
+        super("Mackerel", length, null, infestation);
     }
 
+    /**
+     * Implémentation de la fonction parse de Dataparsing
+     * @param data
+     * @return tableau des poissons
+     */
     @Override
     public HashSet<Poisson> parse(RawData data) {
 

src/ecoparasite/test/InputFactoryTest.java

@@ -0,0 +1,36 @@
+package ecoparasite.test;
+
+
+import static ecoparasite.input.InputFactory.*;
+import static org.junit.jupiter.api.Assertions.assertArrayEquals;
+
+import ecoparasite.input.InputFactory;
+import ecoparasite.input.InputFileException;
+import ecoparasite.input.RawData;
+import org.junit.jupiter.api.Test;
+
+class InputFactoryTest{
+
+    @org.junit.jupiter.api.Test
+    void buildDataPath() {
+
+        String d = "data/Campagne/mackerel.97442.csv";
+        String e = "data/Campagne/merlu2018_75164.csv";
+
+        assertArrayEquals(d.toCharArray(), InputFactory.buildDataPath("Campagne/mackerel.97442.csv").toCharArray());
+        assertArrayEquals(e.toCharArray(), InputFactory.buildDataPath("Campagne/merlu2018_75164.csv").toCharArray());
+
+    }
+
+    @org.junit.jupiter.api.Test
+    void readData() throws InputFileException {
+        RawData test = InputFactory.readData("test.csv");
+
+        System.out.println(test.getData());
+
+    }
+
+    @org.junit.jupiter.api.Test
+    void testReadData() {
+    }
+}