Fix/startup fix

nbproject/project.properties

@@ -89,7 +89,10 @@ javac.source=1.8
 javac.target=1.8
 javac.test.classpath=\
     ${javac.classpath}:\
-    ${build.classes.dir}
+    ${build.classes.dir}:\
+    libs/test/junit-4.13.2.jar:\
+    libs/test/hamcrest-core-1.3.jar:\
+    libs/test/greenmail-standalone-1.6.15.jar
 javac.test.modulepath=\
     ${javac.modulepath}
 javac.test.processorpath=\

run_tests.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+mkdir -p build/test/stubs
+mkdir -p build/test/classes
+
+javac -d build/test/stubs test/stubs/library/assistant/database/DatabaseHandler.java test/stubs/library/assistant/ui/listmember/MemberListController.java
+
+javac -sourcepath "" -cp "libs/*:libs/test/*:build/test/stubs" -d build/test/classes \
+src/library/assistant/data/model/Book.java \
+src/library/assistant/data/model/MailServerInfo.java \
+src/library/assistant/database/DataHelper.java \
+test/library/assistant/database/DataHelperTest.java
+
+java -cp "build/test/classes:build/test/stubs:libs/*:libs/test/*" org.junit.runner.JUnitCore library.assistant.database.DataHelperTest

src/library/assistant/alert/AlertMaker.java

@@ -47,36 +47,7 @@ public static void showErrorMessage(String title, String content) {
     }
 
     public static void showErrorMessage(Exception ex) {
-        Alert alert = new Alert(AlertType.ERROR);
-        alert.setTitle("Error occured");
-        alert.setHeaderText("Error Occured");
-        alert.setContentText(ex.getLocalizedMessage());
-
-        StringWriter sw = new StringWriter();
-        PrintWriter pw = new PrintWriter(sw);
-        ex.printStackTrace(pw);
-        String exceptionText = sw.toString();
-
-        Label label = new Label("The exception stacktrace was:");
-
-        TextArea textArea = new TextArea(exceptionText);
-        textArea.setEditable(false);
-        textArea.setWrapText(true);
-
-        textArea.setMaxWidth(Double.MAX_VALUE);
-        textArea.setMaxHeight(Double.MAX_VALUE);
-        GridPane.setVgrow(textArea, Priority.ALWAYS);
-        GridPane.setHgrow(textArea, Priority.ALWAYS);
-
-        GridPane expContent = new GridPane();
-        expContent.setMaxWidth(Double.MAX_VALUE);
-        expContent.add(label, 0, 0);
-        expContent.add(textArea, 0, 1);
-
-        alert.getDialogPane().setExpandableContent(expContent);
-
-        styleAlert(alert);
-        alert.showAndWait();
+        showErrorMessage(ex, "Error Occured", ex.getLocalizedMessage());
     }
 
     public static void showErrorMessage(Exception ex, String title, String content) {
@@ -107,6 +78,7 @@ public static void showErrorMessage(Exception ex, String title, String content)
         expContent.add(textArea, 0, 1);
 
         alert.getDialogPane().setExpandableContent(expContent);
+        styleAlert(alert);
         alert.showAndWait();
     }
 

src/library/assistant/database/DataHelper.java

@@ -1,5 +1,6 @@
 package library.assistant.database;
 
+import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -20,8 +21,12 @@ public class DataHelper {
     private final static Logger LOGGER = LogManager.getLogger(DatabaseHandler.class.getName());
 
     public static boolean insertNewBook(Book book) {
+        return insertNewBook(book, DatabaseHandler.getInstance().getConnection());
+    }
+
+    public static boolean insertNewBook(Book book, Connection conn) {
         try {
-            PreparedStatement statement = DatabaseHandler.getInstance().getConnection().prepareStatement(
+            PreparedStatement statement = conn.prepareStatement(
                     "INSERT INTO BOOK(id,title,author,publisher,isAvail) VALUES(?,?,?,?,?)");
             statement.setString(1, book.getId());
             statement.setString(2, book.getTitle());

src/library/assistant/encryption/EncryptionUtil.java

@@ -5,11 +5,8 @@
 import java.io.FileOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
-import java.util.Arrays;
-import java.util.Random;
+import java.security.SecureRandom;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 import javax.crypto.Cipher;
@@ -117,11 +114,10 @@ private static byte[] generateSecureKey() throws NoSuchAlgorithmException {
         return data;
     }
 
-    private static byte[] prepareIV() throws NoSuchAlgorithmException {
-        MessageDigest digest = MessageDigest.getInstance("SHA-512");
-        String randomVal = String.valueOf(new Random(System.currentTimeMillis()).nextLong());
-        byte[] hash = digest.digest(randomVal.getBytes(StandardCharsets.UTF_8));
-        return Arrays.copyOfRange(hash, 0, 16);
+    private static byte[] prepareIV() {
+        byte[] iv = new byte[16];
+        new SecureRandom().nextBytes(iv);
+        return iv;
     }
 
     private static void writeKey(CipherSpec spec) throws Exception {

src/library/assistant/ui/addmember/MemberAddLoader.java

@@ -6,7 +6,6 @@
 package library.assistant.ui.addmember;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -25,8 +24,4 @@ public void start(Stage stage) throws Exception {
         stage.show();
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
 }

src/library/assistant/ui/issuedlist/IssuedListLoader.java

@@ -2,7 +2,6 @@
 
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -21,8 +20,4 @@ public void start(Stage stage) throws Exception {
         stage.show();
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
 }

src/library/assistant/ui/listbook/BookListLoader.java

@@ -2,7 +2,6 @@
 
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -21,8 +20,4 @@ public void start(Stage stage) throws Exception {
         stage.show();
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
 }

src/library/assistant/ui/listmember/MemberListLoader.java

@@ -2,7 +2,6 @@
 package library.assistant.ui.listmember;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -21,8 +20,4 @@ public void start(Stage stage) throws Exception {
         stage.show();
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
 }

src/library/assistant/ui/main/main.fxml

@@ -42,6 +42,7 @@
                                                    <children>
                                                       <FontAwesomeIconView glyphName="BOOK" size="30" />
                                                       <JFXTextField fx:id="bookIDInput" labelFloat="true" onAction="#loadBookInfo" prefHeight="26.0" prefWidth="230.0" promptText="Book ID" />
+                                                      <JFXTextField fx:id="bookNameInput" labelFloat="true" onAction="#loadBookInfoByName" prefHeight="26.0" prefWidth="230.0" promptText="Book Name (Optional)" />
                                                    </children>
                                                 </VBox>
                                                 <StackPane fx:id="bookInfoContainer">
@@ -84,6 +85,7 @@
                                                    <children>
                                                       <FontAwesomeIconView glyphName="USER" size="30" />
                                                       <JFXTextField fx:id="memberIDInput" labelFloat="true" onAction="#loadMemberInfo" prefWidth="230.0" promptText="Member ID" />
+                                                      <JFXTextField fx:id="memberNameInput" labelFloat="true" onAction="#loadMemberInfoByName" prefWidth="230.0" promptText="Member Name (Optional)" />
                                                    </children>
                                                 </VBox>
                                                 <StackPane fx:id="memberInfoContainer">
@@ -216,7 +218,6 @@
                         </Tab>
                      </tabs>
                   </JFXTabPane>
-                  <JFXHamburger fx:id="hamburger" styleClass="jfx-hamburger-icon" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="75.0" />
                </children>
             </AnchorPane>
             <MenuBar AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
@@ -243,7 +244,7 @@
                   </Menu>
                   <Menu mnemonicParsing="false" text="Notify">
                      <items>
-                        <MenuItem mnemonicParsing="false" onAction="#handleMenuOverdueNotification" text="Overdue Notification" />
+                        <MenuItem fx:id="notifyMenuItem" mnemonicParsing="false" onAction="#handleMenuOverdueNotification" text="Overdue Notification" />
                      </items>
                   </Menu>
                 <Menu mnemonicParsing="false" text="Help">
@@ -253,6 +254,7 @@
                 </Menu>
               </menus>
             </MenuBar>
+            <JFXHamburger fx:id="hamburger" styleClass="jfx-hamburger-icon" AnchorPane.rightAnchor="20.0" AnchorPane.topAnchor="75.0" />
          </children>
       </AnchorPane>
    </children>

src/library/assistant/ui/notifoverdue/OverdueNotificationLoader.java

@@ -1,7 +1,6 @@
 package library.assistant.ui.notifoverdue;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -19,8 +18,4 @@ public void start(Stage stage) throws Exception {
         stage.show();
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
 }

src/library/assistant/ui/settings/SettingsLoader.java

@@ -1,7 +1,6 @@
 package library.assistant.ui.settings;
 
 import javafx.application.Application;
-import static javafx.application.Application.launch;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
@@ -25,8 +24,4 @@ public void start(Stage stage) throws Exception {
         }).start();
     }
 
-    public static void main(String[] args) {
-        launch(args);
-    }
-
 }

src/library/assistant/util/LibraryAssistantUtil.java

@@ -33,6 +33,8 @@ public class LibraryAssistantUtil {
     public static final String MAIL_CONTENT_LOC = "/resources/mail_content.html";
     private static final SimpleDateFormat DATE_TIME_FORMAT = new SimpleDateFormat("dd-MM-yyyy hh:mm:ss a");
     private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("dd-MM-yyyy");
+    private static final Pattern EMAIL_PATTERN = Pattern.compile("^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
+            + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$");
 
     public static void setStageIcon(Stage stage) {
         stage.getIcons().add(new Image(ICON_IMAGE_LOC));
@@ -106,10 +108,7 @@ public static String getDateString(Date date) {
     }
 
     public static boolean validateEmailAddress(String emailID) {
-        String regex = "^[_A-Za-z0-9-\\+]+(\\.[_A-Za-z0-9-]+)*@"
-                + "[A-Za-z0-9-]+(\\.[A-Za-z0-9]+)*(\\.[A-Za-z]{2,})$";
-        Pattern pattern = Pattern.compile(regex);
-        return pattern.matcher(emailID).matches();
+        return EMAIL_PATTERN.matcher(emailID).matches();
     }
 
     public static void openFileWithDesktop(File file) {

test/library/assistant/database/DataHelperTest.java

@@ -0,0 +1,67 @@
+package library.assistant.database;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.SQLException;
+import library.assistant.data.model.Book;
+import org.junit.Test;
+import static org.junit.Assert.*;
+import static org.mockito.Mockito.*;
+
+public class DataHelperTest {
+
+    @Test
+    public void testInsertNewBook() throws SQLException {
+        // Arrange
+        Connection mockConn = mock(Connection.class);
+        PreparedStatement mockStmt = mock(PreparedStatement.class);
+        Book book = new Book("B100", "Test Title", "Test Author", "Test Publisher", true);
+
+        when(mockConn.prepareStatement(anyString())).thenReturn(mockStmt);
+        when(mockStmt.executeUpdate()).thenReturn(1);
+
+        // Act
+        boolean result = DataHelper.insertNewBook(book, mockConn);
+
+        // Assert
+        assertTrue(result);
+        verify(mockStmt).setString(1, "B100");
+        verify(mockStmt).setString(2, "Test Title");
+        verify(mockStmt).setString(3, "Test Author");
+        verify(mockStmt).setString(4, "Test Publisher");
+        verify(mockStmt).setBoolean(5, true);
+        verify(mockStmt).executeUpdate();
+    }
+
+    @Test
+    public void testInsertNewBookFailure() throws SQLException {
+        // Arrange
+        Connection mockConn = mock(Connection.class);
+        PreparedStatement mockStmt = mock(PreparedStatement.class);
+        Book book = new Book("B100", "Test Title", "Test Author", "Test Publisher", true);
+
+        when(mockConn.prepareStatement(anyString())).thenReturn(mockStmt);
+        when(mockStmt.executeUpdate()).thenReturn(0);
+
+        // Act
+        boolean result = DataHelper.insertNewBook(book, mockConn);
+
+        // Assert
+        assertFalse(result);
+    }
+
+    @Test
+    public void testInsertNewBookException() throws SQLException {
+         // Arrange
+        Connection mockConn = mock(Connection.class);
+        Book book = new Book("B100", "Test Title", "Test Author", "Test Publisher", true);
+
+        when(mockConn.prepareStatement(anyString())).thenThrow(new SQLException("DB Error"));
+
+        // Act
+        boolean result = DataHelper.insertNewBook(book, mockConn);
+
+        // Assert
+        assertFalse(result);
+    }
+}