From a96c3a5d1cf294c92e7a1fd5500fa4a35758269f Mon Sep 17 00:00:00 2001
From: Murray Cumming <murrayc@murrayc.com>
Date: Sun, 22 Jul 2012 00:33:51 +0200
Subject: [PATCH] tests: Move a test that needs a database connection.

        * src/test/java/org/glom/web/server/ConfiguredDocumentTest.java:
Move testGetListViewLayoutGroup() to
        * src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java:
because it needs a database connection.
---
 ChangeLog                                          |  9 +++++++
 .../glom/web/server/ConfiguredDocumentTest.java    | 31 ----------------------
 .../web/server/SelfHostConfiguredDocumentTest.java | 31 ++++++++++++++++++++++
 3 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ccd7b76..cbaefaa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2012-07-21  Murray Cumming  <murrayc@murrayc.com>
 
+        tests: Move a test that needs a database connection.
+
+        * src/test/java/org/glom/web/server/ConfiguredDocumentTest.java:
+	Move testGetListViewLayoutGroup() to
+        * src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java:
+	because it needs a database connection.
+
+2012-07-21  Murray Cumming  <murrayc@murrayc.com>
+
         tests: Use @BeforeClass on tearDown().
 
         * src/test/java/org/glom/web/server/OnlineGlomPropertiesTest.java:
diff --git a/src/test/java/org/glom/web/server/ConfiguredDocumentTest.java b/src/test/java/org/glom/web/server/ConfiguredDocumentTest.java
index 68eb4f3..437350c 100644
--- a/src/test/java/org/glom/web/server/ConfiguredDocumentTest.java
+++ b/src/test/java/org/glom/web/server/ConfiguredDocumentTest.java
@@ -133,37 +133,6 @@ public class ConfiguredDocumentTest {
 		//TODO: final NavigationRecord navRecord = configuredDoc.getSuitableRecordToViewDetails(tableName, portal, primaryKeyValue);
 	}
 
-
-	public void testGetListViewLayoutGroup(final String locale, final String field0Title, final String field1Title) {
-		final LayoutGroup group = configuredDoc.getListViewLayoutGroup("albums", defaultLocale);
-		Assert.assertNotNull(group);
-		
-		List<LayoutItem> items = group.getItems();
-		Assert.assertNotNull(items);
-		Assert.assertEquals(8, items.size());
-		
-		LayoutItem item = items.get(0);
-		Assert.assertTrue(item instanceof LayoutItemField);
-		
-		Assert.assertEquals("name", item.getName());
-		Assert.assertEquals(field0Title, item.getTitle());
-		
-		item = items.get(1);
-		Assert.assertTrue(item instanceof LayoutItemField);
-		
-		Assert.assertEquals("year", item.getName());
-		Assert.assertEquals(field1Title, item.getTitle());
-	}
-	
-	/**
-	 * Test method for {@link org.glom.web.server.ConfiguredDocument#getListViewLayoutGroup(java.lang.String, java.lang.String)}.
-	 */
-	@Test
-	public void testGetListViewLayoutGroup() {
-		testGetListViewLayoutGroup(defaultLocale, "Name", "Year");
-		testGetListViewLayoutGroup(germanLocale, "Name", "Year");
-	}
-
 	/**
 	 * Test method for {@link org.glom.web.server.ConfiguredDocument#getReports(java.lang.String, java.lang.String)}.
 	 */
diff --git a/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java b/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java
index b4f7421..b74a717 100644
--- a/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java
+++ b/src/test/java/org/glom/web/server/SelfHostConfiguredDocumentTest.java
@@ -36,6 +36,8 @@ import org.glom.web.server.libglom.Document.HostingMode;
 import org.glom.web.shared.DataItem;
 import org.glom.web.shared.TypedDataItem;
 import org.glom.web.shared.libglom.layout.LayoutGroup;
+import org.glom.web.shared.libglom.layout.LayoutItem;
+import org.glom.web.shared.libglom.layout.LayoutItemField;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -80,6 +82,35 @@ public class SelfHostConfiguredDocumentTest {
 		}
 	}
 	
+	public void testGetListViewLayoutGroup(final String locale, final String field0Title, final String field1Title) {
+		final LayoutGroup group = configuredDoc.getListViewLayoutGroup("albums", defaultLocale);
+		Assert.assertNotNull(group);
+		
+		List<LayoutItem> items = group.getItems();
+		Assert.assertNotNull(items);
+		Assert.assertEquals(8, items.size());
+		
+		LayoutItem item = items.get(0);
+		Assert.assertTrue(item instanceof LayoutItemField);
+		
+		Assert.assertEquals("name", item.getName());
+		Assert.assertEquals(field0Title, item.getTitle());
+		
+		item = items.get(1);
+		Assert.assertTrue(item instanceof LayoutItemField);
+		
+		Assert.assertEquals("year", item.getName());
+		Assert.assertEquals(field1Title, item.getTitle());
+	}
+	
+	/**
+	 * Test method for {@link org.glom.web.server.ConfiguredDocument#getListViewLayoutGroup(java.lang.String, java.lang.String)}.
+	 */
+	@Test
+	public void testGetListViewLayoutGroup() {
+		testGetListViewLayoutGroup(defaultLocale, "Name", "Year");
+		testGetListViewLayoutGroup(germanLocale, "Name", "Year");
+	}
 
 	@Test
 	public void testGetListViewData() {
-- 
2.1.4