3010293
/
PR2-Gruppenprojekt
2
0
Fork 0
Code Issues 22 Pull Requests Packages Projects Releases Wiki Activity

fixed test pathing

main
Berat Kocak 2024-12-26 12:53:20 +01:00
parent b2d94176da
commit 7e47bca18c
7 changed files with 10 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/domain/LogHighscores.java
View File

@ -6,10 +6,11 @@ import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.lang.System.Logger; import java.lang.System.Logger;
import java.util.Scanner; import java.util.Scanner;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.*;
public class LogHighscores { public class LogHighscores {
//private static final Logger logger = LogManager.getLogger(LogHighscores.class); private static final org.apache.logging.log4j.Logger logger = LogManager.getLogger(LogHighscores.class);
public static void newRecord(String path, String username, String time) throws FileNotFoundException { public static void newRecord(String path, String username, String time) throws FileNotFoundException {
String timePart = time.substring("Zeit: ".length()).trim(); String timePart = time.substring("Zeit: ".length()).trim();
@ -26,10 +27,6 @@ public class LogHighscores {
sc.nextLine(); sc.nextLine();
} }
sc.close(); sc.close();
/*
=======
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) { try (BufferedWriter writer = new BufferedWriter(new FileWriter(filepath, true))) {
String eintrag = timePart + " " + username; String eintrag = timePart + " " + username;
logger.info("Neuer Eintrag: {}", eintrag); logger.info("Neuer Eintrag: {}", eintrag);
@ -39,6 +36,5 @@ public class LogHighscores {
} catch (IOException e) { } catch (IOException e) {
logger.error("Fehler beim Schreiben in die Datei: " + filepath, e); logger.error("Fehler beim Schreiben in die Datei: " + filepath, e);
} }
*/
} }
} }

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/GameGUI.java
View File

@ -1,9 +1,4 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui; package de.hs_mannheim.informatik.mvn.gui;
=======
package de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
import java.awt.Color; import java.awt.Color;
@ -23,12 +18,9 @@ import javax.swing.JPanel;
import javax.swing.JTextField; import javax.swing.JTextField;
import javax.swing.SwingUtilities; import javax.swing.SwingUtilities;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.HitoriMain; import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
import de.hs_mannheim.informatik.mvn.domain.LogHighscores; import de.hs_mannheim.informatik.mvn.domain.LogHighscores;
=======
import de.hs_mannheim.informatik.mvn.domain.*; import de.hs_mannheim.informatik.mvn.domain.*;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
public class GameGUI extends JFrame implements ActionListener { public class GameGUI extends JFrame implements ActionListener {

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/HighscoreGUI.java
View File

@ -1,8 +1,5 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui; package de.hs_mannheim.informatik.mvn.gui;
=======
package de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
@ -20,11 +17,8 @@ import javax.swing.JButton;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.HitoriMain; import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
=======
import de.hs_mannheim.informatik.mvn.domain.*; import de.hs_mannheim.informatik.mvn.domain.*;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
public class HighscoreGUI extends JFrame implements ActionListener { public class HighscoreGUI extends JFrame implements ActionListener {

8
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/gui/MenuGUI.java
View File

@ -1,8 +1,5 @@
<<<<<<< HEAD
package de.hs_mannheim.informatik.mvn.gui; package de.hs_mannheim.informatik.mvn.gui;
=======
package de.hs_mannheim.informatik.mvn.gui;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
import java.awt.BorderLayout; import java.awt.BorderLayout;
import java.awt.CardLayout; import java.awt.CardLayout;
@ -17,11 +14,8 @@ import javax.swing.JButton;
import javax.swing.JFrame; import javax.swing.JFrame;
import javax.swing.JLabel; import javax.swing.JLabel;
import javax.swing.JPanel; import javax.swing.JPanel;
<<<<<<< HEAD
import de.hs_mannheim.informatik.mvn.domain.HitoriMain; import de.hs_mannheim.informatik.mvn.domain.HitoriMain;
=======
import de.hs_mannheim.informatik.mvn.domain.*; import de.hs_mannheim.informatik.mvn.domain.*;
>>>>>>> 15dab1e2b216c70c296840fbf16efc309c9504cf
public class MenuGUI extends JFrame implements ActionListener { public class MenuGUI extends JFrame implements ActionListener {

2
PR2Projekt/src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Highscores/Hitori4x4_leicht.txt
View File

@ -1,2 +0,0 @@
emre
berat

9
PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/HitoriTest.java
View File

@ -57,7 +57,8 @@ class HitoriTest{
{"W", "W", "W", "B"}, {"W", "W", "W", "B"},
{"W", "B", "W", "W"}, {"W", "B", "W", "W"},
{"B", "W", "W", "B"}}; {"B", "W", "W", "B"}};
String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Highscores/Hitori4x4_leicht.txt"; String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori4x4_leicht.csv";
try { try {
assertFalse(HitoriMain2.abgabeMöglich(path, data, colors)); assertFalse(HitoriMain2.abgabeMöglich(path, data, colors));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@ -77,7 +78,7 @@ class HitoriTest{
{"W", "W", "W", "B"}, {"W", "W", "W", "B"},
{"W", "B", "W", "W"}, {"W", "B", "W", "W"},
{"B", "W", "W", "B"}}; {"B", "W", "W", "B"}};
String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori4x4_leicht.csv"; String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori4x4_leicht.csv";
try { try {
assertTrue(HitoriMain2.abgabeMöglich(path, data, colors)); assertTrue(HitoriMain2.abgabeMöglich(path, data, colors));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@ -99,7 +100,7 @@ class HitoriTest{
{"W", "B", "W", "W", "W"}, {"W", "B", "W", "W", "W"},
{"W", "B", "W", "W", "W"}, {"W", "B", "W", "W", "W"},
{"W", "B", "W", "W", "W"}}; {"W", "B", "W", "W", "W"}};
String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori5x5_leicht.csv"; String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori5x5leicht.csv";
try { try {
assertFalse(HitoriMain2.abgabeMöglich(path, data, colors)); assertFalse(HitoriMain2.abgabeMöglich(path, data, colors));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@ -121,7 +122,7 @@ class HitoriTest{
{"B", "W", "W", "B", "W"}, {"B", "W", "W", "B", "W"},
{"W", "W", "B", "W", "W"}, {"W", "W", "B", "W", "W"},
{"B", "W", "W", "W", "B"}}; {"B", "W", "W", "W", "B"}};
String path = "C:/Users/Berat/Desktop/hitoriNew/src/main/java/de/hs_mannheim/informatik/mvn/Hitori_Spielfelder/Hitori5x5_leicht.csv"; String path = "src/main/java/de/hs_mannheim/informatik/mvn/resources/Hitori_Spielfelder/Hitori5x5leicht.csv";
try { try {
assertTrue(HitoriMain2.abgabeMöglich(path, data, colors)); assertTrue(HitoriMain2.abgabeMöglich(path, data, colors));
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {

0
PR2Projekt/src/test/java/java/de/hs_mannheim/informatik/mvn/test/resources/log4j2.xml → PR2Projekt/src/test/java/de/hs_mannheim/informatik/mvn/test/log4j2.xml
View File