Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-495 - Upgrade to OpenWebBeans 2.0.1.

Browse Source
This commit is contained in:
Mark Paluch
2017-09-18 15:26:23 +02:00
parent 43602ae30c
commit d1fb7e2fae
3 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
spring-data-cassandra/pom.xml
View File

@@ -119,21 +119,22 @@
<dependency> <dependency>
<groupId>javax.enterprise</groupId> <groupId>javax.enterprise</groupId>
<artifactId>cdi-api</artifactId> <artifactId>cdi-api</artifactId>
<version>${cdi}</version>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.openwebbeans.test</groupId> <groupId>javax.annotation</groupId>
<artifactId>cditest-owb</artifactId> <artifactId>javax.annotation-api</artifactId>
<version>${webbeans}</version> <version>${javax-annotation-api}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.servlet</groupId> <groupId>org.apache.openwebbeans</groupId>
<artifactId>servlet-api</artifactId> <artifactId>openwebbeans-se</artifactId>
<version>3.0-alpha-1</version> <version>${webbeans}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>

30
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/cdi/CdiRepositoryTests.java
View File

@@ -19,8 +19,9 @@ import static org.assertj.core.api.Assertions.*;
import java.util.Optional; import java.util.Optional;
import org.apache.webbeans.cditest.CdiTestContainer; import javax.enterprise.inject.se.SeContainer;
import org.apache.webbeans.cditest.CdiTestContainerLoader; import javax.enterprise.inject.se.SeContainerInitializer;
import org.junit.AfterClass; import org.junit.AfterClass;
import org.junit.Before; import org.junit.Before;
import org.junit.BeforeClass; import org.junit.BeforeClass;
@@ -34,40 +35,40 @@ import org.springframework.data.cassandra.test.util.AbstractEmbeddedCassandraInt
*/ */
public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest { public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest {
private static CdiTestContainer cdiContainer; private static SeContainer cdiContainer;
private CdiUserRepository repository; private CdiUserRepository repository;
private SamplePersonRepository personRepository; private SamplePersonRepository personRepository;
private QualifiedUserRepository qualifiedUserRepository; private QualifiedUserRepository qualifiedUserRepository;
@BeforeClass @BeforeClass
public static void init() throws Exception { public static void init() throws Exception {
// CDI container is booted before the @Rule can be triggered. // CDI container is booted before the @Rule can be triggered.
// Ensure that we have a usable Cassandra instance otherwise the container won't boot // Ensure that we have a usable Cassandra instance otherwise the container won't boot
// because it needs a CassandraOperations with a working Session/Cluster // because it needs a CassandraOperations with a working Session/Cluster
cdiContainer = CdiTestContainerLoader.getCdiContainer(); cdiContainer = SeContainerInitializer.newInstance() //
cdiContainer.startApplicationScope(); .disableDiscovery() //
cdiContainer.startContexts(); .addPackages(CdiRepositoryClient.class) //
cdiContainer.bootContainer(); .initialize();
} }
@AfterClass @AfterClass
public static void shutdown() throws Exception { public static void shutdown() throws Exception {
cdiContainer.close();
cdiContainer.stopContexts();
cdiContainer.shutdownContainer();
} }
@Before @Before
public void setUp() { public void setUp() {
CdiRepositoryClient client = cdiContainer.getInstance(CdiRepositoryClient.class); CdiRepositoryClient client = cdiContainer.select(CdiRepositoryClient.class).get();
repository = client.getRepository(); repository = client.getRepository();
personRepository = client.getSamplePersonRepository(); personRepository = client.getSamplePersonRepository();
qualifiedUserRepository = client.getQualifiedUserRepository(); qualifiedUserRepository = client.getQualifiedUserRepository();
} }
@Test // DATACASS-149 @Test // DATACASS-149, DATACASS-495
public void testCdiRepository() { public void testCdiRepository() {
assertThat(repository).isNotNull(); assertThat(repository).isNotNull();
@@ -100,7 +101,7 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest
assertThat(repository.findById(bean.getId())).isNotPresent(); assertThat(repository.findById(bean.getId())).isNotPresent();
} }
@Test // DATACASS-249 @Test // DATACASS-249, DATACASS-495
public void testQualifiedCdiRepository() { public void testQualifiedCdiRepository() {
assertThat(qualifiedUserRepository).isNotNull(); assertThat(qualifiedUserRepository).isNotNull();
@@ -116,9 +117,8 @@ public class CdiRepositoryTests extends AbstractEmbeddedCassandraIntegrationTest
assertThat(qualifiedUserRepository.existsById(bean.getId())).isTrue(); assertThat(qualifiedUserRepository.existsById(bean.getId())).isTrue();
} }
@Test // DATACASS-149 @Test // DATACASS-149, DATACASS-495
public void returnOneFromCustomImpl() { public void returnOneFromCustomImpl() {
assertThat(personRepository.returnOne()).isEqualTo(1); assertThat(personRepository.returnOne()).isEqualTo(1);
} }
} }

6
spring-data-cassandra/src/test/resources/META-INF/beans.xml
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<beans xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd">
</beans>