From commits-return-4499-apmail-jmeter-commits-archive=jmeter.apache.org@jmeter.apache.org Tue Dec 15 20:52:35 2015 Return-Path: X-Original-To: apmail-jmeter-commits-archive@minotaur.apache.org Delivered-To: apmail-jmeter-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 266131838F for ; Tue, 15 Dec 2015 20:52:35 +0000 (UTC) Received: (qmail 76239 invoked by uid 500); 15 Dec 2015 20:52:35 -0000 Delivered-To: apmail-jmeter-commits-archive@jmeter.apache.org Received: (qmail 76213 invoked by uid 500); 15 Dec 2015 20:52:35 -0000 Mailing-List: contact commits-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list commits@jmeter.apache.org Received: (qmail 76204 invoked by uid 99); 15 Dec 2015 20:52:35 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2015 20:52:35 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 83E45C0481 for ; Tue, 15 Dec 2015 20:52:34 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.446 X-Spam-Level: X-Spam-Status: No, score=0.446 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id Sk5d7UkSVvnx for ; Tue, 15 Dec 2015 20:52:33 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with ESMTP id B44DA2663A for ; Tue, 15 Dec 2015 20:52:33 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id 0DBB7E0044 for ; Tue, 15 Dec 2015 20:52:32 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id BFFD13A0702 for ; Tue, 15 Dec 2015 20:52:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1720246 - /jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java Date: Tue, 15 Dec 2015 20:52:32 -0000 To: commits@jmeter.apache.org From: fschumacher@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151215205232.BFFD13A0702@svn01-us-west.apache.org> Author: fschumacher Date: Tue Dec 15 20:52:32 2015 New Revision: 1720246 URL: http://svn.apache.org/viewvc?rev=1720246&view=rev Log: We can use flush on CsvSampleWriter instead of replacing the writer. Followup to r1720242 Modified: jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java Modified: jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java?rev=1720246&r1=1720245&r2=1720246&view=diff ============================================================================== --- jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java (original) +++ jmeter/trunk/test/src/org/apache/jmeter/report/core/TestCsvSampleWriter.java Tue Dec 15 20:52:32 2015 @@ -17,14 +17,13 @@ */ package org.apache.jmeter.report.core; -import java.io.IOException; import java.io.StringWriter; import java.io.Writer; -import org.apache.jmeter.util.JMeterUtils; - import junit.framework.TestCase; +import org.apache.jmeter.util.JMeterUtils; + public class TestCsvSampleWriter extends TestCase { protected void setUp() throws Exception { @@ -50,18 +49,11 @@ public class TestCsvSampleWriter extends CsvSampleWriter csvWriter = new CsvSampleWriter(writer, metadata)) { csvWriter.writeHeader(); - // need to replace the writer to flush the original one - replaceWriter(csvWriter); + csvWriter.flush(); assertEquals("a,b\n", writer.toString()); } } - private void replaceWriter(CsvSampleWriter csvWriter) throws IOException { - try (Writer replacement = new StringWriter()) { - csvWriter.setWriter(replacement); - } - } - public void testWriteWithoutWriter() throws Exception { try (CsvSampleWriter csvWriter = new CsvSampleWriter(metadata)) { Sample sample = new SampleBuilder(metadata).add("a1").add("b1") @@ -95,8 +87,7 @@ public class TestCsvSampleWriter extends Sample sample = new SampleBuilder(metadata).add("a1").add("b1") .build(); csvWriter.write(sample); - // need to replace the writer to flush the original one - replaceWriter(csvWriter); + csvWriter.flush(); assertEquals("a1,b1\n", writer.toString()); } }