Skip to content

Commit d3ad4dc

Browse files
sachin29augsachin29aug
committed
BAEL-9051: Fix failing unit tests
1 parent 2224e72 commit d3ad4dc

File tree

11 files changed

+143
-29
lines changed

11 files changed

+143
-29
lines changed

‎persistence-modules/spring-data-cassandra/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+52-1
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,67 @@
11
package org.baeldung;
22

3+
import java.io.IOException;
4+
import java.util.HashMap;
5+
6+
import org.apache.cassandra.exceptions.ConfigurationException;
7+
import org.apache.thrift.transport.TTransportException;
38
import org.baeldung.spring.data.cassandra.config.CassandraConfig;
9+
import org.baeldung.spring.data.cassandra.model.Book;
10+
import org.cassandraunit.utils.EmbeddedCassandraServerHelper;
11+
import org.junit.After;
12+
import org.junit.AfterClass;
13+
import org.junit.Before;
14+
import org.junit.BeforeClass;
415
import org.junit.Test;
516
import org.junit.runner.RunWith;
17+
import org.springframework.beans.factory.annotation.Autowired;
18+
import org.springframework.cassandra.core.cql.CqlIdentifier;
19+
import org.springframework.data.cassandra.core.CassandraAdminOperations;
620
import org.springframework.test.context.ContextConfiguration;
721
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
822

23+
import com.datastax.driver.core.Cluster;
24+
import com.datastax.driver.core.Session;
25+
926
@RunWith(SpringJUnit4ClassRunner.class)
1027
@ContextConfiguration(classes = CassandraConfig.class)
1128
public class SpringContextIntegrationTest {
1229

13-
@Test
30+
public static final String KEYSPACE_CREATION_QUERY = "CREATE KEYSPACE IF NOT EXISTS testKeySpace " + "WITH replication = { 'class': 'SimpleStrategy', 'replication_factor': '3' };";
31+
32+
public static final String KEYSPACE_ACTIVATE_QUERY = "USE testKeySpace;";
33+
34+
public static final String DATA_TABLE_NAME = "book";
35+
36+
@Autowired
37+
private CassandraAdminOperations adminTemplate;
38+
39+
@BeforeClass
40+
public static void startCassandraEmbedded() throws InterruptedException, TTransportException, ConfigurationException, IOException {
41+
EmbeddedCassandraServerHelper.startEmbeddedCassandra();
42+
final Cluster cluster = Cluster.builder().addContactPoints("127.0.0.1").withPort(9142).build();
43+
final Session session = cluster.connect();
44+
session.execute(KEYSPACE_CREATION_QUERY);
45+
session.execute(KEYSPACE_ACTIVATE_QUERY);
46+
Thread.sleep(5000);
47+
}
48+
49+
@Before
50+
public void createTable() throws InterruptedException, TTransportException, ConfigurationException, IOException {
51+
adminTemplate.createTable(true, CqlIdentifier.cqlId(DATA_TABLE_NAME), Book.class, new HashMap<String, Object>());
52+
}
53+
54+
@Test
1455
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
1556
}
57+
58+
@After
59+
public void dropTable() {
60+
adminTemplate.dropTable(CqlIdentifier.cqlId(DATA_TABLE_NAME));
61+
}
62+
63+
@AfterClass
64+
public static void stopCassandraEmbedded() {
65+
EmbeddedCassandraServerHelper.cleanEmbeddedCassandra();
66+
}
1667
}

‎persistence-modules/spring-data-gemfire/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package org.baeldung;
2+
3+
import org.junit.Test;
4+
import org.junit.runner.RunWith;
5+
import org.springframework.test.context.ContextConfiguration;
6+
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
7+
import org.springframework.test.context.support.AnnotationConfigContextLoader;
8+
9+
import com.baeldung.spring.data.gemfire.function.GemfireConfiguration;
10+
11+
@RunWith(SpringJUnit4ClassRunner.class)
12+
@ContextConfiguration(classes=GemfireConfiguration.class, loader=AnnotationConfigContextLoader.class)
13+
public class SpringContextIntegrationTest {
14+
15+
@Test
16+
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
17+
}
18+
}

‎persistence-modules/spring-data-neo4j/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
package org.baeldung;
2+
3+
import org.junit.Test;
4+
import org.junit.runner.RunWith;
5+
import org.springframework.test.context.ActiveProfiles;
6+
import org.springframework.test.context.ContextConfiguration;
7+
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
8+
9+
import com.baeldung.spring.data.neo4j.config.MovieDatabaseNeo4jTestConfiguration;
10+
11+
@RunWith(SpringJUnit4ClassRunner.class)
12+
@ContextConfiguration(classes = MovieDatabaseNeo4jTestConfiguration.class)
13+
@ActiveProfiles(profiles = "test")
14+
public class SpringContextIntegrationTest {
15+
16+
@Test
17+
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
18+
}
19+
}

‎persistence-modules/spring-data-redis/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package org.baeldung;
2+
3+
import org.junit.Test;
4+
import org.junit.runner.RunWith;
5+
import org.springframework.test.context.ContextConfiguration;
6+
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
7+
8+
import com.baeldung.spring.data.redis.config.RedisConfig;
9+
10+
@RunWith(SpringJUnit4ClassRunner.class)
11+
@ContextConfiguration(classes = RedisConfig.class)
12+
public class SpringContextIntegrationTest {
13+
14+
@Test
15+
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
16+
}
17+
}

‎spring-boot-angular-ecommerce/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
import org.springframework.boot.test.context.SpringBootTest;
66
import org.springframework.test.context.junit4.SpringRunner;
77

8-
import com.baeldung.ecommerce.EcommerceApplicationIntegrationTest;
8+
import com.baeldung.ecommerce.EcommerceApplication;
99

1010
@RunWith(SpringRunner.class)
11-
@SpringBootTest(classes = EcommerceApplicationIntegrationTest.class)
11+
@SpringBootTest(classes = EcommerceApplication.class)
1212
public class SpringContextIntegrationTest {
1313

1414
@Test

‎spring-boot-autoconfiguration/src/main/java/com/baeldung/autoconfiguration/MySQLAutoconfiguration.java

+19-7
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,27 @@
11
package com.baeldung.autoconfiguration;
22

3+
import java.util.Arrays;
4+
import java.util.Properties;
5+
6+
import javax.persistence.EntityManagerFactory;
7+
import javax.sql.DataSource;
8+
39
import org.springframework.beans.factory.annotation.Autowired;
410
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
5-
import org.springframework.boot.autoconfigure.condition.*;
11+
import org.springframework.boot.autoconfigure.condition.ConditionMessage;
612
import org.springframework.boot.autoconfigure.condition.ConditionMessage.Style;
7-
import org.springframework.context.annotation.*;
13+
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
14+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
15+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
16+
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
17+
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
18+
import org.springframework.boot.autoconfigure.condition.ConditionalOnResource;
19+
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
20+
import org.springframework.context.annotation.Bean;
21+
import org.springframework.context.annotation.ConditionContext;
22+
import org.springframework.context.annotation.Conditional;
23+
import org.springframework.context.annotation.Configuration;
24+
import org.springframework.context.annotation.PropertySource;
825
import org.springframework.core.Ordered;
926
import org.springframework.core.env.Environment;
1027
import org.springframework.core.type.AnnotatedTypeMetadata;
@@ -14,11 +31,6 @@
1431
import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter;
1532
import org.springframework.util.ClassUtils;
1633

17-
import javax.persistence.EntityManagerFactory;
18-
import javax.sql.DataSource;
19-
import java.util.Arrays;
20-
import java.util.Properties;
21-
2234
@Configuration
2335
@ConditionalOnClass(DataSource.class)
2436
@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)

‎spring-cloud-data-flow/batch-job/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
package org.baeldung;
22

3-
import org.baeldung.spring.cloud.BatchJobApplication;
3+
import org.baeldung.spring.cloud.JobConfiguration;
44
import org.junit.Test;
55
import org.junit.runner.RunWith;
66
import org.springframework.boot.test.context.SpringBootTest;
7+
import org.springframework.test.context.ContextConfiguration;
78
import org.springframework.test.context.junit4.SpringRunner;
89

910
@RunWith(SpringRunner.class)
10-
@SpringBootTest(classes = BatchJobApplication.class)
11+
@SpringBootTest
12+
@ContextConfiguration(classes = JobConfiguration.class)
1113
public class SpringContextIntegrationTest {
1214

1315
@Test

‎spring-data-jpa/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+5
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
import org.junit.Test;
44
import org.junit.runner.RunWith;
5+
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
56
import org.springframework.boot.test.context.SpringBootTest;
67
import org.springframework.test.context.junit4.SpringRunner;
78

89
import com.baeldung.Application;
10+
import com.baeldung.config.PersistenceConfiguration;
11+
import com.baeldung.config.PersistenceProductConfiguration;
12+
import com.baeldung.config.PersistenceUserConfiguration;
913

1014
@RunWith(SpringRunner.class)
15+
@DataJpaTest(excludeAutoConfiguration = {PersistenceConfiguration.class, PersistenceUserConfiguration.class, PersistenceProductConfiguration.class})
1116
@SpringBootTest(classes = Application.class)
1217
public class SpringContextIntegrationTest {
1318

‎spring-mvc-xml/src/main/java/com/baeldung/spring/ClientWebConfig.java

+2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.baeldung.spring;
22

3+
import org.springframework.context.annotation.ComponentScan;
34
import org.springframework.context.annotation.Configuration;
45
import org.springframework.context.annotation.ImportResource;
56
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
67

78
@ImportResource("classpath:webMvcConfig.xml")
89
@Configuration
10+
@ComponentScan
911
public class ClientWebConfig implements WebMvcConfigurer {
1012

1113
public ClientWebConfig() {

‎spring-security-mvc-login/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+4-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,16 @@
11
package org.baeldung;
22

3-
import org.baeldung.spring.ChannelSecSecurityConfig;
4-
import org.baeldung.spring.MvcConfig;
5-
import org.baeldung.spring.RedirectionSecurityConfig;
6-
import org.baeldung.spring.SecSecurityConfig;
73
import org.junit.Test;
84
import org.junit.runner.RunWith;
95
import org.springframework.test.context.ContextConfiguration;
106
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
117
import org.springframework.test.context.web.WebAppConfiguration;
128

139
@RunWith(SpringJUnit4ClassRunner.class)
14-
@ContextConfiguration(classes = { MvcConfig.class, ChannelSecSecurityConfig.class, RedirectionSecurityConfig.class,
15-
SecSecurityConfig.class })
10+
@ContextConfiguration({ "/RedirectionWebSecurityConfig.xml", "/mvc-servlet.xml" })
1611
@WebAppConfiguration
1712
public class SpringContextIntegrationTest {
18-
19-
@Test
20-
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
21-
}
13+
@Test
14+
public void whenSpringContextIsBootstrapped_thenNoExceptions() {
15+
}
2216
}

‎spring-security-rest-basic-auth/src/test/java/org/baeldung/SpringContextIntegrationTest.java

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
11
package org.baeldung;
22

3-
import org.baeldung.client.spring.ClientConfig;
4-
import org.baeldung.spring.SecSecurityConfig;
5-
import org.baeldung.spring.WebConfig;
63
import org.junit.Test;
74
import org.junit.runner.RunWith;
85
import org.springframework.test.context.ContextConfiguration;
96
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
10-
import org.springframework.test.context.support.AnnotationConfigContextLoader;
11-
import org.springframework.test.context.web.WebAppConfiguration;
127

138
@RunWith(SpringJUnit4ClassRunner.class)
14-
@ContextConfiguration(classes = { ClientConfig.class, SecSecurityConfig.class,
15-
WebConfig.class }, loader = AnnotationConfigContextLoader.class)
9+
@ContextConfiguration({ "/WebSecurityConfig.xml" })
1610
public class SpringContextIntegrationTest {
1711

1812
@Test

0 commit comments

Comments
 (0)