| Home Site |
@@ -346,4 +346,4 @@
margin-bottom: 0;
font-size: 12px;
}
-
\ No newline at end of file
+
diff --git a/tests/doctrine/DoctrineCleanInsert1Test.php b/tests/doctrine/DoctrineCleanInsert1Test.php
index 036df09a9..73518383e 100644
--- a/tests/doctrine/DoctrineCleanInsert1Test.php
+++ b/tests/doctrine/DoctrineCleanInsert1Test.php
@@ -182,11 +182,11 @@ public function testShowDoctrineReadFailiureUntilCommitted(){
$this->em->persist($site);
// After persist, Doctrine querying does not return our site until we flush, hence we get 0
// returned from our repository.
- $this->assertEquals(0, count($this->em->getRepository('Site')->findOneBy(array('shortName' => 'site' . $n))));
+ $this->assertEquals(0, count($this->em->getRepository('Site')->findBy(array('shortName' => 'site' . $n))));
// When we flush or commit we get one.
$this->em->commit();
$this->em->flush();
- $this->assertEquals(1, count($this->em->getRepository('Site')->findOneBy(array('shortName' => 'site' . $n))));
+ $this->assertEquals(1, count($this->em->getRepository('Site')->findBy(array('shortName' => 'site' . $n))));
}
@@ -464,7 +464,7 @@ public function testRollback() {
* first have to delete the services that holds the FK to the site (one site
* to many services).
*
- * @expectedException \Doctrine\DBAL\DBALException
+ * @expectedException \Doctrine\DBAL\Exception
*/
public function testExpectedFK_ViolationOnSiteDeleteWithoutCascade(){
print __METHOD__ . "\n";
@@ -496,7 +496,7 @@ public function testExpectedFK_ViolationOnSiteDeleteWithoutCascade(){
// services first as we have no cascade-delete option set.
$this->em->remove($refetchedSite);
$this->em->flush();
- $this->fail('Should not get to this point - DBALException expected');
+ $this->fail('Should not get to this point - \Doctrine\DBAL\Exception expected');
}
@@ -659,7 +659,7 @@ public function testServiceToEndpointCascadeDelete_WithNoDTs(){
* association to a downtime (this relationship would need to be deleted first
* to allow the endpoint to be deleted cleanly by the cascade).
*
- * @expectedException \Doctrine\DBAL\DBALException
+ * @expectedException \Doctrine\DBAL\Exception
*/
public function testExpectedFK_ViolationOnServiceToEndpointCascadeDelete_WithDTs(){
print __METHOD__ . "\n";
@@ -707,7 +707,7 @@ public function testExpectedFK_ViolationOnServiceToEndpointCascadeDelete_WithDTs
// services first as we have no cascade-delete option set.
$this->em->remove($se);
$this->em->flush();
- $this->fail('Should not get to this point - DBALException expected');
+ $this->fail('Should not get to this point - \Doctrine\DBAL\Exception expected');
}
/**
diff --git a/tests/doctrine/RolesTest.php b/tests/doctrine/RolesTest.php
index 7018c42e9..3ae280f13 100644
--- a/tests/doctrine/RolesTest.php
+++ b/tests/doctrine/RolesTest.php
@@ -194,7 +194,7 @@ public function testRoleDiscriminatorNGI() {
* Add a role type, user, NGI and a role linking
* them all together. Assert that $newRole->getOwnedEntity()
* returns an instance of NGI.
- * @expectedException \Doctrine\DBAL\DBALException
+ * @expectedException \Doctrine\DBAL\Exception
*/
public function testRoleTypeIntegrityConstraint() {
print __METHOD__ . "\n";
@@ -226,7 +226,7 @@ public function testRoleTypeIntegrityConstraint() {
/**
* Ensure no duplicate role types are inserted
- * @expectedException \Doctrine\DBAL\DBALException
+ * @expectedException \Doctrine\DBAL\Exception
*/
public function testDuplicateRoleTypes() {
print __METHOD__ . "\n";
diff --git a/tests/phpunit.xml b/tests/phpunit.xml
index 8858faf55..f7e4fbc8d 100644
--- a/tests/phpunit.xml
+++ b/tests/phpunit.xml
@@ -9,12 +9,12 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
- * @author David Meredith
+ *
+ * @author David Meredith
*/-->
-
-
+
-
-
+ to do so. We have to be selective on which tests to write for which packages.
+ -->
../lib/Doctrine/entities/
../lib/DAOs/
@@ -71,5 +71,5 @@ PHPUnit configuration file for tests.
-
-
\ No newline at end of file
+
+
|