From 6ff6f77a6910c6f7fd3d55ca2c28ba252c6c91b2 Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Sat, 21 Jul 2012 21:02:57 +0200
Subject: [PATCH] tests: Use @BeforeClass on tearDown().

        * src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java:
        * src/test/java/org/glom/web/server/SelfHostExampleTest.java:
        This avoids leaking a postgres process in SelfHostExampleTest.
---
 ChangeLog                                                      | 10 +++++++++-
 .../java/org/glom/web/server/OnlineGlomPropertiesTest.java     |  6 ++++--
 src/test/java/org/glom/web/server/SelfHostExampleTest.java     |  6 ++++--
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a840579..ccd7b76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,14 @@
 2012-07-21  Murray Cumming  <murrayc@murrayc.com>
 
-        tests: Test translations moe.
+        tests: Use @BeforeClass on tearDown().
+
+        * src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java:
+        * src/test/java/org/glom/web/server/SelfHostExampleTest.java:
+	This avoids leaking a postgres process in SelfHostExampleTest.
+
+2012-07-21  Murray Cumming  <murrayc@murrayc.com>
+
+        tests: Test translations more.
 
         * src/test/java/org/glom/web/server/ConfiguredDocumentTest.java:
         * src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java:
diff --git a/src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java b/src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java
index 564e304..eb1524a 100644
--- a/src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java
+++ b/src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java
@@ -25,6 +25,8 @@ import java.io.InputStream;
 
 import junit.framework.TestCase;
 
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
 import org.junit.Test;
 
 /**
@@ -35,7 +37,7 @@ public class OnlineGlomPropertiesTest extends TestCase {
 
 	OnlineGlomProperties config = null;
 
-	@Override
+	@BeforeClass
 	public void setUp() throws IOException {
 		config = new OnlineGlomProperties();
 
@@ -89,7 +91,7 @@ public class OnlineGlomPropertiesTest extends TestCase {
 		assertEquals("/home/someuser/glomfiles", config.getDocumentsDirectory());
 	}
 	
-	@Override
+	@AfterClass
 	public void tearDown() {
 		config = null;
 	}
diff --git a/src/test/java/org/glom/web/server/SelfHostExampleTest.java b/src/test/java/org/glom/web/server/SelfHostExampleTest.java
index b7f8cc3..3f0f19c 100644
--- a/src/test/java/org/glom/web/server/SelfHostExampleTest.java
+++ b/src/test/java/org/glom/web/server/SelfHostExampleTest.java
@@ -36,6 +36,7 @@ import org.glom.web.shared.TypedDataItem;
 import org.glom.web.shared.libglom.Field;
 import org.glom.web.shared.libglom.layout.LayoutItemField;
 import org.jooq.Condition;
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -45,7 +46,7 @@ import org.junit.Test;
  */
 public class SelfHostExampleTest {
 
-	private SelfHoster selfHoster = null;
+	private static SelfHoster selfHoster = null;
 
 	@Test
 	public void test() throws SQLException {
@@ -102,7 +103,8 @@ public class SelfHostExampleTest {
 	  Assert.assertEquals(1, rsRowsCount);
 	}
 
-	public void tearDown() {
+	@AfterClass
+	public static void tearDown() {
 		if (selfHoster != null) {
 			selfHoster.cleanup();
 		}
-- 
2.1.4