From f66cd71b494f8f3eac4cb372f9720fed6fb1fe27 Mon Sep 17 00:00:00 2001
From: Richard Downer <richard.downer@cloudsoftcorp.com>
Date: Wed, 25 Apr 2012 19:35:04 +0300
Subject: [PATCH] WindowsClientLiveTest wasn't running due to lack of
 BouncyCastleCryptoModule and a problem with the test properties

---
 .../ec2/services/WindowsClientLiveTest.java      | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java
index 0b7cecc82b..5248538188 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/WindowsClientLiveTest.java
@@ -22,12 +22,15 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Properties;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import javax.annotation.Nullable;
 
+import com.google.inject.Module;
 import org.jclouds.compute.ComputeService;
 import org.jclouds.compute.domain.NodeMetadata;
 import org.jclouds.compute.domain.OsFamily;
@@ -41,6 +44,7 @@ import org.jclouds.ec2.compute.functions.WindowsLoginCredentialsFromEncryptedDat
 import org.jclouds.ec2.domain.InstanceType;
 import org.jclouds.ec2.domain.PasswordData;
 import org.jclouds.ec2.reference.EC2Constants;
+import org.jclouds.encryption.bouncycastle.config.BouncyCastleCryptoModule;
 import org.jclouds.predicates.RetryablePredicate;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
@@ -57,7 +61,7 @@ import com.google.common.collect.Iterables;
 @Test(groups = "live", singleThreaded = true, testName = "WindowsClientLiveTest")
 public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
    public WindowsClientLiveTest() {
-      provider = "ec2";
+      provider = "aws-ec2";
    }
 
    private ComputeService computeService;
@@ -80,7 +84,15 @@ public class WindowsClientLiveTest extends BaseComputeServiceContextLiveTest {
       computeService = view.getComputeService();
    }
 
-   
+   @Override
+   protected Iterable<Module> setupModules() {
+      Iterable<Module> superModules = super.setupModules();
+      List<Module> modules = new ArrayList<Module>();
+      Iterables.addAll(modules, superModules);
+      modules.add(new BouncyCastleCryptoModule());
+      return modules;
+   }
+
    @Test(enabled = false)
    // TODO get instance
    public void testBundleInstanceInRegion() {