[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5923] trunk/sql12/fw/src

[<man...@us...>]

Revision: 5923
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5923&view=rev
Author:   manningr
Date:     2010-10-16 17:44:40 +0000 (Sat, 16 Oct 2010)

Log Message:
-----------
Bug 3088284 (CSV export doesn't escape quotes): Thanks to wolfgang22 for the patch.

Modified Paths:
--------------
    trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java

Added Paths:
-----------
    trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/
    trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java

Modified: trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java
===================================================================
--- trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java	2010-10-16 17:02:32 UTC (rev 5922)
+++ trunk/sql12/fw/src/main/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommand.java	2010-10-16 17:44:40 UTC (rev 5923)
@@ -609,7 +609,7 @@
       {
          String ret = cellObj.toString().trim();
 
-         if(0 <= ret.indexOf(sepChar) || 0 <= ret.indexOf('\n'))
+         if(0 <= ret.indexOf(sepChar) || 0 <= ret.indexOf('\n') || 0 <= ret.indexOf('"'))
          {
             ret = "\"" + ret.replaceAll("\"", "\"\"") + "\"";
          }

Added: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java	                        (rev 0)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/gui/action/TableExportCsvCommandTest.java	2010-10-16 17:44:40 UTC (rev 5923)
@@ -0,0 +1,64 @@
+package net.sourceforge.squirrel_sql.fw.gui.action;
+
+/*
+ * Copyright (C) 2010 Rob Manning
+ * man...@us...
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+import static org.junit.Assert.assertEquals;
+
+import java.lang.reflect.Method;
+
+import javax.swing.JTable;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+@RunWith(MockitoJUnitRunner.class)
+public class TableExportCsvCommandTest
+{
+
+	private final String TEST_DATA = "Super \"Luxurious\" Truck";
+	
+	// See http://en.wikipedia.org/wiki/Comma-separated_values#Basic_rules for proper quote handling definition
+	private final String TEST_DATA_PROPERLY_QUOTED = "\"Super \"\"Luxurious\"\" Truck\"";  
+	
+	private TableExportCsvCommand classUnderTest = null;
+	
+	@Mock
+	private JTable mockJTable;
+	
+	@Before
+	public void setup() {
+		classUnderTest = new TableExportCsvCommand(mockJTable);
+	}
+	
+	
+	@Test
+	public void testGetDataCSVProperQuoteHandling() throws Exception
+	{
+		Method m = TableExportCsvCommand.class.getDeclaredMethod("getDataCSV", String.class, Object.class);
+		m.setAccessible(true);
+		String separatorChar = ",";
+		String result = (String) m.invoke(classUnderTest, separatorChar, TEST_DATA);
+		assertEquals(TEST_DATA_PROPERLY_QUOTED, result);
+	}
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.