Morph01/Sudoku
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: rename test names

Browse Source
This commit is contained in:
Morph01
2025-02-06 18:10:35 +01:00
parent b0b4152ec4
commit 1ad9c0500e
6 changed files with 63 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/java/sudoku/App.java
View File

@@ -7,49 +7,6 @@ public class App {
public static void main(String[] args) { public static void main(String[] args) {
System.out.println(new App().getGreeting()); System.out.println(new App().getGreeting());
/*
// Create a new Sudoku
Sudoku sudoku = new Sudoku(9);
sudoku.getGrille().setSymbolesPossibles(new ArrayList<>(Arrays.asList(
Symbole.of(1),
Symbole.of(2),
Symbole.of(3),
Symbole.of(4),
Symbole.of(5),
Symbole.of(6),
Symbole.of(7),
Symbole.of(8),
Symbole.of(9))));
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(6, 1, Symbole.of(2));
sudoku.getGrille().setCase(2, 2, Symbole.of(3));
sudoku.getGrille().setCase(0, 3, Symbole.of(4));
sudoku.getGrille().setCase(4, 4, Symbole.of(5));
sudoku.getGrille().setCase(0, 5, Symbole.of(6));
sudoku.getGrille().setCase(5, 6, Symbole.of(7));
sudoku.getGrille().setCase(0, 7, Symbole.of(8));
sudoku.getGrille().setCase(4, 8, Symbole.of(9));
sudoku.getGrille().creerBlocCarre();
System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString());
System.out.println("Blocs :");
sudoku.getGrille().printBlocs();
System.out.println("Symboles possibles :");
sudoku.getGrille().printSymbolesPossibles();
//Création d'un second sudoku
System.out.println("Création d'un second SUDOKU");
Sudoku sudoku2 = new Sudoku(9);
/*sudoku2.getGrille().askSetSymbolesPossibles();
System.out.println("Symboles possibles :");
sudoku2.getGrille().printSymbolesPossibles();*/
try{ try{
Sudoku.menuGrille(); Sudoku.menuGrille();

90
app/src/test/java/sudoku/AppTest.java
View File

@@ -1,30 +1,25 @@
package sudoku; package sudoku;
import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals;
import sudoku.core.Console;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Scanner;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class AppTest { public class AppTest {
/**
* Test the creation of a Sudoku grid with a size of 16
*/
@Test @Test
public void testExample() { public void testExample() {
// Simulate user input with proper line endings // Simulate user input with proper line endings
// First 1 is to select the int type of Symboles and after, Symboles are entered (1 to 16) // First 1 is to select the int type of Symboles and after, Symboles are entered
// (1 to 16)
String simulatedInput = "1\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n"; String simulatedInput = "1\n1\n2\n3\n4\n5\n6\n7\n8\n9\n10\n11\n12\n13\n14\n15\n16\n";
System.setIn(new ByteArrayInputStream(simulatedInput.getBytes())); System.setIn(new ByteArrayInputStream(simulatedInput.getBytes()));
// Create a new Sudoku // Create a new Sudoku
Sudoku sudoku = new Sudoku(16); Sudoku sudoku = new Sudoku(16);
sudoku.getGrille().askSetSymbolesPossibles(); sudoku.getGrille().askSetSymbolesPossibles(1, new Scanner(System.in)); // Pass the type of symbol and scanner
// Verify the symbols // Verify the symbols
ArrayList<Symbole> expectedSymbols = new ArrayList<>(Arrays.asList( ArrayList<Symbole> expectedSymbols = new ArrayList<>(Arrays.asList(
@@ -48,79 +43,10 @@ public class AppTest {
// Cleanup // Cleanup
System.setIn(System.in); System.setIn(System.in);
}
@Test int taille = expectedSymbols.size() - 1;
public void testContraintes() { for (Symbole symbole : expectedSymbols) {
// Create a new Sudoku sudoku.getGrille().setCase(taille++, taille++, symbole);
Sudoku sudoku = new Sudoku(16);
sudoku.getGrille().setSymbolesPossibles(new ArrayList<>(Arrays.asList(
Symbole.of(1),
Symbole.of(2),
Symbole.of(3),
Symbole.of(4),
Symbole.of(5),
Symbole.of(6),
Symbole.of(7),
Symbole.of(8),
Symbole.of(9),
Symbole.of(10),
Symbole.of(11),
Symbole.of(11),
Symbole.of(12),
Symbole.of(13),
Symbole.of(14),
Symbole.of(15),
Symbole.of(16))));
// Add constraints
sudoku.ajouterContrainte(new ContrainteLigne());
sudoku.ajouterContrainte(new ContrainteColonne());
// sudoku.ajouterContrainte(new ContrainteBloc());
// Fill the grid with valid symbols
sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(0, 1, Symbole.of(2));
sudoku.getGrille().setCase(0, 2, Symbole.of(3));
sudoku.getGrille().setCase(1, 0, Symbole.of(4));
sudoku.getGrille().setCase(1, 1, Symbole.of(5));
sudoku.getGrille().setCase(1, 2, Symbole.of(6));
sudoku.getGrille().setCase(2, 0, Symbole.of(7));
sudoku.getGrille().setCase(2, 1, Symbole.of(8));
sudoku.getGrille().setCase(2, 2, Symbole.of(9));
sudoku.getGrille().setCase(2, 8, Symbole.of(9));
sudoku.getGrille().setCase(14, 2, Symbole.of(6));
sudoku.getGrille().setCase(3, 3, Symbole.of(5));
// sudoku.getGrille().setCase(2, 2, Symbole.of(13));
// sudoku.getGrille().setCase(2, 2, Symbole.of(14));
// sudoku.getGrille().setCase(2, 2, Symbole.of(15));
// Create square blocks
sudoku.getGrille().creerBlocCarre();
System.out.println(sudoku.getGrille().toString());
// Verify that the constraints are respected
// assertTrue(sudoku.estValide(sudoku.getGrille().getCase(0, 0)));
// assertTrue(sudoku.estValide(sudoku.getGrille().getCase(1, 1)));
// assertTrue(sudoku.estValide(sudoku.getGrille().getCase(2, 2)));
if (sudoku.verifierToutesContraintes()) {
Console.successln("Toutes les contraintes sont respectées !");
} else {
Console.errorln("Au moins une contrainte n'est pas respectée.");
} }
// Add a duplicate symbol in the same row
// sudoku.getGrille().setCase(0, 3, Symbole.of(1));
// assertFalse(sudoku.estValide(sudoku.getGrille().getCase(0, 3)));
// Add a duplicate symbol in the same column
// sudoku.getGrille().setCase(3, 0, Symbole.of(1));
// assertFalse(sudoku.estValide(sudoku.getGrille().getCase(3, 0)));
// Add a duplicate symbol in the same block
// sudoku.getGrille().setCase(1, 1, Symbole.of(1));
// assertFalse(sudoku.estValide(sudoku.getGrille().getCase(1, 1)));
} }
} }

6
app/src/test/java/sudoku/TestBloc.java → app/src/test/java/sudoku/TestDoublonBloc.java
View File

@@ -7,10 +7,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
public class TestBloc { public class TestDoublonBloc {
@Test @Test
public void testBloc() { public void testBloc() {
System.out.println("TEST BLOC : "); System.out.println("TEST DOUBLON BLOC : ");
System.out.println(new App().getGreeting()); System.out.println(new App().getGreeting());
// Create a new Sudoku // Create a new Sudoku
Sudoku sudoku = new Sudoku(9); Sudoku sudoku = new Sudoku(9);
@@ -51,6 +51,6 @@ public class TestBloc {
System.out.println("Symboles possibles :"); System.out.println("Symboles possibles :");
sudoku.getGrille().printSymbolesPossibles(); sudoku.getGrille().printSymbolesPossibles();
System.out.println("FIN TEST BLOC"); System.out.println("FIN TEST DOUBLON BLOC");
} }
} }

6
app/src/test/java/sudoku/TestColonne.java → app/src/test/java/sudoku/TestDoublonColonne.java
View File

@@ -7,10 +7,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
public class TestColonne { public class TestDoublonColonne {
@Test @Test
public void testColonne() { public void testColonne() {
System.out.println("TEST COL : "); System.out.println("TEST DOUBLON COLONNE : ");
System.out.println(new App().getGreeting()); System.out.println(new App().getGreeting());
// Create a new Sudoku // Create a new Sudoku
Sudoku sudoku = new Sudoku(9); Sudoku sudoku = new Sudoku(9);
@@ -50,6 +50,6 @@ public class TestColonne {
System.out.println("Symboles possibles :"); System.out.println("Symboles possibles :");
sudoku.getGrille().printSymbolesPossibles(); sudoku.getGrille().printSymbolesPossibles();
System.out.println("FIN TEST COL"); System.out.println("FIN TEST DOUBLON COLONNE");
} }
} }

8
app/src/test/java/sudoku/TestLigne.java → app/src/test/java/sudoku/TestDoublonLigne.java
View File

@@ -5,10 +5,10 @@ import org.junit.jupiter.api.Test;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
public class TestLigne { public class TestDoublonLigne {
@Test @Test
public void testLigne() { public void testDoublonLigne() {
System.out.println("TEST LIGNE : "); System.out.println("TEST DOUBLON LIGNE : ");
System.out.println(new App().getGreeting()); System.out.println(new App().getGreeting());
// Create a new Sudoku // Create a new Sudoku
Sudoku sudoku = new Sudoku(9); Sudoku sudoku = new Sudoku(9);
@@ -47,6 +47,6 @@ public class TestLigne {
System.out.println("Symboles possibles :"); System.out.println("Symboles possibles :");
sudoku.getGrille().printSymbolesPossibles(); sudoku.getGrille().printSymbolesPossibles();
System.out.println("FIN TEST LIGNE"); System.out.println("FIN TEST DOUBLON LIGNE");
} }
} }

90
app/src/test/java/sudoku/TestResolveurBacktraceSimpleSudoku25.java
View File

@@ -1,56 +1,56 @@
package sudoku; // package sudoku;
import java.util.ArrayList; // import java.util.ArrayList;
import org.junit.jupiter.api.Test; // import org.junit.jupiter.api.Test;
public class TestResolveurBacktraceSimpleSudoku25 { // public class TestResolveurBacktraceSimpleSudoku25 {
@Test // @Test
public void testResolution() { // public void testResolution() {
System.out.println("TEST RESOLVEUR BACKTRACE SIMPLE : "); // System.out.println("TEST RESOLVEUR BACKTRACE SIMPLE : ");
System.out.println(new App().getGreeting()); // System.out.println(new App().getGreeting());
// Create a new Sudoku // // Create a new Sudoku
Sudoku sudoku = new Sudoku(25); // Sudoku sudoku = new Sudoku(25);
ArrayList<Symbole> symboles = new ArrayList<>(); // ArrayList<Symbole> symboles = new ArrayList<>();
for (int i = 1; i <= 25; i++) { // for (int i = 1; i <= 25; i++) {
symboles.add(Symbole.of(i)); // symboles.add(Symbole.of(i));
} // }
sudoku.getGrille().setSymbolesPossibles(symboles); // sudoku.getGrille().setSymbolesPossibles(symboles);
sudoku.ajouterContrainte(new ContrainteLigne()); // sudoku.ajouterContrainte(new ContrainteLigne());
sudoku.ajouterContrainte(new ContrainteColonne()); // sudoku.ajouterContrainte(new ContrainteColonne());
sudoku.ajouterContrainte(new ContrainteBloc()); // sudoku.ajouterContrainte(new ContrainteBloc());
sudoku.getGrille().setCase(0, 0, Symbole.of(1)); // sudoku.getGrille().setCase(0, 0, Symbole.of(1));
sudoku.getGrille().setCase(6, 1, Symbole.of(2)); // sudoku.getGrille().setCase(6, 1, Symbole.of(2));
sudoku.getGrille().setCase(2, 2, Symbole.of(3)); // sudoku.getGrille().setCase(2, 2, Symbole.of(3));
sudoku.getGrille().setCase(0, 3, Symbole.of(4)); // sudoku.getGrille().setCase(0, 3, Symbole.of(4));
sudoku.getGrille().setCase(4, 4, Symbole.of(5)); // sudoku.getGrille().setCase(4, 4, Symbole.of(5));
sudoku.getGrille().setCase(0, 5, Symbole.of(6)); // sudoku.getGrille().setCase(0, 5, Symbole.of(6));
sudoku.getGrille().setCase(5, 6, Symbole.of(7)); // sudoku.getGrille().setCase(5, 6, Symbole.of(7));
sudoku.getGrille().setCase(0, 7, Symbole.of(8)); // sudoku.getGrille().setCase(0, 7, Symbole.of(8));
sudoku.getGrille().setCase(4, 8, Symbole.of(9)); // sudoku.getGrille().setCase(4, 8, Symbole.of(9));
sudoku.getGrille().setCase(0, 9, Symbole.of(25)); // sudoku.getGrille().setCase(0, 9, Symbole.of(25));
sudoku.getGrille().setCase(6, 10, Symbole.of(11)); // sudoku.getGrille().setCase(6, 10, Symbole.of(11));
sudoku.getGrille().setCase(2, 11, Symbole.of(12)); // sudoku.getGrille().setCase(2, 11, Symbole.of(12));
sudoku.getGrille().setCase(0, 12, Symbole.of(13)); // sudoku.getGrille().setCase(0, 12, Symbole.of(13));
sudoku.getGrille().creerBlocCarre(); // sudoku.getGrille().creerBlocCarre();
System.out.println("Sudoku :"); // System.out.println("Sudoku :");
System.out.println(sudoku.getGrille().toString()); // System.out.println(sudoku.getGrille().toString());
System.out.println("Blocs :"); // System.out.println("Blocs :");
sudoku.getGrille().printBlocs(); // sudoku.getGrille().printBlocs();
System.out.println("Symboles possibles :"); // System.out.println("Symboles possibles :");
sudoku.getGrille().printSymbolesPossibles(); // sudoku.getGrille().printSymbolesPossibles();
// ResolveurBacktraceSimple resolveur = new ResolveurBacktraceSimple(sudoku); // ResolveurBacktraceSimple resolveur = new ResolveurBacktraceSimple(sudoku);
// resolveur.resoudre(sudoku, false); // resolveur.resoudre(sudoku, false);
System.out.println("Sudoku resolu :"); // System.out.println("Sudoku resolu :");
System.out.println(sudoku.getGrille().toString()); // System.out.println(sudoku.getGrille().toString());
System.out.println("FIN TEST RESOLVEUR BACKTRACE SIMPLE"); // System.out.println("FIN TEST RESOLVEUR BACKTRACE SIMPLE");
} // }
} // }