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/09/06 14:18:31 UTC
[1/2] brooklyn-server git commit: BROOKLYN-330: add failing test for
dsl in HttpRequestSensor
Repository: brooklyn-server
Updated Branches:
refs/heads/master 9b15176ff -> 76177f056
BROOKLYN-330: add failing test for dsl in HttpRequestSensor
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/f9f7a5e8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/f9f7a5e8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/f9f7a5e8
Branch: refs/heads/master
Commit: f9f7a5e8155eb105e3ec9d629fc437b5c5bfe06a
Parents: 374e01f
Author: Aled Sage <al...@gmail.com>
Authored: Mon Aug 15 15:47:19 2016 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Mon Aug 15 15:47:19 2016 +0100
----------------------------------------------------------------------
.../brooklyn/HttpRequestSensorYamlTest.java | 128 +++++++++++++++++++
1 file changed, 128 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/f9f7a5e8/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpRequestSensorYamlTest.java
----------------------------------------------------------------------
diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpRequestSensorYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpRequestSensorYamlTest.java
new file mode 100644
index 0000000..d8e8416
--- /dev/null
+++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/HttpRequestSensorYamlTest.java
@@ -0,0 +1,128 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.camp.brooklyn;
+
+import java.net.URI;
+
+import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.sensor.AttributeSensor;
+import org.apache.brooklyn.core.entity.Attributes;
+import org.apache.brooklyn.core.entity.EntityAsserts;
+import org.apache.brooklyn.core.sensor.Sensors;
+import org.apache.brooklyn.core.sensor.http.HttpRequestSensor;
+import org.apache.brooklyn.core.test.entity.TestEntity;
+import org.apache.brooklyn.test.http.TestHttpRequestHandler;
+import org.apache.brooklyn.test.http.TestHttpServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import com.google.common.collect.Iterables;
+
+public class HttpRequestSensorYamlTest extends AbstractYamlTest {
+ private static final Logger log = LoggerFactory.getLogger(HttpRequestSensorYamlTest.class);
+
+ final static AttributeSensor<String> SENSOR_STRING = Sensors.newStringSensor("aString");
+ final static String TARGET_TYPE = "java.lang.String";
+
+ private TestHttpServer server;
+ private String serverUrl;
+
+ @BeforeClass(alwaysRun=true)
+ @Override
+ public void setUp() throws Exception {
+ super.setUp();
+ server = new TestHttpServer()
+ .handler("/myKey/myValue", new TestHttpRequestHandler().header("Content-Type", "application/json").response("{\"myKey\":\"myValue\"}"))
+ .start();
+ serverUrl = server.getUrl();
+ }
+
+ @AfterMethod(alwaysRun=true)
+ @Override
+ public void tearDown() throws Exception {
+ try {
+ if (server != null) server.stop();
+ } finally {
+ super.tearDown();
+ }
+ }
+
+ @Test
+ public void testHttpSensor() throws Exception {
+ Entity app = createAndStartApplication(
+ "services:",
+ "- type: " + TestEntity.class.getName(),
+ " brooklyn.config:",
+ " onbox.base.dir.skipResolution: true",
+ " brooklyn.initializers:",
+ " - type: "+HttpRequestSensor.class.getName(),
+ " brooklyn.config:",
+ " "+HttpRequestSensor.SENSOR_PERIOD.getName()+": 100ms",
+ " "+HttpRequestSensor.SENSOR_NAME.getName()+": " + SENSOR_STRING.getName(),
+ " "+HttpRequestSensor.SENSOR_TYPE.getName()+": " + TARGET_TYPE,
+ " "+HttpRequestSensor.JSON_PATH.getName()+": " + "$.myKey",
+ " "+HttpRequestSensor.SENSOR_URI.getName()+": " + serverUrl + "/myKey/myValue");
+ waitForApplicationTasks(app);
+ Entity entity = Iterables.getOnlyElement(app.getChildren());
+ entity.sensors().set(Attributes.SERVICE_UP, true);
+
+ EntityAsserts.assertAttributeEqualsEventually(entity, SENSOR_STRING, "myValue");
+ }
+
+ // TODO Fails trying to coerce DslConfigSupplier to String
+ // See https://issues.apache.org/jira/browse/BROOKLYN-330
+ @Test(groups="Broken")
+ public void testHttpSensorWithDeferredSuppliers() throws Exception {
+ // TODO If we fix the coercion problem, will it still fail because passing username/password?
+ Entity app = createAndStartApplication(
+ "services:",
+ "- type: " + TestEntity.class.getName(),
+ " brooklyn.config:",
+ " server.username: myusername",
+ " server.password: mypassword",
+ " brooklyn.initializers:",
+ " - type: "+HttpRequestSensor.class.getName(),
+ " brooklyn.config:",
+ " "+HttpRequestSensor.SENSOR_PERIOD.getName()+": 100ms",
+ " "+HttpRequestSensor.SENSOR_NAME.getName()+": " + SENSOR_STRING.getName(),
+ " "+HttpRequestSensor.SENSOR_TYPE.getName()+": " + TARGET_TYPE,
+ " "+HttpRequestSensor.JSON_PATH.getName()+": " + "$.myKey",
+ " "+HttpRequestSensor.USERNAME.getName()+": $brooklyn:config(\"server.username\")",
+ " "+HttpRequestSensor.PASSWORD.getName()+": $brooklyn:config(\"server.password\")",
+ " "+HttpRequestSensor.SENSOR_URI.getName()+":",
+ " $brooklyn:formatString:",
+ " - \"%s/myKey/myValue\"",
+ " - $brooklyn:attributeWhenReady(\"main.uri\")");
+
+ waitForApplicationTasks(app);
+ Entity entity = Iterables.getOnlyElement(app.getChildren());
+ entity.sensors().set(Attributes.MAIN_URI, URI.create(serverUrl));
+ entity.sensors().set(Attributes.SERVICE_UP, true);
+
+ EntityAsserts.assertAttributeEqualsEventually(entity, SENSOR_STRING, "myValue");
+ }
+
+ @Override
+ protected Logger getLogger() {
+ return log;
+ }
+}
[2/2] brooklyn-server git commit: Closes #302
Posted by sv...@apache.org.
Closes #302
BROOKLYN-330: add failing test for dsl in HttpRequestSensor
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/76177f05
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/76177f05
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/76177f05
Branch: refs/heads/master
Commit: 76177f056a2abfc7e9cefd2d8a0a53b09ea01b56
Parents: 9b15176 f9f7a5e
Author: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Authored: Tue Sep 6 17:18:20 2016 +0300
Committer: Svetoslav Neykov <sv...@cloudsoftcorp.com>
Committed: Tue Sep 6 17:18:20 2016 +0300
----------------------------------------------------------------------
.../brooklyn/HttpRequestSensorYamlTest.java | 128 +++++++++++++++++++
1 file changed, 128 insertions(+)
----------------------------------------------------------------------