From ef3974826faba4c5c2fabe898659a3bad5d940f2 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Wed, 4 Apr 2018 09:37:09 +0200 Subject: [PATCH] DATAJPA-1250 - Polishing. New tests with AssertJ. Formatting for one assertion per line. --- .../repository/config/InspectionClassLoaderUnitTests.java | 5 ++++- .../config/JpaRepositoryConfigExtensionUnitTests.java | 7 ++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java index d90fde0ea..5e266b257 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/InspectionClassLoaderUnitTests.java @@ -34,7 +34,10 @@ public class InspectionClassLoaderUnitTests { Class isolated = classLoader.loadClass("org.hsqldb.Database"); Class included = getClass().getClassLoader().loadClass("org.hsqldb.Database"); - assertThat(isolated.getClassLoader()).isSameAs(classLoader).isNotSameAs(getClass().getClassLoader()); + assertThat(isolated.getClassLoader()) // + .isSameAs(classLoader) // + .isNotSameAs(getClass().getClassLoader()); + assertThat(isolated).isNotEqualTo(included); } } diff --git a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java index 2f647b257..21e51149e 100644 --- a/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java +++ b/src/test/java/org/springframework/data/jpa/repository/config/JpaRepositoryConfigExtensionUnitTests.java @@ -15,8 +15,9 @@ */ package org.springframework.data.jpa.repository.config; +import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.*; -import static org.junit.Assert.*; +import static org.junit.Assert.assertThat; import static org.mockito.Mockito.*; import java.util.Arrays; @@ -119,7 +120,7 @@ public class JpaRepositoryConfigExtensionUnitTests { JpaRepositoryConfigExtension extension = new JpaRepositoryConfigExtension(); ClassLoader classLoader = extension.getConfigurationInspectionClassLoader(new GenericApplicationContext()); - assertThat(classLoader, is(instanceOf(InspectionClassLoader.class))); + assertThat(classLoader).isInstanceOf(InspectionClassLoader.class); } @Test // DATAJPA-1250 @@ -144,7 +145,7 @@ public class JpaRepositoryConfigExtensionUnitTests { JpaRepositoryConfigExtension extension = new JpaRepositoryConfigExtension(); ClassLoader classLoader = extension.getConfigurationInspectionClassLoader(context); - assertThat(classLoader, is(not(instanceOf(InspectionClassLoader.class)))); + assertThat(classLoader).isNotInstanceOf(InspectionClassLoader.class); } private void assertOnlyOnePersistenceAnnotationBeanPostProcessorRegistered(DefaultListableBeanFactory factory,