From 0e0e895ea5042292468ca4a55043eb636c436c59 Mon Sep 17 00:00:00 2001
From: Duncan Godwin <duncan.godwin@cloudsoftcorp.com>
Date: Thu, 11 May 2017 10:26:18 +0100
Subject: [PATCH] Put back GeoDNS tests

---
 .../entity/dns/AbstractGeoDnsServiceTest.java        | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
index 9a90b6cd7..7b4d37f67 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/AbstractGeoDnsServiceTest.java
@@ -167,7 +167,7 @@ private LocationSpec<SshMachineLocation> newSshMachineLocationSpec(String name,
                 .configure("longitude", lon);
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testGeoInfoOnLocation() {
         app.start( ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname) );
         publishSensors(2, true, true, true);
@@ -177,7 +177,7 @@ public void testGeoInfoOnLocation() {
         assertIsTarget("East child with location");
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testGeoInfoOnParentLocation() {
         app.start( ImmutableList.of(westChild, eastChild) );
         publishSensors(2, true, false, false);
@@ -187,7 +187,7 @@ public void testGeoInfoOnParentLocation() {
         assertIsTarget("East child");
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testSubscribesToHostname() {
         geoDns.config().set(GeoDnsTestServiceImpl.ADD_ANYTHING, false);
         app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname) );
@@ -219,7 +219,7 @@ protected void publishSensors(int expectedSize, boolean includeServiceUp, boolea
         }
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testChildAddedLate() {
         app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname) );
         publishSensors(2, true, false, false);
@@ -238,7 +238,7 @@ public void testChildAddedLate() {
         log.info("targets: "+geoDns.getTargetHostsByName());
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testFiltersEntirelyPrivate() {
         geoDns.config().set(GeoDnsTestServiceImpl.ADD_ANYTHING, false);
         app.start( ImmutableList.of(westChild, eastChildWithLocationAndWithPrivateHostname, northChildWithLocation) );
@@ -276,7 +276,7 @@ public void testFiltersForRunningEntities() {
         assertAttributeEventually(geoDns, AbstractGeoDnsService.TARGETS, CollectionFunctionals.<String>mapSizeEquals(2));
     }
 
-    @Test(groups="Integration")
+    @Test
     public void testCanDisableFilterForRunningEntities() throws Exception {
         geoDns.config().set(AbstractGeoDnsService.FILTER_FOR_RUNNING, false);
         app.start(ImmutableList.of(westChildWithLocation, eastChildWithLocationAndWithPrivateHostname));