Fix cleanup if sharding is true

rozza · rozza · commit 153dc3811fa8 · 2014-08-19T09:57:03.000+01:00
diff --git a/driver-async/src/test/functional/com/mongodb/async/client/DatabaseAdministrationSpecification.groovy b/driver-async/src/test/functional/com/mongodb/async/client/DatabaseAdministrationSpecification.groovy
@@ -64,6 +64,6 @@ class DatabaseAdministrationSpecification extends FunctionalSpecification {
         database.tools().getCollectionNames().get().contains(newCollectionName)
 
         cleanup:
-        dropDatabase(database.getName())
+        if (database) { dropDatabase(database.getName()) }
     }
 }
diff --git a/driver-rx/src/test/functional/com/mongodb/async/rx/client/DatabaseAdministrationSpecification.groovy b/driver-rx/src/test/functional/com/mongodb/async/rx/client/DatabaseAdministrationSpecification.groovy
@@ -68,7 +68,7 @@ class DatabaseAdministrationSpecification extends FunctionalSpecification {
         getAsList(database.tools().getCollectionNames()).contains(newCollectionName)
 
         cleanup:
-        dropDatabase(database.getName())
+        if (database) { dropDatabase(database.getName()) }
     }
 
 }

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,6 @@ class DatabaseAdministrationSpecification extends FunctionalSpecification {`
`64`	`64`	`database.tools().getCollectionNames().get().contains(newCollectionName)`
`65`	`65`
`66`	`66`	`cleanup:`
`67`		`- dropDatabase(database.getName())`
	`67`	`+ if (database) { dropDatabase(database.getName()) }`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ class DatabaseAdministrationSpecification extends FunctionalSpecification {`
`68`	`68`	`getAsList(database.tools().getCollectionNames()).contains(newCollectionName)`
`69`	`69`
`70`	`70`	`cleanup:`
`71`		`- dropDatabase(database.getName())`
	`71`	`+ if (database) { dropDatabase(database.getName()) }`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`}`