From 2b0bc86ceb714a5b5d496fc25e0f9f8f32f834ba Mon Sep 17 00:00:00 2001
From: Johnny Lim <izeye@naver.com>
Date: Sat, 4 Jan 2020 14:52:07 +0900
Subject: [PATCH] Fix flaky tests in HibernateMetricsTest due to GC (#1776)

---
 .../instrument/binder/jpa/HibernateMetricsTest.java  | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

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 1a7cd33ca4..3b73efe313 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;
@@ -39,7 +38,9 @@
  */
 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);
@@ -60,22 +61,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();
     }