modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip |binary modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js | 8 +++----- modules/common/filetemplate-bundle/src/test/java/org/rhq/bundle/filetemplate/recipe/RecipeParserTest.java | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-)

New commits: commit 9a824f3a4901eb40209f3650a35b9169117d7beb Author: Jay Shaughnessy jshaughn@redhat.com Date: Fri Apr 30 17:13:49 2010 -0400

Fix vars in recipe to the new format and also make use of the new rhq.deploy.dir property.

diff --git a/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip b/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip index 7e0e7b1..a431142 100644 Binary files a/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip and b/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip differ diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js index a77983d..4ceed3b 100644 --- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js +++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js @@ -58,12 +58,10 @@ function testGroupDeployment() {

// create the config, setting the required properties from the recipe var config = new Configuration(); - var property = new PropertySimple("dummy.deployHome", "/tmp/bundle-test"); + var property = new PropertySimple("dummy.name", "NAME REPLACED HERE!!!"); + config.put( property ); + var property = new PropertySimple("dummy.description", "FLOPPY!!!"); config.put( property ); - var property2 = new PropertySimple("dummy.name", "NAME REPLACED HERE!!!"); - config.put( property2 ); - var property3 = new PropertySimple("dummy.description", "FLOPPY!!!"); - config.put( property3 );

// create a deployment using the above config var testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(), "Deployment Test", "Deployment Test of dummy ZIP", "/tmp/bundle-test", config); diff --git a/modules/common/filetemplate-bundle/src/test/java/org/rhq/bundle/filetemplate/recipe/RecipeParserTest.java b/modules/common/filetemplate-bundle/src/test/java/org/rhq/bundle/filetemplate/recipe/RecipeParserTest.java index dda85f4..16054e0 100644 --- a/modules/common/filetemplate-bundle/src/test/java/org/rhq/bundle/filetemplate/recipe/RecipeParserTest.java +++ b/modules/common/filetemplate-bundle/src/test/java/org/rhq/bundle/filetemplate/recipe/RecipeParserTest.java @@ -260,11 +260,11 @@ public class RecipeParserTest { RecipeContext context = new RecipeContext(getRecipe()); parser.parseRecipe(context); Map<String, String> files = context.getDeployFiles(); - assert files.get("jboss1.tar").equals(System.getProperty("java.io.tmpdir")) : files; - assert files.get("jboss2.tar").equals(System.getProperty("file.separator")) : files; + assert files.get("jboss1.tar").equals(System.getProperty("java.io.tmpdir").replace('\', '/')) : files; + assert files.get("jboss2.tar").equals(System.getProperty("file.separator").replace('\', '/')) : files; //assert files.get("jboss3.tar").equals(System.getProperty("line.separator")) : files; assert files.get("jboss4.tar").equals(System.getProperty("path.separator")) : files; - assert files.get("jboss5.tar").equals(System.getProperty("java.home")) : files; + assert files.get("jboss5.tar").equals(System.getProperty("java.home").replace('\', '/')) : files; assert files.get("jboss6.tar").equals(System.getProperty("java.version")) : files; //assert files.get("jboss7.tar").equals(System.getProperty("user.timezone")) : files; //assert files.get("jboss8.tar").equals(System.getProperty("user.region")) : files;