DATACOUCH-19 - Further test tweaks.

src/test/java/org/springframework/data/couchbase/core/CouchbaseTemplateTests.java

@@ -95,7 +95,7 @@ public class CouchbaseTemplateTests {
   public void insertDoesNotOverride() {
     String id ="double-insert-test";
     String expected = "{\"_class\":\"org.springframework.data.couchbase.core."
-      + "CouchbaseTemplateTest$SimplePerson\",\"name\":\"Mr. A\"}";
+      + "CouchbaseTemplateTests$SimplePerson\",\"name\":\"Mr. A\"}";
 
     SimplePerson doc = new SimplePerson(id, "Mr. A");
     template.insert(doc);
@@ -150,7 +150,7 @@ public class CouchbaseTemplateTests {
     template.save(complex);
 
     String expected = "{\"_class\":\"org.springframework.data.couchbase.core."
-      + "CouchbaseTemplateTest$ComplexPerson\",\"info1\":{\"foo\":true,\"bar\""
+      + "CouchbaseTemplateTests$ComplexPerson\",\"info1\":{\"foo\":true,\"bar\""
       + ":false},\"votes\":[],\"firstnames\":[\"Michael\",\"Thomas\"],\"info2\":"
       + "{}}";
     assertEquals(expected, client.get(id));

src/test/java/org/springframework/data/couchbase/util/BucketManager.java

@@ -36,7 +36,7 @@ import java.util.Map.Entry;
  */
 public class BucketManager extends SpyObject {
 
-  private static final long TIMEOUT = 2000;
+  private static final long TIMEOUT = 15000;
   private static final long SLEEP_TIME = 1000;
 
   private final ClusterManager manager;