diff --git a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jpa/HibernateMetricsTest.java b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jpa/HibernateMetricsTest.java index dabc444a74..1e7617ca66 100644 --- a/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jpa/HibernateMetricsTest.java +++ b/micrometer-core/src/test/java/io/micrometer/core/instrument/binder/jpa/HibernateMetricsTest.java @@ -21,7 +21,6 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.hibernate.SessionFactory; import org.hibernate.stat.Statistics; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import javax.persistence.EntityManagerFactory; @@ -40,7 +39,9 @@ @SuppressWarnings("deprecation") class HibernateMetricsTest { - private MeterRegistry registry; + private final MeterRegistry registry = new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock()); + private final EntityManagerFactory entityManagerFactory = createMockEntityManagerFactory(true); + private final SessionFactory sessionFactory = createMockSessionFactory(true); private static EntityManagerFactory createMockEntityManagerFactory(boolean statsEnabled) { EntityManagerFactory emf = mock(EntityManagerFactory.class); @@ -61,22 +62,15 @@ private static SessionFactory createMockSessionFactory(boolean statsEnabled) { return sf; } - @BeforeEach - void setup() { - registry = new SimpleMeterRegistry(SimpleConfig.DEFAULT, new MockClock()); - } - @SuppressWarnings("deprecation") @Test void deprecatedMonitorShouldExposeMetricsWhenStatsEnabled() { - EntityManagerFactory entityManagerFactory = createMockEntityManagerFactory(true); HibernateMetrics.monitor(registry, entityManagerFactory, "entityManagerFactory"); assertThatMonitorShouldExposeMetricsWhenStatsEnabled(); } @Test void monitorShouldExposeMetricsWhenStatsEnabled() { - SessionFactory sessionFactory = createMockSessionFactory(true); HibernateMetrics.monitor(registry, sessionFactory, "sessionFactory"); assertThatMonitorShouldExposeMetricsWhenStatsEnabled(); }