You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by sv...@apache.org on 2016/11/28 14:19:28 UTC
[2/4] brooklyn-server git commit: use AnyoneSecurityProvider in more
tests
use AnyoneSecurityProvider in more tests
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/d1a49779
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/d1a49779
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/d1a49779
Branch: refs/heads/master
Commit: d1a4977965aec613efebe958bc655015e6d6dbdc
Parents: 18b49c3
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Thu Nov 24 22:54:34 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Thu Nov 24 22:54:59 2016 +0000
----------------------------------------------------------------------
.../brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java | 3 +--
.../apache/brooklyn/rest/BrooklynRestApiLauncherTest.java | 9 ++++-----
.../brooklyn/rest/BrooklynRestApiLauncherTestFixture.java | 8 ++++++--
.../apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java | 2 +-
.../org/apache/brooklyn/rest/HaMasterCheckFilterTest.java | 4 ++--
.../rest/entitlement/AbstractRestApiEntitlementsTest.java | 2 +-
.../rest/resources/ServerResourceIntegrationTest.java | 4 ++--
7 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
index f89acf0..c05d15b 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynPropertiesSecurityFilterTest.java
@@ -97,8 +97,7 @@ public class BrooklynPropertiesSecurityFilterTest extends BrooklynRestApiLaunche
public void testInteractionOfSecurityFilterAndFormMapProvider() throws Exception {
Stopwatch stopwatch = Stopwatch.createStarted();
try {
- Server server = useServerForTest(BrooklynRestApiLauncher.launcher()
- .securityProvider(AnyoneSecurityProvider.class)
+ Server server = useServerForTest(baseLauncher()
.forceUseOfDefaultCatalogWithJavaClassPath(true)
.withoutJsgui()
.start());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
index d64b9a6..26c8fb0 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTest.java
@@ -24,7 +24,6 @@ import static org.apache.brooklyn.rest.BrooklynRestApiLauncher.StartMode.WEB_XML
import java.util.concurrent.Callable;
import org.apache.brooklyn.entity.brooklynnode.BrooklynNode;
-import org.apache.brooklyn.rest.security.provider.AnyoneSecurityProvider;
import org.apache.brooklyn.test.Asserts;
import org.apache.brooklyn.util.http.HttpAsserts;
import org.apache.brooklyn.util.http.HttpTool;
@@ -45,10 +44,10 @@ public class BrooklynRestApiLauncherTest extends BrooklynRestApiLauncherTestFixt
checkRestCatalogEntities(useServerForTest(baseLauncher().mode(WEB_XML).start()));
}
- private BrooklynRestApiLauncher baseLauncher() {
- return BrooklynRestApiLauncher.launcher()
- .securityProvider(AnyoneSecurityProvider.class)
- .forceUseOfDefaultCatalogWithJavaClassPath(true);
+ @Override
+ protected BrooklynRestApiLauncher baseLauncher() {
+ return super.baseLauncher()
+ .forceUseOfDefaultCatalogWithJavaClassPath(true);
}
private static void checkRestCatalogEntities(Server server) throws Exception {
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
index 1893d4a..53068c0 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/BrooklynRestApiLauncherTestFixture.java
@@ -50,9 +50,8 @@ public abstract class BrooklynRestApiLauncherTestFixture {
protected Server newServer() {
try {
- Server server = BrooklynRestApiLauncher.launcher()
+ Server server = baseLauncher()
.forceUseOfDefaultCatalogWithJavaClassPath(true)
- .securityProvider(AnyoneSecurityProvider.class)
.start();
return server;
} catch (Exception e) {
@@ -69,6 +68,11 @@ public abstract class BrooklynRestApiLauncherTestFixture {
return server;
}
+ protected BrooklynRestApiLauncher baseLauncher() {
+ return BrooklynRestApiLauncher.launcher()
+ .securityProvider(AnyoneSecurityProvider.class);
+ }
+
/** @deprecated since 0.9.0 use {@link #getBaseUriHostAndPost(Server)} or {@link #getBaseUriRest(Server)} */
public static String getBaseUri(Server server) {
return getBaseUriHostAndPost(server);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
index a9af873..31f9497 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/CsrfTokenFilterLauncherTest.java
@@ -45,7 +45,7 @@ public class CsrfTokenFilterLauncherTest extends BrooklynRestApiLauncherTestFixt
@Test
public void testRequestToken() {
- useServerForTest(BrooklynRestApiLauncher.launcher()
+ useServerForTest(baseLauncher()
.withoutJsgui()
.start());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
index 83d00f5..9d345ce 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/HaMasterCheckFilterTest.java
@@ -159,9 +159,9 @@ public class HaMasterCheckFilterTest extends BrooklynRestApiLauncherTestFixture
readMgmt = createManagementContext(mementoDir, readMode);
}
- server = useServerForTest(BrooklynRestApiLauncher.launcher()
- .managementContext(readMgmt)
+ server = useServerForTest(baseLauncher()
.securityProvider(AnyoneSecurityProvider.class)
+ .managementContext(readMgmt)
.forceUseOfDefaultCatalogWithJavaClassPath(true)
.withoutJsgui()
.disableHighAvailability(false)
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
index a750d89..1181e94 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/entitlement/AbstractRestApiEntitlementsTest.java
@@ -74,7 +74,7 @@ public abstract class AbstractRestApiEntitlementsTest extends BrooklynRestApiLau
.configure(TestEntity.CONF_NAME, "myname"));
entity = (TestEntity) Iterables.getOnlyElement(app.getChildren());
- useServerForTest(BrooklynRestApiLauncher.launcher()
+ useServerForTest(baseLauncher()
.managementContext(mgmt)
.forceUseOfDefaultCatalogWithJavaClassPath(true)
.start());
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/d1a49779/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
index 2436b91..5daa5fa 100644
--- a/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
+++ b/rest/rest-server/src/test/java/org/apache/brooklyn/rest/resources/ServerResourceIntegrationTest.java
@@ -63,7 +63,7 @@ public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFi
ManagementContext mgmt = new LocalManagementContext(brooklynProperties);
try {
- Server server = useServerForTest(BrooklynRestApiLauncher.launcher()
+ Server server = useServerForTest(baseLauncher()
.managementContext(mgmt)
.withoutJsgui()
.securityProvider(TestSecurityProvider.class)
@@ -103,7 +103,7 @@ public class ServerResourceIntegrationTest extends BrooklynRestApiLauncherTestFi
@Test(groups = "Integration")
public void testGetUser() throws Exception {
- Server server = useServerForTest(BrooklynRestApiLauncher.launcher()
+ Server server = useServerForTest(baseLauncher()
.securityProvider(TestSecurityProvider.class)
.withoutJsgui()
.start());