[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6670] trunk/sql12/ squirrelsql-integration-environment/src/test/java/net/sourceforge/ squirrel_sql

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

Revision: 6670
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6670&view=rev
Author:   manningr
Date:     2012-09-30 18:17:08 +0000 (Sun, 30 Sep 2012)
Log Message:
-----------
Fixed test.

Modified Paths:
--------------
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java
    trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java

Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java	2012-09-30 18:05:30 UTC (rev 6669)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/client/session/mainpanel/objecttree/tabs/AbstractBaseObjectTabExternalTest.java	2012-09-30 18:17:08 UTC (rev 6670)
@@ -56,7 +56,11 @@
 			dboi = Mockito.mock(IDatabaseObjectInfo.class);
 			Mockito.when(dboi.getSchemaName()).thenReturn(getSchemaName());
 			Mockito.when(dboi.getSimpleName()).thenReturn(getSimpleName());
-			Mockito.when(dboi.getQualifiedName()).thenReturn(getSchemaName() + "." + getSimpleName());
+			if (getSchemaName() != null) {
+				Mockito.when(dboi.getQualifiedName()).thenReturn(getSchemaName() + "." + getSimpleName());
+			} else {
+				Mockito.when(dboi.getQualifiedName()).thenReturn(getSimpleName());
+			}
 		}
 		con = session.getSQLConnection().getConnection();
 		classUnderTest.setSession(session);

Modified: trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java
===================================================================
--- trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java	2012-09-30 18:05:30 UTC (rev 6669)
+++ trunk/sql12/squirrelsql-integration-environment/src/test/java/net/sourceforge/squirrel_sql/plugins/mysql/tab/UserGrantsTabExternalTest.java	2012-09-30 18:17:08 UTC (rev 6670)
@@ -26,9 +26,17 @@
 {
 	
 	protected String getSimpleName() {
-		return "dbcopydest";
+		return "root";
 	}
 	
+	@Override
+	protected String getSchemaName()
+	{
+		return null;
+	}
+
+
+
 	protected BaseObjectTab getTabToTest() {
 		return new UserGrantsTab();
 	}

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