DATAGEODE-42 - Upgrade to OpenWebBeans 2.0.1

This commit is contained in:
Mark Paluch
2017-09-18 15:48:48 +02:00
parent 35df6902fa
commit d52bea06c1
3 changed files with 27 additions and 36 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2012 the original author or authors.
* Copyright 2012-2017 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -24,48 +24,50 @@ import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.nullValue;
import static org.junit.Assert.assertThat;
import javax.enterprise.inject.se.SeContainer;
import javax.enterprise.inject.se.SeContainerInitializer;
import org.apache.geode.cache.CacheClosedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.webbeans.cditest.CdiTestContainer;
import org.apache.webbeans.cditest.CdiTestContainerLoader;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.springframework.data.gemfire.repository.sample.Person;
/**
* The CdiExtensionIntegrationTest class...
*
* @author John Blum
* @author Mark Paluch
* @see org.junit.Test
* @see org.springframework.data.gemfire.repository.cdi.GemfireRepositoryBean
* @see org.springframework.data.gemfire.repository.cdi.GemfireRepositoryExtension
* @see org.apache.webbeans.cditest.CdiTestContainer
* @see org.apache.webbeans.cditest.CdiTestContainerLoader
* @since 1.8.0
*/
public class CdiExtensionIntegrationTest {
static CdiTestContainer container;
static SeContainer container;
@BeforeClass
public static void setUp() throws Exception {
container = CdiTestContainerLoader.getCdiContainer();
container.bootContainer();
public static void setUp() {
container = SeContainerInitializer.newInstance() //
.disableDiscovery() //
.addPackages(RepositoryClient.class) //
.initialize();
}
@AfterClass
public static void tearDown() throws Exception {
container.shutdownContainer();
public static void tearDown() {
container.close();
closeGemfireCache();
}
private static void closeGemfireCache() {
try {
CacheFactory.getAnyInstance().close();
}
catch (CacheClosedException ignore) {
}
} catch (CacheClosedException ignore) {}
}
protected void assertIsExpectedPerson(Person actual, Person expected) {
@@ -74,9 +76,10 @@ public class CdiExtensionIntegrationTest {
assertThat(actual.getLastname(), is(equalTo(expected.getLastname())));
}
@Test
@Test // DATAGEODE-42
public void bootstrapsRepositoryCorrectly() {
RepositoryClient repositoryClient = container.getInstance(RepositoryClient.class);
RepositoryClient repositoryClient = container.select(RepositoryClient.class).get();
assertThat(repositoryClient.getPersonRepository(), is(notNullValue()));
@@ -98,9 +101,10 @@ public class CdiExtensionIntegrationTest {
assertThat(repositoryClient.find(foundJonDoe.getId()), is(nullValue()));
}
@Test
@Test // DATAGEODE-42
public void returnOneFromCustomImplementation() {
RepositoryClient repositoryClient = container.getInstance(RepositoryClient.class);
RepositoryClient repositoryClient = container.select(RepositoryClient.class).get();
assertThat(repositoryClient.getPersonRepository().returnOne(), is(equalTo(1)));
}