From b39141bfd55acae059551556de4406ee547cfb55 Mon Sep 17 00:00:00 2001
From: cyleph <marvin.herold@gmail.com>
Date: Sat, 20 Oct 2018 13:11:37 +0200
Subject: [PATCH] Fix for #1226 and unit tests. (#1227)

---
 .../com/zaxxer/hikari/HikariDataSource.java   |  4 +-
 .../com/zaxxer/hikari/pool/TestIsRunning.java | 83 +++++++++++++++++++
 2 files changed, 85 insertions(+), 2 deletions(-)
 create mode 100644 src/test/java/com/zaxxer/hikari/pool/TestIsRunning.java

diff --git a/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index bddad2b1..1ed4763a 100644
--- a/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -30,7 +30,7 @@ import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-import static com.zaxxer.hikari.pool.HikariPool.POOL_SHUTDOWN;
+import static com.zaxxer.hikari.pool.HikariPool.POOL_NORMAL;
 
 /**
  * The HikariCP pooled DataSource.
@@ -294,7 +294,7 @@ public class HikariDataSource extends HikariConfig implements DataSource, Closea
     */
    public boolean isRunning()
    {
-      return pool != null && pool.poolState != POOL_SHUTDOWN;
+      return pool != null && pool.poolState == POOL_NORMAL;
    }
 
    /**
diff --git a/src/test/java/com/zaxxer/hikari/pool/TestIsRunning.java b/src/test/java/com/zaxxer/hikari/pool/TestIsRunning.java
new file mode 100644
index 00000000..e5a129d0
--- /dev/null
+++ b/src/test/java/com/zaxxer/hikari/pool/TestIsRunning.java
@@ -0,0 +1,83 @@
+package com.zaxxer.hikari.pool;
+
+import static com.zaxxer.hikari.pool.TestElf.getPool;
+import static com.zaxxer.hikari.pool.TestElf.newHikariConfig;
+import static com.zaxxer.hikari.pool.TestElf.newHikariDataSource;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.concurrent.TimeUnit;
+
+import org.junit.Test;
+
+import com.zaxxer.hikari.HikariConfig;
+import com.zaxxer.hikari.HikariDataSource;
+
+/**
+ * Tests for {@link HikariDataSource#isRunning()}.
+ */
+public class TestIsRunning
+{
+    @Test
+    public void testRunningNormally()
+    {
+        try (HikariDataSource ds = new HikariDataSource(basicConfig()))
+        {
+            assertTrue(ds.isRunning());
+        }
+    }
+
+
+    @Test
+    public void testNoPool()
+    {
+        try (HikariDataSource ds = newHikariDataSource())
+        {
+            assertNull("Pool should not be initialized.", getPool(ds));
+            assertFalse(ds.isRunning());
+        }
+    }
+
+
+    @Test
+    public void testSuspendAndResume()
+    {
+        try (HikariDataSource ds = new HikariDataSource(basicConfig()))
+        {
+            ds.getHikariPoolMXBean().suspendPool();
+            assertFalse(ds.isRunning());
+
+            ds.getHikariPoolMXBean().resumePool();
+            assertTrue(ds.isRunning());
+        }
+    }
+
+
+    @Test
+    public void testShutdown()
+    {
+        try (HikariDataSource ds = new HikariDataSource(basicConfig()))
+        {
+            ds.close();
+            assertFalse(ds.isRunning());
+        }
+    }
+
+
+    private HikariConfig basicConfig()
+    {
+        HikariConfig config = newHikariConfig();
+        config.setMinimumIdle(1);
+        config.setMaximumPoolSize(1);
+        config.setConnectionTestQuery("VALUES 1");
+        config.setConnectionInitSql("SELECT 1");
+        config.setReadOnly(true);
+        config.setConnectionTimeout(2500);
+        config.setLeakDetectionThreshold(TimeUnit.SECONDS.toMillis(30));
+        config.setDataSourceClassName("com.zaxxer.hikari.mocks.StubDataSource");
+        config.setAllowPoolSuspension(true);
+
+        return config;
+    }
+}