Rebuild cfmongodb.jar; update AggregationTest for new class of Aggreg…

…ation Exception; update DBCollectionTest with Adobe CF compatible syntax
marcesher · May 23, 2013 · a24c3ef · a24c3ef
1 parent 28244dc
commit a24c3ef
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/.classpath b/.classpath
@@ -2,6 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="java/src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/mongo-2.10.1.jar"/>
+	<classpathentry kind="lib" path="lib/mongo-java-driver-2.11.1.jar"/>
 	<classpathentry kind="output" path="java/bin"/>
 </classpath>
diff --git a/lib/cfmongodb.jar b/lib/cfmongodb.jar
diff --git a/test/AggregationTest.cfc b/test/AggregationTest.cfc
@@ -197,7 +197,7 @@ import cfmongodb.core.*;
 	}
 
 	/**
-	* @mxunit:expectedException com.mongodb.CommandResult$CommandFailure
+	* @mxunit:expectedException com.mongodb.CommandFailureException
 	*/
 	function aggregate_throws_error_with_bad_command(){
 		var op =  { "group"={ "_id"="$STATUS", "total"={ "$sum"=1 } } };

diff --git a/test/DBCollectionTest.cfc b/test/DBCollectionTest.cfc
@@ -559,10 +559,10 @@ import cfmongodb.core.*;
 	/*    SISTER DB TEST   */
 	function getSiblingDB_returns_collection_from_sibling_db(){
 		var testdocs = [
-			{ "name":"test1" },
+			{ "name"="test1" },
-			{ "name":"test2" },
+			{ "name"="test2" },
-			{ "name":"test3" },
+			{ "name"="test3" },
-			{ "name":"test4" }
+			{ "name"="test4" }
 		];
 
 		// insert test docs into sibling database's collection
@@ -571,9 +571,9 @@ import cfmongodb.core.*;
 		local.thiscount = dbSiblingCol.count();
 		local.siblingcount = siblingdbSiblingCol.count();
 
-		assertTrue(local.thiscount eq 0, "Local sibling collection should have no docs, has #local.thiscount#.")
+		assertTrue(local.thiscount eq 0, "Local sibling collection should have no docs, has #local.thiscount#.");
-		assertTrue(local.siblingcount eq 4, "Sibling collection should have 4 docs, has #local.siblingcount#.")
+		assertTrue(local.siblingcount eq 4, "Sibling collection should have 4 docs, has #local.siblingcount#.");
-		assertTrue(local.thiscount neq local.siblingcount, "Local sibling collection should have no docs, sibling should have 4.")
+		assertTrue(local.thiscount neq local.siblingcount, "Local sibling collection should have no docs, sibling should have 4.");
 	}