Revision: 3737
Author: [email protected]
Date: Wed Jul 14 14:56:34 2010
Log: Fixed some failing tests resulting from the change to loading, and
added in a new window icon.
http://code.google.com/p/power-architect/source/detail?r=3737
Added:
/trunk/src/main/resources/icons/new_window16.png
Modified:
/trunk/regress/ca/sqlpower/architect/TestingArchitectSessionContext.java
/trunk/regress/ca/sqlpower/architect/etl/kettle/CreateKettleJobTest.java
/trunk/regress/ca/sqlpower/architect/swingui/ArchitectSwingSessionImplTest.java
/trunk/regress/ca/sqlpower/architect/swingui/TestSwingUIProject.java
/trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
=======================================
--- /dev/null
+++ /trunk/src/main/resources/icons/new_window16.png Wed Jul 14 14:56:34
2010
Binary file, no diff available.
=======================================
---
/trunk/regress/ca/sqlpower/architect/TestingArchitectSessionContext.java
Mon Feb 8 14:34:01 2010
+++
/trunk/regress/ca/sqlpower/architect/TestingArchitectSessionContext.java
Wed Jul 14 14:56:34 2010
@@ -19,6 +19,7 @@
package ca.sqlpower.architect;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Collection;
@@ -36,9 +37,13 @@
public class TestingArchitectSessionContext implements
ArchitectSessionContext {
- private DataSourceCollection<JDBCDataSource> emptyPlDotIni = new
SpecificDataSourceCollection<JDBCDataSource>(new PlDotIni(),
JDBCDataSource.class);
+ private DataSourceCollection<JDBCDataSource> plDotIni = new
SpecificDataSourceCollection<JDBCDataSource>(new PlDotIni(),
JDBCDataSource.class);
private Preferences prefs =
Preferences.userNodeForPackage(ArchitectSwingSessionContextImpl.class);
+ public TestingArchitectSessionContext() throws IOException {
+ plDotIni.read(new File("default_database_types.regression.ini"));
+ }
+
public ArchitectSession createSession() throws SQLObjectException {
return new ArchitectSessionImpl(this, "Test");
}
@@ -54,7 +59,7 @@
}
public DataSourceCollection<JDBCDataSource> getPlDotIni() {
- return emptyPlDotIni ;
+ return plDotIni ;
}
public String getPlDotIniPath() {
=======================================
---
/trunk/regress/ca/sqlpower/architect/etl/kettle/CreateKettleJobTest.java
Mon Dec 21 11:04:05 2009
+++
/trunk/regress/ca/sqlpower/architect/etl/kettle/CreateKettleJobTest.java
Wed Jul 14 14:56:34 2010
@@ -341,19 +341,19 @@
assertEquals(architectDS.getUser(), dbMeta.getUsername());
}
- public void testOutputToRepositoryOverwrite() throws SQLException,
KettleException {
+ public void testOutputToRepositoryOverwrite() throws Exception {
testOutputToRepository(UserPromptResponse.OK);
}
- public void testOutputToRepositoryDontOverwrite() throws SQLException,
KettleException {
+ public void testOutputToRepositoryDontOverwrite() throws Exception {
testOutputToRepository(UserPromptResponse.NOT_OK);
}
- public void testOutputToRepositoryCancel() throws SQLException,
KettleException {
+ public void testOutputToRepositoryCancel() throws Exception {
testOutputToRepository(UserPromptResponse.CANCEL);
}
- private void testOutputToRepository(final UserPromptResponse fvr)
throws SQLException, KettleException{
+ private void testOutputToRepository(final UserPromptResponse fvr)
throws Exception {
TransMeta transMeta = createTransMeta();
JobMeta job = createJobMeta();
=======================================
---
/trunk/regress/ca/sqlpower/architect/swingui/ArchitectSwingSessionImplTest.java
Mon Jul 12 08:21:11 2010
+++
/trunk/regress/ca/sqlpower/architect/swingui/ArchitectSwingSessionImplTest.java
Wed Jul 14 14:56:34 2010
@@ -23,6 +23,7 @@
import java.beans.PropertyChangeEvent;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
+import java.io.File;
import java.io.IOException;
import java.sql.Types;
import java.util.Collections;
@@ -171,7 +172,9 @@
((ArchitectSwingSessionImpl) session).setUserPrompterFactory(new
DefaultUserPrompterFactory());
ByteArrayInputStream r = new
ByteArrayInputStream(testData.getBytes());
- session.getProjectLoader().load(r, new PlDotIni());
+ PlDotIni plDotIni = new PlDotIni();
+ plDotIni.read(new File("default_database_types.regression.ini"));
+ session.getProjectLoader().load(r, plDotIni);
assertFalse(session.isNew());
}
@@ -216,9 +219,12 @@
public void testSaveAndLoadRelationshipLineType() throws Exception {
ArchitectSwingSessionContext context = new StubContext();
+ PlDotIni plDotIni = new PlDotIni();
+ plDotIni.read(new File("default_database_types.regression.ini"));
+
ArchitectSwingSession session = context.createSession();
((ArchitectSwingSessionImpl) session).setUserPrompterFactory(new
DefaultUserPrompterFactory());
- session.getProjectLoader().load(new
ByteArrayInputStream(testData.getBytes()), new PlDotIni());
+ session.getProjectLoader().load(new
ByteArrayInputStream(testData.getBytes()), plDotIni);
boolean newValueForStraightLines
= !session.getRelationshipLinesDirect();
session.setRelationshipLinesDirect(newValueForStraightLines);
@@ -228,7 +234,7 @@
ArchitectSwingSession loadedSession = context.createSession();
((ArchitectSwingSessionImpl)
loadedSession).setUserPrompterFactory(new DefaultUserPrompterFactory());
- loadedSession.getProjectLoader().load(new
ByteArrayInputStream(out.toByteArray()), new PlDotIni());
+ loadedSession.getProjectLoader().load(new
ByteArrayInputStream(out.toByteArray()), plDotIni);
assertEquals(newValueForStraightLines,
loadedSession.getRelationshipLinesDirect());
for (Relationship r :
loadedSession.getPlayPen().getContentPane().getChildren(Relationship.class))
{
=======================================
--- /trunk/regress/ca/sqlpower/architect/swingui/TestSwingUIProject.java
Mon Jul 12 08:21:11 2010
+++ /trunk/regress/ca/sqlpower/architect/swingui/TestSwingUIProject.java
Wed Jul 14 14:56:34 2010
@@ -124,6 +124,7 @@
session = context.createSession();
project = session.getProjectLoader();
plIni = new PlDotIni();
+ plIni.read(new File("default_database_types.regression.ini"));
// TODO add some database types and a test that loading the
project finds them
}
@@ -659,6 +660,8 @@
ppdb.addChild(table);
table.addColumn(target);
+
target.getUserDefinedSQLType().setUpstreamType(plIni.getSQLType("NUMERIC"));
+
Set<String> propertiesToIgnore = getPropertiesToIgnore();
propertiesToIgnore.add("parentTable");
propertiesToIgnore.add("undoEventListeners");
@@ -669,6 +672,7 @@
propertiesToIgnore.add("precisionType");
propertiesToIgnore.add("scaleType");
propertiesToIgnore.add("platform");
+ propertiesToIgnore.add("type");
propertiesToIgnore.add("childrenWithoutPopulating");
propertiesToIgnore.add("variableResolver");
@@ -724,6 +728,7 @@
ca.sqlpower.testutil.TestUtils.getAllInterestingProperties(target,
propertiesToIgnore);
assertMapsEqual(oldDescription, newDescription);
+ assertEquals("NUMERIC",
target.getUserDefinedSQLType().getUpstreamType().getName());
}
public void testSaveCoversAllIndexProperties() throws Exception {
=======================================
--- /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Tue Jul 13 13:48:22 2010
+++ /trunk/src/main/java/ca/sqlpower/architect/swingui/ArchitectFrame.java
Wed Jul 14 14:56:34 2010
@@ -616,7 +616,7 @@
KeyStroke.getKeyStroke(KeyEvent.VK_N, accelMask));
newWindowAction = new AbstractAction("New Window",
- SPSUtils.createIcon("new_project", "New Window",
+ SPSUtils.createIcon("new_window", "New Window",
sprefs.getInt(ArchitectSwingUserSettings.ICON_SIZE,
ArchitectSwingSessionContext.ICON_SIZE))) {
public void actionPerformed(ActionEvent e) {
try {
