[power-architect] r4014 committed - Fixed two more architect tests. One was a copy of the other. Simply wa...

Wed, 01 Dec 2010 15:22:44 -0800 

Revision: 4014
Author: [email protected]
Date: Wed Dec  1 15:22:07 2010
Log: Fixed two more architect tests. One was a copy of the other. Simply wasn't updated correctly (been left like this for a long time methinks). 
http://code.google.com/p/power-architect/source/detail?r=4014

Modified:
/trunk/regress/ca/sqlpower/architect/enterprise/ArchitectSessionPersisterTest.java /trunk/regress/ca/sqlpower/architect/swingui/ArchitectSwingSessionPersisterTest.java 

=======================================
--- /trunk/regress/ca/sqlpower/architect/enterprise/ArchitectSessionPersisterTest.java Tue May 25 13:03:30 2010 +++ /trunk/regress/ca/sqlpower/architect/enterprise/ArchitectSessionPersisterTest.java Wed Dec 1 15:22:07 2010 
@@ -24,8 +24,6 @@
 import ca.sqlpower.architect.ArchitectSession;
 import ca.sqlpower.architect.ArchitectSessionImpl;
 import ca.sqlpower.architect.TestingArchitectSessionContext;
-import ca.sqlpower.architect.etl.kettle.KettleSettings;
-import ca.sqlpower.architect.olap.OLAPRootObject;
 import ca.sqlpower.dao.SPPersister.DataType;
 import ca.sqlpower.dao.json.SPJSONMessageDecoder;
 import ca.sqlpower.dao.json.SPJSONPersister;
@@ -133,24 +131,4 @@
         assertEquals(oldChildCount, rootObject.getChildCount());
assertNull(rootObject.getChildByName("regression_test", SQLDatabase.class)); 
     }
-
-    /**
- * The purpose of this test is to ensure that the root node (ArchitectProject) is - * correctly updated by persist calls: That it contains the correct SPObjectRoot, 
-     * OlapObjectRoot, and KettleSettings.
-     */
-    public void testRefreshRootNodeWithJSONPersister() throws Exception {
-        SPJSONMessageDecoder decoder = new SPJSONMessageDecoder(persister);
- SPJSONPersister jsonPersister = new SPJSONPersister(new DirectJsonMessageSender(decoder)); 
-
-        jsonPersister.begin();
- jsonPersister.persistObject(null, ArchitectProject.class.getName(), "ArchitectProjectUUID", 0); - jsonPersister.persistObject("ArchitectProjectUUID", KettleSettings.class.getName(), "KettleSettingsUUID", 0); - jsonPersister.persistObject("ArchitectProjectUUID", SQLObjectRoot.class.getName(), "SQLObjectRootUUID", 0); - jsonPersister.persistObject("ArchitectProjectUUID", OLAPRootObject.class.getName(), "OLAPRootObjectUUID", 0); - jsonPersister.persistProperty("ArchitectProjectUUID", "rootObject", DataType.STRING, "SQLObjectRootUUID"); 
-        jsonPersister.commit();
-
- assertEquals("SQLObjectRootUUID", session.getWorkspace().getRootObject().getUUID()); 
-    }
-}
+}
=======================================
--- /trunk/regress/ca/sqlpower/architect/swingui/ArchitectSwingSessionPersisterTest.java Tue May 25 13:03:30 2010 +++ /trunk/regress/ca/sqlpower/architect/swingui/ArchitectSwingSessionPersisterTest.java Wed Dec 1 15:22:07 2010 
@@ -19,6 +19,8 @@

 package ca.sqlpower.architect.swingui;

+import ca.sqlpower.architect.SnapshotCollection;
+import ca.sqlpower.architect.ddl.critic.CriticManager;
 import ca.sqlpower.architect.enterprise.ArchitectPersisterSuperConverter;
 import ca.sqlpower.architect.enterprise.ArchitectSessionPersister;
 import ca.sqlpower.architect.enterprise.DirectJsonMessageSender;
@@ -53,19 +55,29 @@
         SPJSONMessageDecoder decoder = new SPJSONMessageDecoder(persister);
SPJSONPersister jsonPersister = new SPJSONPersister(new DirectJsonMessageSender(decoder)); 

+        session.getUndoManager().setLoading(true);
+
         jsonPersister.begin();
jsonPersister.persistObject(null, ArchitectSwingProject.class.getName(), "ArchitectProjectUUID", 0); jsonPersister.persistObject("ArchitectProjectUUID", KettleSettings.class.getName(), "KettleSettingsUUID", 0); jsonPersister.persistObject("ArchitectProjectUUID", SQLObjectRoot.class.getName(), "SQLObjectRootUUID", 0); jsonPersister.persistObject("ArchitectProjectUUID", OLAPRootObject.class.getName(), "OLAPRootObjectUUID", 0); + jsonPersister.persistObject("ArchitectProjectUUID", CriticManager.class.getName(), "CriticManagerUUID", 0); + jsonPersister.persistObject("ArchitectProjectUUID", SnapshotCollection.class.getName(), "SnapshotCollectionUUID", 0); jsonPersister.persistProperty("ArchitectProjectUUID", "rootObject", DataType.STRING, "SQLObjectRootUUID"); jsonPersister.persistProperty("ArchitectProjectUUID", "olapRootObject", DataType.STRING, "OLAPRootObjectUUID"); jsonPersister.persistProperty("ArchitectProjectUUID", "kettleSettings", DataType.STRING, "KettleSettingsUUID"); + jsonPersister.persistProperty("ArchitectProjectUUID", "criticManager", DataType.STRING, "CriticManagerUUID"); + jsonPersister.persistProperty("ArchitectProjectUUID", "snapshotCollection", DataType.STRING, "SnapshotCollectionUUID"); 
         jsonPersister.commit();
assertEquals("KettleSettingsUUID", session.getWorkspace().getKettleSettings().getUUID()); assertEquals("SQLObjectRootUUID", session.getWorkspace().getRootObject().getUUID()); assertEquals("OLAPRootObjectUUID", session.getWorkspace().getOlapRootObject().getUUID()); + assertEquals("CriticManagerUUID", session.getWorkspace().getCriticManager().getUUID()); + assertEquals("SnapshotCollectionUUID", session.getWorkspace().getSnapshotCollection().getUUID()); 
+
+        session.getUndoManager().setLoading(false);
     }

 }

Reply via email to