Revision: 6341
http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6341&view=rev
Author: wis775
Date: 2011-08-05 17:54:59 +0000 (Fri, 05 Aug 2011)
Log Message:
-----------
Fixed NPE: Sometimes, the table name is null. E.g if the select statement contains a union clause.
Added Paths:
-----------
trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinitionTest.java
Added: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinitionTest.java
===================================================================
--- trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinitionTest.java (rev 0)
+++ trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinitionTest.java 2011-08-05 17:54:59 UTC (rev 6341)
@@ -0,0 +1,88 @@
+/*
+ * Copyright (C) 2011 Stefan Willinger
+ * wi...@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
+ */
+package net.sourceforge.squirrel_sql.fw.datasetviewer;
+
+import static org.easymock.EasyMock.expect;
+import static org.junit.Assert.*;
+
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.ResultSetMetaData;
+
+import net.sourceforge.squirrel_sql.BaseSQuirreLJUnit4TestCase;
+import net.sourceforge.squirrel_sql.fw.dialects.DialectType;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import utils.EasyMockHelper;
+
+/**
+ * Some tests for a {@link ColumnDisplayDefinition}
+ * @author Stefan Willinger
+ *
+ */
+public class ColumnDisplayDefinitionTest extends BaseSQuirreLJUnit4TestCase {
+
+ private ColumnDisplayDefinition classUnderTest = null;
+
+ private EasyMockHelper mockHelper = new EasyMockHelper();
+
+ private ResultSet resultSet = mockHelper.createMock(ResultSet.class);
+ private ResultSetMetaData resultSetMetaData = mockHelper.createMock(ResultSetMetaData.class);
+
+ @Before
+ public void setUp() throws Exception {
+ expect(resultSet.getMetaData()).andStubReturn(resultSetMetaData);
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ mockHelper.resetAll();
+ }
+
+ /**
+ * Test to be sure that a {@link ColumnDisplayDefinition} can handle a
+ * {@link ResultSetMetaData} with <code>null</code> as a table name.
+ */
+ @Test
+ public void testNullAsTableName() throws Exception {
+ expect(resultSetMetaData.getTableName(0)).andStubReturn(null);
+ expect(resultSetMetaData.getColumnTypeName(0)).andStubReturn("typeName");
+ expect(resultSetMetaData.getColumnLabel(0)).andStubReturn("label");
+ expect(resultSetMetaData.getColumnName(0)).andStubReturn("name");
+ expect(resultSetMetaData.getColumnType(0)).andStubReturn(0);
+ expect(resultSetMetaData.getColumnDisplaySize(0)).andStubReturn(0);
+
+ expect(resultSetMetaData.getPrecision(0)).andStubReturn(0);
+ expect(resultSetMetaData.getScale(0)).andStubReturn(0);
+ expect(resultSetMetaData.isSigned(0)).andStubReturn(false);
+ expect(resultSetMetaData.isCurrency(0)).andStubReturn(false);
+ expect(resultSetMetaData.isAutoIncrement(0)).andStubReturn(false);
+ expect(resultSetMetaData.isNullable(0)).andStubReturn(0);
+
+ mockHelper.replayAll();
+ classUnderTest = new ColumnDisplayDefinition(resultSet, 0, DialectType.ORACLE);
+
+ assertEquals("null:name", classUnderTest.getFullTableColumnName());
+ mockHelper.verifyAll();
+ }
+
+}
Property changes on: trunk/sql12/fw/src/test/java/net/sourceforge/squirrel_sql/fw/datasetviewer/ColumnDisplayDefinitionTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
