High score feature has been added

.travis.yml

@@ -1,3 +1,3 @@
 language: java
 jdk:
-  - oraclejdk8
+  - oraclejdk14

README.md

@@ -12,12 +12,26 @@
 
 ![alt tag](img/screenshot_gameover.png)
 
+![alt tag](img/screenshot_name_input.png)
+
+![alt tag](img/screenshot_score_table.png)
+
 ## How to build it ?
 
 You will need a Java JDK 8+ and maven 3+.
 
 Execute **mvn clean package assembly:single** to build the release package.
 
+# How to run it ?
+```
+mvn clean
+
+mvn package
+
+mvn exec:java
+
+```
+
 ## How to play ?
 
 - SPACE - Start a new game
@@ -34,6 +48,8 @@ Execute **mvn clean package assembly:single** to build the release package.
 
 - P - Pause the current game
 
+- H - Show the high scores
+
 - M - Mute sound
 
 - PAGE UP - Increase the volume

pom.xml

@@ -111,6 +111,14 @@
                     <tagNameFormat>@{project.version}</tagNameFormat>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <configuration>
+                    <mainClass>spypunk.tetris.Main</mainClass>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -146,5 +154,11 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.6</version>
         </dependency>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.4.2</version>
+        </dependency>
+
     </dependencies>
 </project>

src/main/java/spypunk/tetris/service/TetrisService.java

@@ -23,4 +23,9 @@ public interface TetrisService {
     void pause();
 
     void mute();
+
+    void showScores();
+
+    void takeName();
+
 }

src/main/java/spypunk/tetris/service/TetrisServiceImpl.java

@@ -33,6 +33,8 @@
 import spypunk.tetris.model.ShapeType;
 import spypunk.tetris.model.Tetris;
 import spypunk.tetris.model.Tetris.State;
+import spypunk.tetris.ui.view.TetrisNameInputView;
+import spypunk.tetris.ui.view.TetrisScoresView;
 import spypunk.tetris.model.TetrisEvent;
 import spypunk.tetris.model.TetrisInstance;
 
@@ -79,7 +81,7 @@ public void update() {
     public void pause() {
         tetris.setState(tetris.getState().onPause());
     }
-
+    
     @Override
     public void move(final Movement movement) {
         if (isMovementAllowed()) {
@@ -332,4 +334,33 @@ private int getLevelSpeed(final int level) {
     private boolean isMovementAllowed() {
         return isTetrisRunning() && !isCurrentShapeLocked();
     }
+
+    TetrisScoresView tetrisScoresView=new TetrisScoresView();
+    @Override
+    public void showScores() {
+        if(tetris.getState().equals(State.RUNNING)){
+            tetris.setState(tetris.getState().onPause());
+        }
+        if(tetrisNameInputView.isAdded==false && !tetrisNameInputView.getName().equals("")){
+            String name=tetrisNameInputView.getName();
+            Integer score=tetris.getScore();
+            tetrisScoresView.putScoreAndName(name, score);
+            tetrisNameInputView.isAdded=true;
+        }
+        tetrisScoresView.show();  
+    }
+
+    TetrisNameInputView tetrisNameInputView=new TetrisNameInputView();
+    @Override
+    public void takeName() {
+        if(tetrisScoresView.isFull()){
+            if(tetris.getScore()>tetrisScoresView.getMinScore()){
+                tetrisNameInputView.show(tetris.getScore());
+            }
+        }
+        else{
+            tetrisNameInputView.show(tetris.getScore());
+        }
+
+    }
 }

src/main/java/spypunk/tetris/ui/controller/command/cache/TetrisControllerCommandCache.java

@@ -26,7 +26,8 @@ public enum TetrisControllerCommandType {
         OPEN_PROJECT_URL,
         SHAPE_LOCKED,
         GAME_OVER,
-        ROWS_COMPLETED
+        ROWS_COMPLETED,
+        SHOW_SCORES
     }
 
     TetrisControllerCommand getTetrisControllerCommand(TetrisControllerCommandType tetrisControllerCommandType);

src/main/java/spypunk/tetris/ui/controller/command/cache/TetrisControllerCommandCacheImpl.java

@@ -64,6 +64,8 @@ public TetrisControllerCommandCacheImpl(final TetrisService tetrisService,
         tetrisControllerCommands.put(TetrisControllerCommandType.SHAPE_LOCKED, createShapeLockedCommand());
         tetrisControllerCommands.put(TetrisControllerCommandType.GAME_OVER, createGameOverCommand());
         tetrisControllerCommands.put(TetrisControllerCommandType.ROWS_COMPLETED, createRowsCompletedCommand());
+        tetrisControllerCommands.put(TetrisControllerCommandType.SHOW_SCORES, createShowScoresCommand());
+
     }
 
     @Override
@@ -93,6 +95,19 @@ private TetrisControllerCommand createPauseCommand() {
             }
         };
     }
+    private TetrisControllerCommand createShowScoresCommand() {
+        return () -> {
+            tetrisService.showScores();
+
+            final State state = tetris.getState();
+
+            if (State.PAUSED.equals(state)) {
+                soundService.pauseMusic();
+            } else if (State.RUNNING.equals(state)) {
+                soundService.resumeMusic();
+            }
+        };
+    }
 
     private TetrisControllerCommand createMoveCommand(final Movement movement) {
         return () -> tetrisService.move(movement);
@@ -114,7 +129,10 @@ private TetrisControllerCommand createMuteCommand() {
     }
 
     private TetrisControllerCommand createGameOverCommand() {
-        return () -> soundService.playMusic(Sound.GAME_OVER);
+        return () -> {
+            soundService.playMusic(Sound.GAME_OVER);
+            tetrisService.takeName();
+        };
     }
 
     private TetrisControllerCommand createRowsCompletedCommand() {

src/main/java/spypunk/tetris/ui/controller/input/TetrisControllerInputHandlerImpl.java

@@ -48,6 +48,8 @@ public TetrisControllerInputHandlerImpl(final TetrisControllerCommandCache tetri
         releasedKeyEventCommandTypes.put(KeyEvent.VK_PAGE_UP, TetrisControllerCommandType.INCREASE_VOLUME);
         releasedKeyEventCommandTypes.put(KeyEvent.VK_PAGE_DOWN, TetrisControllerCommandType.DECREASE_VOLUME);
         releasedKeyEventCommandTypes.put(KeyEvent.VK_CONTROL, TetrisControllerCommandType.HARD_DROP);
+        releasedKeyEventCommandTypes.put(KeyEvent.VK_H, TetrisControllerCommandType.SHOW_SCORES);
+
     }
 
     @Override

src/main/java/spypunk/tetris/ui/view/TetrisMainViewImpl.java

@@ -163,7 +163,6 @@ public TetrisMainViewImpl(final TetrisController tetrisController,
         frame.add(centerPanel, BorderLayout.CENTER);
         frame.add(bottomPanel, BorderLayout.SOUTH);
         frame.pack();
-
         frame.setLocationRelativeTo(null);
     }
 

src/main/java/spypunk/tetris/ui/view/TetrisNameInputView.java

@@ -0,0 +1,101 @@
+package spypunk.tetris.ui.view;
+
+import javax.swing.JFrame;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import javax.swing.JPanel;
+import javax.swing.JTextArea;
+import javax.swing.JButton;
+import javax.swing.JTextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.BorderLayout;
+import java.awt.Font;
+
+import static spypunk.tetris.ui.constants.TetrisUIConstants.DEFAULT_FONT_COLOR;
+import spypunk.tetris.ui.font.cache.FontCacheImpl;
+
+public class TetrisNameInputView{
+
+    private final JFrame frame;
+    private final Container contentPane;
+    private final JPanel firstPanel;
+    private final JButton submitButton;
+    private final JTextField textField;
+    private final JTextArea textArea;
+
+    private final FontCacheImpl fontCache;
+    private final Font font;
+
+    private String name="";
+    public boolean isAdded=false;;
+
+    public TetrisNameInputView(){
+
+        frame=new JFrame();
+        contentPane=frame.getContentPane();
+        contentPane.setBackground(Color.BLACK);
+        frame.setPreferredSize(new Dimension(400, 200));
+        frame.setLayout(new BorderLayout());
+        frame.setResizable(false);
+        frame.pack();
+        frame.setLocationRelativeTo(null);
+
+        firstPanel=new JPanel();
+        textField = new JTextField(10);
+        submitButton = new JButton("SUBMIT");
+        textArea=new JTextArea();
+
+        fontCache=new FontCacheImpl();
+        font=fontCache.getDefaultFont();
+    }
+
+    public void show(int score){
+        print(score);
+        frame.setVisible(true);
+    }
+
+    private void print(int score){
+
+        submitButton.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                name=textField.getText();
+                if(!name.equals("")){
+                    if(isAdded){
+                        isAdded=false;
+                    }
+                    frame.setVisible(false);
+                }
+            }
+        });
+
+        submitButton.setBackground(Color.BLACK);
+        submitButton.setForeground(DEFAULT_FONT_COLOR);
+        submitButton.setFont(font);
+
+        textField.setBackground(Color.BLACK);
+        textField.setForeground(DEFAULT_FONT_COLOR);
+        textField.setFont(font);
+        textField.setText("");
+
+        textArea.setBackground(Color.BLACK);
+        textArea.setForeground(DEFAULT_FONT_COLOR);
+        textArea.setFont(font);
+
+        textArea.setText("\n     YOU ARE IN TOP 5 !\n\n       SCORE : "+score+"\n\n  PLEASE ENTER YOUR NAME\n");
+        textArea.setEditable(false);
+
+        firstPanel.setBackground(Color.BLACK);
+        firstPanel.add(textField);
+        firstPanel.add(submitButton);
+
+        frame.add(firstPanel,BorderLayout.CENTER);
+        frame.add(textArea,BorderLayout.NORTH);
+    }
+    public String getName(){
+        return name;
+    }
+
+}

src/main/java/spypunk/tetris/ui/view/TetrisScoresTest.java

@@ -0,0 +1,64 @@
+package spypunk.tetris.ui.view;
+
+import static org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.BeforeEach;
+
+public class TetrisScoresTest {
+
+    private TetrisScoresView tsv;
+    @BeforeEach                                         
+    public void setUp(){
+        tsv=new TetrisScoresView();
+    }
+    @Test
+    public void testGetMin(){
+        tsv.hashMap.put("A",2);
+        tsv.hashMap.put("B",1);
+        tsv.hashMap.put("C",3);
+        assertEquals(1,tsv.getMinScore());
+    }
+    @Test
+    public void testGetMinWithEmptyList(){
+        //If list is empty then minimum score is 0.
+        assertEquals(0,tsv.getMinScore());
+    }
+    @Test
+    public void testPutScoreAndName(){
+        //When the number of elements in the list is less than 5.
+        tsv.putScoreAndName("A",5);
+        assertTrue(tsv.hashMap.containsKey("A"));
+    }
+    @Test
+    public void testPutScoreAndNameWithFullList(){
+        //We expect that when list is full, if F is added then the element 
+        // has minimum score is removed.
+        tsv.hashMap.put("A",1);
+        tsv.hashMap.put("B",2);
+        tsv.hashMap.put("C",3);
+        tsv.hashMap.put("D",4);
+        tsv.hashMap.put("E",5);
+        tsv.putScoreAndName("F",6);
+        assertTrue(tsv.hashMap.containsKey("F"));
+        assertFalse(tsv.hashMap.containsKey("A"));
+    }
+    @Test
+    public void testIsFull(){
+        //When the number of elements in the list is equal to 5.
+        tsv.hashMap.put("A",1);
+        tsv.hashMap.put("B",2);
+        tsv.hashMap.put("C",3);
+        tsv.hashMap.put("D",4);
+        tsv.hashMap.put("E",5);
+        assertTrue(tsv.isFull());
+    }
+    @Test
+    public void testRemoveMinScoreElement(){
+        tsv.hashMap.put("A",1);
+        tsv.hashMap.put("B",2);
+        tsv.hashMap.put("C",3);
+        tsv.removeMinScoreElement();
+        assertFalse(tsv.hashMap.containsKey("A"));
+    }
+
+}