From: Julien V. <ju...@jb...> - 2005-05-30 00:09:46
|
User: julien Date: 05/05/29 20:09:14 Modified: cms/src/main/org/jboss/portal/test/cms SimpleTestCase.java Log: - removed Slide API from CMS node API Revision Changes Path 1.8 +34 -116 jboss-portal/cms/src/main/org/jboss/portal/test/cms/SimpleTestCase.java (In the diff below, changes in quantity of whitespace are not shown.) Index: SimpleTestCase.java =================================================================== RCS file: /cvsroot/jboss/jboss-portal/cms/src/main/org/jboss/portal/test/cms/SimpleTestCase.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- SimpleTestCase.java 29 May 2005 22:57:52 -0000 1.7 +++ SimpleTestCase.java 30 May 2005 00:09:14 -0000 1.8 @@ -15,50 +15,19 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.transaction.TransactionManager; import javax.transaction.Status; -import javax.transaction.NotSupportedException; -import javax.transaction.SystemException; -import javax.transaction.Transaction; import java.io.InputStream; -import java.util.Map; -import java.util.Date; import java.util.Arrays; -import java.util.Collection; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.jboss.portal.cms.CMS; import org.jboss.portal.cms.Node; -import org.jboss.portal.cms.CMSException; import org.jboss.portal.cms.NoSuchURIException; import org.jboss.portal.cms.NodeFactory; -import org.jboss.portal.cms.NodeException; -import org.jboss.portal.common.transaction.Transactions; -import org.apache.slide.authenticate.SecurityToken; -import org.apache.slide.authenticate.CredentialsToken; -import org.apache.slide.common.NamespaceAccessToken; -import org.apache.slide.common.SlideToken; -import org.apache.slide.common.Domain; -import org.apache.slide.common.SlideTokenImpl; -import org.apache.slide.common.ServiceAccessException; -import org.apache.slide.structure.Structure; -import org.apache.slide.structure.SubjectNode; -import org.apache.slide.structure.ObjectNotFoundException; -import org.apache.slide.structure.LinkedObjectNotFoundException; -import org.apache.slide.content.Content; -import org.apache.slide.content.NodeRevisionDescriptor; -import org.apache.slide.content.NodeRevisionDescriptors; -import org.apache.slide.content.RevisionDescriptorNotFoundException; -import org.apache.slide.content.NodeRevisionContent; -import org.apache.slide.security.AccessDeniedException; -import org.apache.slide.lock.ObjectLockedException; -import org.apache.slide.event.VetoException; -import org.apache.slide.macro.MacroImpl; -import org.apache.slide.macro.Macro; -import org.apache.slide.macro.DeleteMacroException; /** * @author <a href="mailto:ju...@jb...">Julien Viet</a> - * @version $Revision: 1.7 $ + * @version $Revision: 1.8 $ */ public class SimpleTestCase extends TestCase { @@ -69,8 +38,6 @@ } private CMS cms; - private NamespaceAccessToken nat; - private SlideToken slideToken; private NodeFactory factory; protected void setUp() throws Exception @@ -81,19 +48,16 @@ Element elt = doc.getDocumentElement(); cms = new CMS(); cms.setConfig(elt); - cms.createService(); - cms.startService(); + cms.create(); + cms.start(); - SecurityToken stupidSecurityToken = new SecurityToken("THIS IS A VERY STUPID OBJECT, DON'T BLAME ME BUT BLAME SLIDE AUTHORS"); - nat = Domain.accessNamespace(stupidSecurityToken, Domain.getDefaultNamespace()); - slideToken = new SlideTokenImpl(new CredentialsToken("root")); - slideToken.setForceStoreEnlistment(true); factory = cms.getNodeFactory(); } protected void tearDown() throws Exception { - cms.destroyService(); + cms.stop(); + cms.destroy(); } public void testRemoveNonExistingNode() throws Exception @@ -101,7 +65,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/file"); + Node node = factory.getNode("/files/file"); node.delete(); fail("was expecting no such node exception"); } @@ -120,7 +84,7 @@ try { begin(); - Node file = factory.getNode(nat, "/files/file"); + Node file = factory.getNode("/files/file"); file.createContent(new org.jboss.portal.cms.Content("blah1".getBytes("UTF-8"), "text/plain"), false); } finally @@ -131,7 +95,7 @@ try { begin(); - Node file = factory.getNode(nat, "/files/file"); + Node file = factory.getNode("/files/file"); file.delete(); assertFalse(file.exists()); } @@ -143,7 +107,7 @@ try { begin(); - Node file = factory.getNode(nat, "/files/file"); + Node file = factory.getNode("/files/file"); assertFalse(file.exists()); } finally @@ -157,7 +121,7 @@ try { begin(); - factory.getNode(nat, "/files/file").createDir(false); + factory.getNode("/files/file").createDir(false); } finally { @@ -167,7 +131,7 @@ try { begin(); - factory.getNode(nat, "/files/file").delete(); + factory.getNode("/files/file").delete(); } finally { @@ -177,7 +141,7 @@ try { begin(); - Node fileNode = factory.getNode(nat, "/files/file"); + Node fileNode = factory.getNode("/files/file"); assertFalse(fileNode.exists()); } finally @@ -191,7 +155,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/a/b/c"); + Node node = factory.getNode("/files/a/b/c"); node.createContent(new org.jboss.portal.cms.Content("blah1".getBytes("UTF-8"), "text/plain"), true); } finally @@ -202,7 +166,7 @@ try { begin(); - factory.getNode(nat, "/files/d/e").createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); + factory.getNode("/files/d/e").createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); fail("was expecting no such node exception"); } catch (NoSuchURIException e) @@ -219,7 +183,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/a/b/c"); + Node node = factory.getNode("/files/a/b/c"); node.createDir(true); assertTrue(node.exists()); assertTrue(node.isCollection()); @@ -232,7 +196,7 @@ try { begin(); - factory.getNode(nat, "/files/d/e").createDir(false); + factory.getNode("/files/d/e").createDir(false); fail("was expecting node exception"); } catch (NoSuchURIException e) @@ -250,7 +214,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/file1"); + Node node = factory.getNode("/files/file1"); node.createContent(new org.jboss.portal.cms.Content("blah1".getBytes("UTF-8"), "text/plain"), false); node.createContent(new org.jboss.portal.cms.Content("blah2".getBytes("UTF-8"), "text/plain"), false); assertTrue(node.exists()); @@ -265,8 +229,8 @@ try { begin(); - factory.getNode(nat, "/files/file2").createDir(false); - factory.getNode(nat, "/files/file2").createDir(false); + factory.getNode("/files/file2").createDir(false); + factory.getNode("/files/file2").createDir(false); } finally { @@ -277,8 +241,8 @@ try { begin(); - factory.getNode(nat, "/files/file3").createDir(false); - factory.getNode(nat, "/files/file3").createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); + factory.getNode("/files/file3").createDir(false); + factory.getNode("/files/file3").createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); } finally { @@ -289,8 +253,8 @@ try { begin(); - factory.getNode(nat, "/files/file4").createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); - factory.getNode(nat, "/files/file4").createDir(false); + factory.getNode("/files/file4").createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); + factory.getNode("/files/file4").createDir(false); } finally { @@ -302,19 +266,19 @@ { begin(); - Node file1 = factory.getNode(nat, "/files/file1"); + Node file1 = factory.getNode("/files/file1"); assertTrue(file1.exists()); assertTrue(Arrays.equals("blah2".getBytes("UTF-8"), file1.getContent().getBytes())); - Node file2 = factory.getNode(nat, "/files/file2"); + Node file2 = factory.getNode("/files/file2"); assertTrue(file2.exists()); assertTrue(file2.isCollection()); - Node file3 = factory.getNode(nat, "/files/file3"); + Node file3 = factory.getNode("/files/file3"); assertTrue(file3.exists()); assertTrue(Arrays.equals("blah".getBytes("UTF-8"), file3.getContent().getBytes())); - Node file4 = factory.getNode(nat, "/files/file4"); + Node file4 = factory.getNode("/files/file4"); assertTrue(file4.exists()); assertTrue(file4.isCollection()); } @@ -329,7 +293,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/file"); + Node node = factory.getNode("/files/file"); node.createContent(new org.jboss.portal.cms.Content("blah".getBytes("UTF-8"), "text/plain"), false); assertTrue(node.exists()); } @@ -341,7 +305,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/file"); + Node node = factory.getNode("/files/file"); assertTrue(node.exists()); assertFalse(node.isCollection()); assertTrue(Arrays.equals("blah".getBytes("UTF-8"), node.getContent().getBytes())); @@ -358,7 +322,7 @@ try { begin(); - Node node = factory.getNode(nat, "/files/dir"); + Node node = factory.getNode("/files/dir"); node.createDir(false); } finally @@ -369,7 +333,7 @@ try { begin(); - Node dirNode = factory.getNode(nat, "/files/dir"); + Node dirNode = factory.getNode("/files/dir"); assertTrue(dirNode.exists()); assertTrue(dirNode.isCollection()); } @@ -379,58 +343,12 @@ } } - public void testTransactionManager() - { - final TransactionManager tm = nat.getTransactionManager(); - - try - { - begin(); - -// Transactions.changeContext(tm, new Transactions.Runnable() -// { -// public Object run() throws Exception -// { -// Transaction tx = tm.getTransaction(); -// int status = tx.getStatus(); -// System.out.println("status = " + status); -// System.out.println("status = " + status); -// System.out.println("status = " + status); -// return null; -// } -// }, Transactions.TYPE_REQUIRED); - - } - catch (Exception e) - { - e.printStackTrace(); - fail(""); - } - finally - { - terminate(false); - } - - try - { - Transaction tx = tm.getTransaction(); - System.out.println("tx = " + tx); - System.out.println("tx = " + tx); - System.out.println("tx = " + tx); - } - catch (SystemException e) - { - e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates. - } - - } - /* public void testBlah() throws Exception { nat.begin(); - Node rootNode = Node.create(nat, slideToken, "/"); + Node rootNode = Node.create(slideToken, "/"); assertTrue(rootNode.isDirectory()); assertEquals("", rootNode.getName()); DirectoryNode rootDir = (DirectoryNode)rootNode; @@ -454,7 +372,7 @@ { try { - TransactionManager tm = nat.getTransactionManager(); + TransactionManager tm = factory.getTransactionManager(); tm.begin(); } catch (Exception e) @@ -466,7 +384,7 @@ public void terminate(boolean markedRollback) { - TransactionManager tm = nat.getTransactionManager(); + TransactionManager tm = factory.getTransactionManager(); try { int status = tm.getStatus(); |