Return-Path: Delivered-To: apmail-maven-surefire-commits-archive@www.apache.org Received: (qmail 77512 invoked from network); 11 Feb 2008 23:24:46 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 11 Feb 2008 23:24:46 -0000 Received: (qmail 21127 invoked by uid 500); 11 Feb 2008 23:24:40 -0000 Delivered-To: apmail-maven-surefire-commits-archive@maven.apache.org Received: (qmail 21098 invoked by uid 500); 11 Feb 2008 23:24:40 -0000 Mailing-List: contact surefire-commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: surefire-dev@maven.apache.org Delivered-To: mailing list surefire-commits@maven.apache.org Received: (qmail 21087 invoked by uid 99); 11 Feb 2008 23:24:40 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 11 Feb 2008 15:24:40 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED 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, 11 Feb 2008 23:24:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 829821A9832; Mon, 11 Feb 2008 15:24:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r620666 - /maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java Date: Mon, 11 Feb 2008 23:24:24 -0000 To: surefire-commits@maven.apache.org From: dfabulich@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080211232425.829821A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dfabulich Date: Mon Feb 11 15:24:22 2008 New Revision: 620666 URL: http://svn.apache.org/viewvc?rev=620666&view=rev Log: Don't dump output files in USER_DIR; put them in the target directory instead. Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java Modified: maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java URL: http://svn.apache.org/viewvc/maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java?rev=620666&r1=620665&r2=620666&view=diff ============================================================================== --- maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java (original) +++ maven/surefire/trunk/surefire-booter/src/test/java/org/apache/maven/surefire/booter/output/FileOutputConsumerProxyTest.java Mon Feb 11 15:24:22 2008 @@ -38,18 +38,22 @@ { private static final String USER_DIR = System.getProperty( "user.dir" ); + File targetDir; protected void setUp() throws Exception { super.setUp(); - setOutputConsumer( new FileOutputConsumerProxy( (OutputConsumer) getOutputConsumerMock().proxy() ) ); + targetDir = new File ( USER_DIR, "target" ); + if ( !targetDir.exists() ) targetDir = new File( USER_DIR ); + setOutputConsumer( new FileOutputConsumerProxy( (OutputConsumer) getOutputConsumerMock().proxy(), targetDir ) ); } public void testConsumeOutputLine() throws Exception { - File reportFile = new File( USER_DIR, getReportEntry().getName() + "-output.txt" ); + + File reportFile = new File( targetDir, getReportEntry().getName() + "-output.txt" ); reportFile.delete(); getOutputConsumerMock().expects( new InvokeOnceMatcher() ).method( "testSetStarting" )