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

Convert JUnit assertions to AssertJ to match spring-javaformat checkstyle rules

Browse Source
This commit is contained in:
Simon DeMartini
2022-03-19 15:57:34 -07:00
committed by GitHub
parent 99d7a7a268
commit 2722841925
30 changed files with 232 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/test/java/org/springframework/guice/module/DevelepmentStageInjectorTest.java
View File

@@ -35,8 +35,7 @@ import org.springframework.context.annotation.Configuration;
import org.springframework.guice.annotation.EnableGuiceModules;
import org.springframework.guice.annotation.InjectorFactory;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
public class DevelepmentStageInjectorTest {
@@ -55,9 +54,9 @@ public class DevelepmentStageInjectorTest {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
DevelepmentStageInjectorTest.ModulesConfig.class);
TestGuiceModule testGuiceModule = context.getBean(TestGuiceModule.class);
assertFalse(testGuiceModule.getProviderExecuted());
assertThat(testGuiceModule.getProviderExecuted()).isFalse();
GuiceToken guiceToken = context.getBean(GuiceToken.class);
assertTrue(testGuiceModule.getProviderExecuted());
assertThat(testGuiceModule.getProviderExecuted()).isTrue();
context.close();
}

30
src/test/java/org/springframework/guice/module/SpringModuleGuiceBindingAwareTests.java
View File

@@ -31,9 +31,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.util.AopTestUtils;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertSame;
import static org.assertj.core.api.Assertions.assertThat;
public class SpringModuleGuiceBindingAwareTests {
@@ -43,26 +41,26 @@ public class SpringModuleGuiceBindingAwareTests {
new SpringModule(BeanFactoryProvider.from(GuiceProjectWithSpringLibraryTestSpringConfig.class)));
// check guice provided bindings
assertNotNull(injector.getInstance(GuiceDependency1.class));
assertNotNull(injector.getInstance(IGuiceDependency1.class));
assertThat(injector.getInstance(GuiceDependency1.class)).isNotNull();
assertThat(injector.getInstance(IGuiceDependency1.class)).isNotNull();
// check spring bindings as interface
ISpringBean springBean = injector.getInstance(ISpringBean.class);
assertNotNull(springBean);
assertNotNull(springBean.getDep1());
assertNotNull(springBean.getDep2());
assertNotNull(springBean.getDep3());
assertThat(springBean).isNotNull();
assertThat(springBean.getDep1()).isNotNull();
assertThat(springBean.getDep2()).isNotNull();
assertThat(springBean.getDep3()).isNotNull();
// invoke a method to make sure we aren't dealing with a lazy proxy
assertEquals("done", springBean.getDep1().doWork());
assertThat(springBean.getDep1().doWork()).isEqualTo("done");
// check binding equality
assertSame(injector.getInstance(IGuiceDependency1.class),
AopTestUtils.getTargetObject(springBean.getDep1()));
assertSame(injector.getInstance(IGuiceDependency2.class),
AopTestUtils.getTargetObject(springBean.getDep2()));
assertSame(injector.getInstance(IGuiceDependency3.class),
AopTestUtils.getTargetObject(springBean.getDep3()));
assertThat(injector.getInstance(IGuiceDependency1.class))
.isSameAs(AopTestUtils.getTargetObject(springBean.getDep1()));
assertThat(injector.getInstance(IGuiceDependency2.class))
.isSameAs(AopTestUtils.getTargetObject(springBean.getDep2()));
assertThat(injector.getInstance(IGuiceDependency3.class))
.isSameAs(AopTestUtils.getTargetObject(springBean.getDep3()));
}
static class SimpleGuiceModule extends AbstractModule {

20
src/test/java/org/springframework/guice/module/SpringModuleMetadataTests.java
View File

@@ -24,7 +24,6 @@ import com.google.inject.Injector;
import com.google.inject.Key;
import com.google.inject.ProvisionException;
import com.google.inject.name.Names;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.springframework.cache.annotation.Cacheable;
@@ -35,8 +34,8 @@ import org.springframework.context.annotation.Primary;
import org.springframework.core.type.filter.AnnotationTypeFilter;
import org.springframework.core.type.filter.AssignableTypeFilter;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
/**
* @author Dave Syer
@@ -47,37 +46,40 @@ public class SpringModuleMetadataTests {
@Test
public void twoConfigClasses() throws Exception {
Injector injector = createInjector(TestConfig.class, OtherConfig.class);
assertNotNull(injector.getInstance(Service.class));
assertThat(injector.getInstance(Service.class)).isNotNull();
}
@Test
public void twoServices() throws Exception {
Injector injector = createInjector(TestConfig.class, MoreConfig.class);
assertThrows(ProvisionException.class, () -> assertNotNull(injector.getInstance(Service.class)));
assertThatExceptionOfType(ProvisionException.class)
.isThrownBy(() -> assertThat(injector.getInstance(Service.class)).isNotNull());
}
@Test
public void twoServicesOnePrimary() throws Exception {
Injector injector = createInjector(TestConfig.class, PrimaryConfig.class);
assertNotNull(injector.getInstance(Service.class));
assertThat(injector.getInstance(Service.class)).isNotNull();
}
@Test
public void twoServicesByName() throws Exception {
Injector injector = createInjector(TestConfig.class, MoreConfig.class);
assertNotNull(injector.getInstance(Key.get(Service.class, Names.named("service"))));
assertThat(injector.getInstance(Key.get(Service.class, Names.named("service")))).isNotNull();
}
@Test
public void includes() throws Exception {
Injector injector = createInjector(TestConfig.class, MetadataIncludesConfig.class);
assertThrows(ConfigurationException.class, () -> Assertions.assertNull(injector.getBinding(Service.class)));
assertThatExceptionOfType(ConfigurationException.class)
.isThrownBy(() -> assertThat(injector.getBinding(Service.class)).isNull());
}
@Test
public void excludes() throws Exception {
Injector injector = createInjector(TestConfig.class, MetadataExcludesConfig.class);
assertThrows(ConfigurationException.class, () -> Assertions.assertNull(injector.getBinding(Service.class)));
assertThatExceptionOfType(ConfigurationException.class)
.isThrownBy(() -> assertThat(injector.getBinding(Service.class)).isNull());
}
private Injector createInjector(Class<?>... config) {

4
src/test/java/org/springframework/guice/module/SpringModuleWrappedTests.java
View File

@@ -28,7 +28,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.guice.annotation.EnableGuiceModules;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.assertj.core.api.Assertions.assertThat;
public class SpringModuleWrappedTests {
@@ -36,7 +36,7 @@ public class SpringModuleWrappedTests {
public void testDependenciesFromWrappedModule() {
Injector injector = Guice.createInjector(
new SpringModule(BeanFactoryProvider.from(TestConfig.class, ModuleProviderConfig.class)));
assertNotNull(injector.getInstance(Baz.class));
assertThat(injector.getInstance(Baz.class)).isNotNull();
}
@Configuration