Merge branch 'master' into type-registry
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/42bf7c41 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/42bf7c41 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/42bf7c41 Branch: refs/heads/master Commit: 42bf7c414f3fa6fd948ba2c456007ba8d1f8a00f Parents: c712ad5 78df97a Author: Alex Heneveld <[email protected]> Authored: Wed Nov 11 17:22:05 2015 +0000 Committer: Alex Heneveld <[email protected]> Committed: Wed Nov 11 17:22:05 2015 +0000 ---------------------------------------------------------------------- core/pom.xml | 1 + pom.xml | 2 + usage/test-framework/README.md | 109 ++++++++ usage/test-framework/pom.xml | 71 +++++ .../brooklyn/test/framework/AbstractTest.java | 50 ++++ .../brooklyn/test/framework/BaseTest.java | 45 ++++ .../test/framework/ParallelTestCase.java | 14 + .../test/framework/ParallelTestCaseImpl.java | 125 +++++++++ .../brooklyn/test/framework/TestCase.java | 12 + .../brooklyn/test/framework/TestCaseImpl.java | 61 +++++ .../brooklyn/test/framework/TestEffector.java | 31 +++ .../test/framework/TestEffectorImpl.java | 78 ++++++ .../brooklyn/test/framework/TestHttpCall.java | 19 ++ .../test/framework/TestHttpCallImpl.java | 106 ++++++++ .../brooklyn/test/framework/TestSensor.java | 24 ++ .../brooklyn/test/framework/TestSensorImpl.java | 138 ++++++++++ .../test/framework/TestEffectorTest.java | 106 ++++++++ .../brooklyn/test/framework/TestSensorTest.java | 267 +++++++++++++++++++ .../test/framework/entity/TestEntity.java | 55 ++++ .../test/framework/entity/TestEntityImpl.java | 40 +++ .../resources/test-framework-examples/README.md | 9 + .../example-catalog-test.bom | 22 ++ .../test-framework-examples/example-catalog.bom | 15 ++ .../nginx-test-examples.yml | 98 +++++++ .../testhttpcall-examples.yml | 124 +++++++++ .../tomcat-test-examples.yml | 45 ++++ 26 files changed, 1667 insertions(+) ----------------------------------------------------------------------
