diff --git a/ProjectDiary.md b/ProjectDiary.md deleted file mode 100644 index 6b0f4ff..0000000 --- a/ProjectDiary.md +++ /dev/null @@ -1,8 +0,0 @@ -Projektstart ---------------- -### 1. Meeting und Repository aufstellen - Meeting im bib - Besprechung des Projektablaufs - Projektentwurf gestalten durch "Stories" - Einblick in Java - Einrichtung von JetBrain diff --git a/README.md b/README.md deleted file mode 100644 index 1fabc5a..0000000 --- a/README.md +++ /dev/null @@ -1,92 +0,0 @@ -# Sudoku_Team_Deepthought - - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin https://gitlab2.informatik.hs-fulda.de/fdai7460/sudoku_team_deepthought.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](https://gitlab2.informatik.hs-fulda.de/fdai7460/sudoku_team_deepthought/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Automatically merge when pipeline succeeds](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing(SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thank you to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. diff --git a/build-project.sh b/build-project.sh new file mode 100755 index 0000000..61ee8a8 --- /dev/null +++ b/build-project.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +mvn compile test diff --git a/pom.xml b/pom.xml index 2d6f2b7..7165069 100644 --- a/pom.xml +++ b/pom.xml @@ -2,24 +2,44 @@ - 4.0.0 + 4.0.0 - groupId + de.sudoku.dt sudoku_team_deepthought - 1.0-SNAPSHOT + 0.2-SNAPSHOT + + jar 8 8 UTF-8 + + + + + org.apache.maven.plugins + maven-surefire-plugin + 2.12.4 + + + + + + + com.googlecode.json-simple + json-simple + 1.1 + + org.junit.jupiter - junit-jupiter-api - 5.9.1 - test + junit-jupiter-engine + 5.9.2 + \ No newline at end of file diff --git a/src/main/java/src/Main.java b/src/main/java/src/Main.java index b595f61..1666d93 100644 --- a/src/main/java/src/Main.java +++ b/src/main/java/src/Main.java @@ -1,22 +1,9 @@ package src; -import javax.swing.*; -import java.awt.*; import java.lang.String; public class Main { -// private static JPanel[][] gameField; -// private static JLabel[][] labelField; -// -// public static JPanel[][] getGameField() { -// return gameField; -// } -// -// public static JLabel[][] getLabelField() { -// return labelField; -// } - public static void main(String[] args) { java.awt.EventQueue.invokeLater(new Runnable() { @@ -29,90 +16,4 @@ public class Main { } }); } - - -// protected static JPanel setupGameField(int widthHeight) { -// -// int nrOfFields = 9; -// int border = 1; -// int size = widthHeight/nrOfFields - (nrOfFields*border)/nrOfFields; -// -// JPanel fieldRoot = new JPanel(); -// fieldRoot.setVisible(true); -// fieldRoot.setLayout(null); -// -// gameField = new JPanel[nrOfFields][]; -// labelField = new JLabel[nrOfFields][]; -// -// int gapi = 0, gapj = 0; -// -// for (int i = 0; i < nrOfFields; i++) { -// -// gameField[i] = new JPanel[nrOfFields]; -// labelField[i] = new JLabel[nrOfFields]; -// -// for (int j = 0; j < nrOfFields; j++) { -// -// gameField[i][j] = new JPanel(); -// gameField[i][j].setBounds( -// j * size + border*(j+1), -// i * size + border*(i+1), -// size, size); -// gameField[i][j].setBackground(Color.BLUE); -// gameField[i][j].setVisible(true); -// fieldRoot.add(gameField[i][j]); -// -// labelField[i][j] = new JLabel("", SwingConstants.CENTER); -// labelField[i][j].setBackground(Color.GREEN); -// labelField[i][j].setForeground(Color.MAGENTA); -// labelField[i][j].setFont(new Font("Times new Roman", Font.BOLD, 25)); -// -// labelField[i][j].setBackground(Color.CYAN); -// labelField[i][j].setText("0"); -// -// gameField[i][j].add(labelField[i][j]); -// -// } -// } -// -// return fieldRoot; -// } -} - -// JFrame jFrame = new JFrame(); -// jFrame.setVisible(true); -// jFrame.setBounds(300, 300, 500, 500); -// -// JPanel yPanel = new JPanel(); -// yPanel.setLayout(new BoxLayout(yPanel, BoxLayout.Y_AXIS)); -// yPanel.setBorder(new EmptyBorder(1, 0, 1,0)); -// -// JButton jButton1 = new JButton(); -// jButton1.setText("Test Button 1"); -// -// yPanel.add(jButton1); -// -// JButton jButton2 = new JButton(); -// jButton2.setText("Test Button 2"); -// yPanel.add(jButton2); -// -// for (int i = 0; i < 9; i++) { -// -// JPanel xPanel = new JPanel(); -// xPanel.setLayout(new BoxLayout(xPanel, BoxLayout.X_AXIS)); -// xPanel.setBorder(new EmptyBorder(0, 1, 0,1)); -// -// for (int j = 0; j < 9; j++) { -// -// JTextField jTextField = new JTextField(); -// jTextField.setColumns(1); -// jTextField.setBounds(0, 0, 10, 10); -// -// xPanel.add(jTextField); -// -// } -// -// yPanel.add(xPanel); -// } -// -// jFrame.setContentPane(yPanel); +} \ No newline at end of file diff --git a/src/main/java/src/MainFrame.java b/src/main/java/src/MainFrame.java index 332c4f5..794adb6 100644 --- a/src/main/java/src/MainFrame.java +++ b/src/main/java/src/MainFrame.java @@ -1,13 +1,9 @@ package src; -import org.junit.Test; - import javax.swing.*; import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; public class MainFrame extends JFrame { diff --git a/src/test/java/GameFieldTest.java b/src/test/java/GameFieldTest.java index e377591..65cec8d 100644 --- a/src/test/java/GameFieldTest.java +++ b/src/test/java/GameFieldTest.java @@ -1,13 +1,15 @@ -import org.junit.jupiter.api.Test; + import src.GameField; import src.Notes; +import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; -class GameFieldTest { + +public class GameFieldTest { @Test - void setValue() { + public void test_setValue() { GameField gameField = new GameField(360); @@ -34,7 +36,7 @@ class GameFieldTest { } @Test - void getValue() { + public void test_getValueTest() { GameField gameField = new GameField(360); @@ -61,7 +63,7 @@ class GameFieldTest { } @Test - void setHint() { + public void test_setHintTest() { GameField gameField = new GameField(360); @@ -92,7 +94,7 @@ class GameFieldTest { } @Test - void unsetHint() { + public void test_unsetHintTest() { GameField gameField = new GameField(360); @@ -127,7 +129,7 @@ class GameFieldTest { } @Test - void unsetAllHintsFromField() { + public void test_unsetAllHintsFromFieldTest() { GameField gameField = new GameField(360); diff --git a/src/test/java/MainFrameTest.java b/src/test/java/MainFrameTest.java new file mode 100644 index 0000000..293787a --- /dev/null +++ b/src/test/java/MainFrameTest.java @@ -0,0 +1,7 @@ +import org.junit.jupiter.api.*; +import static org.junit.jupiter.api.Assertions.*; + +public class MainFrameTest { + + +} \ No newline at end of file diff --git a/src/test/java/MainTest.java b/src/test/java/MainTest.java index 40290b8..9fd2fb4 100644 --- a/src/test/java/MainTest.java +++ b/src/test/java/MainTest.java @@ -1,12 +1,13 @@ + import src.GameField; -import src.Main; +import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; -class MainTest extends Main { +public class MainTest { - @org.junit.jupiter.api.Test - void testField() { + @Test + public void testFieldTest() { GameField gameField = new GameField(360); @@ -31,8 +32,8 @@ class MainTest extends Main { } - @org.junit.jupiter.api.Test - void testBla() { + @Test + public void testBlaTest() { assertTrue(true); } } \ No newline at end of file diff --git a/src/test/java/NotesTest.java b/src/test/java/NotesTest.java index 18a4e27..2f9be11 100644 --- a/src/test/java/NotesTest.java +++ b/src/test/java/NotesTest.java @@ -1,14 +1,14 @@ -import org.junit.jupiter.api.Test; import src.Notes; import javax.swing.*; +import org.junit.jupiter.api.*; import static org.junit.jupiter.api.Assertions.*; -class NotesTest { +public class NotesTest { @Test - void setHint() { + public void setHintTest() { Notes notes = new Notes(50); @@ -31,7 +31,7 @@ class NotesTest { } @Test - void isSet() { + public void isSetTest() { Notes notes = new Notes(50); @@ -52,7 +52,7 @@ class NotesTest { } @Test - void unsetHint() { + public void unsetHintTest() { Notes notes = new Notes(50); diff --git a/src/test/java/src/MainFrameTest.java b/src/test/java/src/MainFrameTest.java deleted file mode 100644 index 91aa24a..0000000 --- a/src/test/java/src/MainFrameTest.java +++ /dev/null @@ -1,10 +0,0 @@ -package src; - -import org.junit.jupiter.api.Test; - -import static org.junit.jupiter.api.Assertions.*; - -class MainFrameTest { - - -} \ No newline at end of file diff --git a/team.md b/team.md new file mode 100644 index 0000000..b6e1a4a --- /dev/null +++ b/team.md @@ -0,0 +1,2 @@ +- Jan Freirich, fdai6499 +- jan-andre.freirich@informatik.hs-fulda.de \ No newline at end of file