Merge branch 'master' into blueprint-for-app-spec
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/0781c103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/0781c103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/0781c103 Branch: refs/heads/master Commit: 0781c1032b11e894cdb437ee7b7facb927964288 Parents: 0049626 e2392c3 Author: Alex Heneveld <[email protected]> Authored: Wed Jan 13 22:34:46 2016 +0000 Committer: Alex Heneveld <[email protected]> Committed: Wed Jan 13 22:34:46 2016 +0000 ---------------------------------------------------------------------- brooklyn-docs/guide/yaml/test/index.md | 8 +- brooklyn-docs/guide/yaml/test/test-entities.md | 33 ++- .../brooklyn/test/framework/AbstractTest.java | 77 ----- .../brooklyn/test/framework/BaseTest.java | 31 +- .../InfrastructureDeploymentTestCase.java | 11 +- .../InfrastructureDeploymentTestCaseImpl.java | 52 +++- .../framework/LoopOverGroupMembersTestCase.java | 45 +++ .../LoopOverGroupMembersTestCaseImpl.java | 134 +++++++++ .../test/framework/ParallelTestCase.java | 4 +- .../test/framework/ParallelTestCaseImpl.java | 10 +- .../test/framework/SimpleShellCommandTest.java | 12 +- .../framework/SimpleShellCommandTestImpl.java | 39 +-- .../test/framework/TargetableTestComponent.java | 53 ++++ .../framework/TargetableTestComponentImpl.java | 83 ++++++ .../brooklyn/test/framework/TestCase.java | 4 +- .../brooklyn/test/framework/TestCaseImpl.java | 15 +- .../test/framework/TestEffectorImpl.java | 40 ++- .../test/framework/TestFrameworkAssertions.java | 11 +- .../test/framework/TestHttpCallImpl.java | 27 +- .../brooklyn/test/framework/TestSensorImpl.java | 20 +- .../test/framework/TestEffectorTest.java | 65 +++++ .../test/framework/entity/TestEntity.java | 3 + .../test/framework/entity/TestEntityImpl.java | 5 + ...infrastructuredeploymenttestcase-entity.yaml | 11 + .../entities/loopovergroupmembers-entity.yaml | 6 + .../InfrastructureDeploymentTestCaseTest.java | 267 +++++++++++++++++ .../LoopOverGroupMembersTestCaseTest.java | 286 +++++++++++++++++++ .../framework/entity/TestInfrastructure.java | 31 ++ .../entity/TestInfrastructureImpl.java | 46 +++ 29 files changed, 1232 insertions(+), 197 deletions(-) ----------------------------------------------------------------------
