Improving tests

Author: jabrena

examples/spring-boot-demo/implementation/pom.xml

@@ -8,8 +8,8 @@
 		<version>3.5.2</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>com.example</groupId>
-	<artifactId>demo</artifactId>
+	<groupId>info.jab.ms</groupId>
+	<artifactId>sakila-api</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<properties>
 		<java.version>24</java.version>

examples/spring-boot-demo/implementation/src/main/java/info/jab/ms/controller/GlobalExceptionHandler.java

@@ -51,7 +51,11 @@ public ResponseEntity<ProblemDetail> handleRuntimeException(
         );
 
         problemDetail.setTitle("Internal Server Error");
-        problemDetail.setInstance(URI.create(request.getRequestURI()));
+
+        // Handle null request URI gracefully
+        String requestUri = request.getRequestURI();
+        problemDetail.setInstance(URI.create(requestUri != null ? requestUri : "/unknown"));
+
         problemDetail.setProperty("timestamp", Instant.now());
         problemDetail.setProperty("errorId", errorId);
 
@@ -75,7 +79,11 @@ public ResponseEntity<ProblemDetail> handleGenericException(
         );
 
         problemDetail.setTitle("Internal Server Error");
-        problemDetail.setInstance(URI.create(request.getRequestURI()));
+
+        // Handle null request URI gracefully
+        String requestUri = request.getRequestURI();
+        problemDetail.setInstance(URI.create(requestUri != null ? requestUri : "/unknown"));
+
         problemDetail.setProperty("timestamp", Instant.now());
         problemDetail.setProperty("errorId", errorId);
 

examples/spring-boot-demo/implementation/src/main/java/info/jab/ms/repository/FilmRepository.java

@@ -18,6 +18,7 @@
 @Repository
 public interface FilmRepository extends ListCrudRepository<Film, Integer> {
 
+    //TDDO: Remove collate
     /**
      * Task 8.4: Implement findByTitleStartingWith(String prefix) method
      *
@@ -27,14 +28,15 @@ public interface FilmRepository extends ListCrudRepository<Film, Integer> {
      * @param prefix The starting letters to search for (case-insensitive)
      * @return List of films with titles starting with the prefix
      */
-    @Query("SELECT film_id, title FROM film WHERE UPPER(title) LIKE UPPER(:prefix || '%') ORDER BY title")
+    @Query("SELECT film_id, title FROM film WHERE UPPER(title) LIKE UPPER(:prefix || '%') ORDER BY title COLLATE \"C\"")
     List<Film> findByTitleStartingWith(@Param("prefix") String prefix);
 
+    //TDDO: Remove collate
     /**
      * Alternative method to find all films (for when no filter is applied)
      *
      * @return List of all films ordered by title
      */
-    @Query("SELECT film_id, title FROM film ORDER BY title")
+    @Query("SELECT film_id, title FROM film ORDER BY title COLLATE \"C\"")
     List<Film> findAllOrderByTitle();
 }

examples/spring-boot-demo/implementation/src/test/java/info/jab/ms/MainApplicationTests.java

@@ -1,17 +1,27 @@
 package info.jab.ms;
 
 import info.jab.ms.common.PostgreSQLTestBase;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 /**
- * Basic integration tests for the Demo Application.
+ * Integration tests for the Demo Application.
+ *
+ * Following Java Unit Testing Guidelines:
+ * - Given-When-Then structure
+ * - Descriptive test names using should_ExpectedBehavior_when_StateUnderTest pattern
+ * - AssertJ for fluent assertions
+ * - Clear test documentation
  *
  * This class extends PostgreSQLTestBase to inherit the common TestContainer setup
  * with Sakila schema and test data. It provides basic smoke tests to verify
  * the Spring Boot application context loads correctly with the database.
  */
 @SpringBootTest
+@DisplayName("Main Application Integration Tests")
 class MainApplicationTests extends PostgreSQLTestBase {
 
     /**
@@ -22,19 +32,77 @@ class MainApplicationTests extends PostgreSQLTestBase {
      * - Spring Boot application context loads without errors
      * - Database connection is established via @ServiceConnection
      * - All auto-configuration works properly
+     * - TestContainer infrastructure is working correctly
      */
     @Test
-    void contextLoads() {
-        // This test will load the Spring context with the TestContainer database
-        // The @ServiceConnection annotation in the base class automatically configures
-        // the database connection properties, so no manual configuration is needed
+    @DisplayName("Should load Spring context successfully with TestContainer database")
+    void should_loadSpringContextSuccessfully_when_testContainerDatabaseIsAvailable() {
+        // Given - TestContainer PostgreSQL is started and Spring context is loaded
+
+        // When - We check the container status and connectivity
+        var container = getPostgresContainer();
+
+        // Then - Container should be running and properly configured
+        assertThat(container.isRunning())
+            .as("PostgreSQL container should be running")
+            .isTrue();
 
-        // Verify the container is running (inherited from base class)
-        assert getPostgresContainer().isRunning() : "PostgreSQL container should be running";
-        assert getPostgresContainer().getDatabaseName().equals("testdb") : "Database should be testdb";
+        assertThat(container.getDatabaseName())
+            .as("Database name should match test configuration")
+            .isEqualTo("testdb");
+
+        assertThat(container.getUsername())
+            .as("Username should match test configuration")
+            .isEqualTo("testuser");
+
+        // And - Connection properties should be valid
+        assertThat(container.getJdbcUrl())
+            .as("JDBC URL should be properly formatted")
+            .isNotBlank()
+            .startsWith("jdbc:postgresql://")
+            .contains("testdb");
+
+        // And - Container should have a valid ID indicating it's running
+        assertThat(container.getContainerId())
+            .as("Container should have valid ID")
+            .isNotBlank();
 
         // Context loading success implies database connectivity is working
-        System.out.println("Spring Boot context loaded successfully with TestContainer database");
-        System.out.println("Database URL: " + getPostgresContainer().getJdbcUrl());
+        // The @ServiceConnection annotation automatically configures the database connection
+        System.out.println("✅ Spring Boot context loaded successfully with TestContainer database");
+        System.out.println("📊 Database URL: " + container.getJdbcUrl());
+        System.out.println("🐘 PostgreSQL Container ID: " + container.getContainerId());
+    }
+
+    @Test
+    @DisplayName("Should have database connectivity working correctly")
+    void should_haveDatabaseConnectivityWorking_when_applicationStarts() {
+        // Given - Application context is loaded with TestContainer
+
+        // When - We verify basic database connectivity indicators
+        var container = getPostgresContainer();
+
+        // Then - Database should be accessible
+        assertThat(container.isCreated())
+            .as("Container should be created")
+            .isTrue();
+
+        assertThat(container.isRunning())
+            .as("Container should be running and accessible")
+            .isTrue();
+
+        // And - Standard PostgreSQL port should be mapped
+        assertThat(container.getMappedPort(5432))
+            .as("PostgreSQL port should be mapped")
+            .isPositive();
+
+        // And - Container logs should not contain critical errors
+        String logs = container.getLogs();
+        assertThat(logs)
+            .as("Container logs should indicate successful startup")
+            .contains("database system is ready to accept connections");
+
+        System.out.println("✅ Database connectivity verified");
+        System.out.println("🔌 Mapped PostgreSQL port: " + container.getMappedPort(5432));
     }
 }