Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 23E889C20 for ; Sat, 4 Aug 2012 22:23:03 +0000 (UTC) Received: (qmail 6767 invoked by uid 500); 4 Aug 2012 22:23:03 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 6731 invoked by uid 500); 4 Aug 2012 22:23:03 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 6724 invoked by uid 99); 4 Aug 2012 22:23:03 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Aug 2012 22:23:03 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 04 Aug 2012 22:23:00 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B997F23889EB; Sat, 4 Aug 2012 22:22:16 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369495 - in /camel/branches/camel-2.9.x: ./ components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java Date: Sat, 04 Aug 2012 22:22:16 -0000 To: commits@camel.apache.org From: bvahdat@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120804222216.B997F23889EB@eris.apache.org> Author: bvahdat Date: Sat Aug 4 22:22:16 2012 New Revision: 1369495 URL: http://svn.apache.org/viewvc?rev=1369495&view=rev Log: Merged revisions 1369492 via svnmerge from https://svn.apache.org/repos/asf/camel/branches/camel-2.10.x ................ r1369492 | bvahdat | 2012-08-05 00:18:41 +0200 (So, 05 Aug 2012) | 9 lines Merged revisions 1369490 via svnmerge from https://svn.apache.org/repos/asf/camel/trunk ........ r1369490 | bvahdat | 2012-08-05 00:10:29 +0200 (So, 05 Aug 2012) | 1 line CAMEL-5485: More assert by MyBatisInsertWithRollbackTest. ........ ................ Modified: camel/branches/camel-2.9.x/ (props changed) camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Merged /camel/trunk:r1369490 Merged /camel/branches/camel-2.10.x:r1369492 Propchange: camel/branches/camel-2.9.x/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java URL: http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java?rev=1369495&r1=1369494&r2=1369495&view=diff ============================================================================== --- camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java (original) +++ camel/branches/camel-2.9.x/components/camel-mybatis/src/test/java/org/apache/camel/component/mybatis/MyBatisInsertWithRollbackTest.java Sat Aug 4 22:22:16 2012 @@ -33,6 +33,10 @@ public class MyBatisInsertWithRollbackTe template.sendBody("direct:start", null); assertMockEndpointsSatisfied(); + + // there should be still 2 rows + Integer rows = template.requestBody("mybatis:count?statementType=SelectOne", null, Integer.class); + assertEquals("There should be 2 rows", 2, rows.intValue()); } @Override