Return-Path: Delivered-To: apmail-db-torque-dev-archive@www.apache.org Received: (qmail 61762 invoked from network); 18 Dec 2006 10:04:44 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 18 Dec 2006 10:04:44 -0000 Received: (qmail 52926 invoked by uid 500); 18 Dec 2006 10:04:47 -0000 Delivered-To: apmail-db-torque-dev-archive@db.apache.org Received: (qmail 52808 invoked by uid 500); 18 Dec 2006 10:04:46 -0000 Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Apache Torque Developers List" Reply-To: "Apache Torque Developers List" Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 52797 invoked by uid 500); 18 Dec 2006 10:04:46 -0000 Received: (qmail 52794 invoked by uid 99); 18 Dec 2006 10:04:46 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Dec 2006 02:04:46 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 18 Dec 2006 02:04:38 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id BF8A41A981A; Mon, 18 Dec 2006 02:03:50 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r488187 - /db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java Date: Mon, 18 Dec 2006 10:03:50 -0000 To: torque-commits@db.apache.org From: tfischer@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061218100350.BF8A41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: tfischer Date: Mon Dec 18 02:03:49 2006 New Revision: 488187 URL: http://svn.apache.org/viewvc?view=rev&rev=488187 Log: improved the shutdown test case in the test project to see whether reinitialisation is possible. Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java Modified: db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java URL: http://svn.apache.org/viewvc/db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java?view=diff&rev=488187&r1=488186&r2=488187 ============================================================================== --- db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java (original) +++ db/torque/test/trunk/test-project/src/java/org/apache/torque/DataTest.java Mon Dec 18 02:03:49 2006 @@ -1777,12 +1777,36 @@ } /** - * Tests whether shutdown complains about anything - * @throws TorqueException if shutdown does not exit cleanly + * Tests whether shutdown works correctly and whether reinitialisation + * is possible after shutdown. + * @throws TorqueException if shutdown does not exit cleanly. */ - public void testShutdown() throws TorqueException + public void testShutdown() throws Exception { Torque.shutdown(); + + try + { + Torque.getDatabase(Torque.getDefaultDB()); + fail("database access should not be possible " + + "when Torque is shutdown()"); + } + catch (TorqueException e) + { + } + + Torque.init(System.getProperty(CONFIG_FILE_SYSTEM_PROPERTY)); + + cleanBookstore(); + Author author = new Author(); + author.setName("shutdownName"); + author.save(); + List authors = AuthorPeer.doSelect(new Criteria()); + assertEquals("List should contain one author", 1, authors.size()); + author = (Author) authors.get(0); + assertEquals("Author's name should be shutdownName", + "shutdownName", + author.getName()); } /** --------------------------------------------------------------------- To unsubscribe, e-mail: torque-dev-unsubscribe@db.apache.org For additional commands, e-mail: torque-dev-help@db.apache.org