From c77ad6e514aa2e7e3c3d042ffcf2cfb11158f1c1 Mon Sep 17 00:00:00 2001 From: MAX0996 Date: Wed, 16 Dec 2020 20:49:08 +0100 Subject: [PATCH] Nouveau commit avec tests --- src/main/java/fr/myny/grid/BuildGrid.java | 35 ++++++++++++++++--- src/test/java/fr/myny/grid/BuildGridTest.java | 15 ++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/main/java/fr/myny/grid/BuildGrid.java b/src/main/java/fr/myny/grid/BuildGrid.java index 3a88436..1aa27b0 100644 --- a/src/main/java/fr/myny/grid/BuildGrid.java +++ b/src/main/java/fr/myny/grid/BuildGrid.java @@ -1,5 +1,8 @@ package fr.myny.grid; +import java.util.Arrays; +import java.util.Objects; + public class BuildGrid { private int m_dim_x; @@ -38,22 +41,22 @@ public class BuildGrid { SETTERS & GETTERS */ - private int getDimX () + public int getDimX () { return m_dim_x; } - private int getDimY () + public int getDimY () { return m_dim_y; } - private void setDimX (int value) + public void setDimX (int value) { m_dim_x = value; } - private void setDimY (int value) + public void setDimY (int value) { m_dim_y = value; } @@ -67,6 +70,15 @@ public class BuildGrid { m_grid[posX][posY] = value; } + public float getValue(int posX, int posY) + { + return m_grid[posX][posY]; + } + + public float[][] getM_grid() { + return m_grid; + } + public void displayGrid () { for (int i = 0; i < getDimX(); i++) { @@ -87,4 +99,19 @@ public class BuildGrid { } } } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + BuildGrid buildGrid = (BuildGrid) o; + return m_dim_x == buildGrid.m_dim_x && m_dim_y == buildGrid.m_dim_y && Arrays.equals(m_grid, buildGrid.m_grid); + } + + @Override + public int hashCode() { + int result = Objects.hash(m_dim_x, m_dim_y); + result = 31 * result + Arrays.hashCode(m_grid); + return result; + } } \ No newline at end of file diff --git a/src/test/java/fr/myny/grid/BuildGridTest.java b/src/test/java/fr/myny/grid/BuildGridTest.java index 366362a..750bd71 100644 --- a/src/test/java/fr/myny/grid/BuildGridTest.java +++ b/src/test/java/fr/myny/grid/BuildGridTest.java @@ -2,6 +2,8 @@ package fr.myny.grid; import org.junit.jupiter.api.Test; +import java.util.Arrays; + import static org.junit.jupiter.api.Assertions.*; class BuildGridTest { @@ -15,6 +17,19 @@ class BuildGridTest { @Test void displayGrid() { BuildGrid grid = new BuildGrid(5); + + assertEquals(5, grid.getDimX()); + assertEquals(5, grid.getDimY()); + assertEquals(0.0, grid.getValue(0,0)); + + float tabl[][] = new float[5][5]; + + for (int i = 0; i < 5; i++) { + for (int y = 0; y < 5; y++) { + tabl[i][y] = 0; + } + } + grid.displayGrid(); }