[JAVA-44239] Fixed BookRepositoryLiveTest

Author: panos-kakos

persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/BookRepositoryLiveTest.java

@@ -1,9 +1,12 @@
 package com.baeldung.spring.data.cassandra.repository;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import java.util.NoSuchElementException;
 
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,6 +36,11 @@ class BookRepositoryLiveTest {
     @Autowired
     private BookRepository bookRepository;
 
+    @AfterEach
+    void cleanUpDatabase() {
+        bookRepository.deleteAll();
+    }
+
     @BeforeAll
     static void setupCassandraConnectionProperties() {
         System.setProperty("spring.cassandra.keyspace-name", KEYSPACE_NAME);
@@ -80,15 +88,15 @@ void whenUpdatingBooks_thenAvailableOnRetrieval() {
             .getTitle());
     }
 
-    // @Test(expected = java.util.NoSuchElementException.class)
+    @Test
     void whenDeletingExistingBooks_thenNotAvailableOnRetrieval() {
         final Book javaBook = new Book(UUIDs.timeBased(), "Head First Java", "O'Reilly Media", ImmutableSet.of("Computer", "Software"));
         bookRepository.save(javaBook);
         bookRepository.delete(javaBook);
         final Iterable<Book> books = bookRepository.findByTitleAndPublisher("Head First Java", "O'Reilly Media");
-        assertNotEquals(javaBook.getId(), books.iterator()
-            .next()
-            .getId());
+        assertThrows(NoSuchElementException.class, () -> {
+            books.iterator().next();
+        });
     }
 
     @Test

persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CassandraTemplateLiveTest.java

@@ -1,6 +1,5 @@
 package com.baeldung.spring.data.cassandra.repository;
 
-import com.baeldung.spring.data.cassandra.config.CassandraConfig;
 import com.baeldung.spring.data.cassandra.model.Book;
 import com.datastax.oss.driver.api.core.CqlSession;
 import com.datastax.oss.driver.api.core.cql.SimpleStatement;
@@ -35,7 +34,6 @@
 
 @Testcontainers
 @SpringBootTest
-@ContextConfiguration(classes = CassandraConfig.class)
 public class CassandraTemplateLiveTest {
 
     private static final String DATA_TABLE_NAME = "book";

persistence-modules/spring-data-cassandra/src/test/java/com/baeldung/spring/data/cassandra/repository/CqlQueriesLiveTest.java

@@ -1,6 +1,5 @@
 package com.baeldung.spring.data.cassandra.repository;
 
-import com.baeldung.spring.data.cassandra.config.CassandraConfig;
 import com.baeldung.spring.data.cassandra.model.Book;
 import com.datastax.driver.core.querybuilder.Insert;
 import com.datastax.driver.core.querybuilder.QueryBuilder;
@@ -23,7 +22,6 @@
 import org.springframework.data.cassandra.core.cql.CqlIdentifier;
 import org.springframework.data.cassandra.core.CassandraAdminOperations;
 import org.springframework.data.cassandra.core.CassandraOperations;
-import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.testcontainers.containers.CassandraContainer;
 import org.testcontainers.utility.DockerImageName;
@@ -40,7 +38,6 @@
  * Live test for Cassandra testing.
  */
 @RunWith(SpringJUnit4ClassRunner.class)
-@ContextConfiguration(classes = CassandraConfig.class)
 public class CqlQueriesLiveTest {
     private static final Logger LOG = LoggerFactory.getLogger(CqlQueriesLiveTest.class);
     private static final String KEYSPACE_CREATION_QUERY =