You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lenya.apache.org by gr...@apache.org on 2005/02/08 19:15:45 UTC
svn commit: r152682 [17/17] - in lenya/trunk/src: java/org/apache/lenya/ac/
java/org/apache/lenya/ac/cache/ java/org/apache/lenya/ac/file/
java/org/apache/lenya/ac/impl/ java/org/apache/lenya/ac/ldap/
java/org/apache/lenya/cms/ac/ java/org/apache/lenya/cms/ac/cocoon/
java/org/apache/lenya/cms/ac/usecase/ java/org/apache/lenya/cms/ac/usecases/
java/org/apache/lenya/cms/ac/workflow/ java/org/apache/lenya/cms/ant/
java/org/apache/lenya/cms/authoring/ java/org/apache/lenya/cms/cocoon/acting/
java/org/apache/lenya/cms/cocoon/bean/
java/org/apache/lenya/cms/cocoon/components/modules/input/
java/org/apache/lenya/cms/cocoon/flow/
java/org/apache/lenya/cms/cocoon/generation/
java/org/apache/lenya/cms/cocoon/matching/
java/org/apache/lenya/cms/cocoon/scheduler/
java/org/apache/lenya/cms/cocoon/source/
java/org/apache/lenya/cms/cocoon/task/
java/org/apache/lenya/cms/cocoon/transformation/
java/org/apache/lenya/cms/cocoon/uriparameterizer/
java/org/apache/lenya/cms/metadata/dublincore/
java/org/apache/lenya/cms/metadata/usecases/
java/org/apache/lenya/cms/publication/
java/org/apache/lenya/cms/publication/file/
java/org/apache/lenya/cms/publication/task/
java/org/apache/lenya/cms/publication/templating/
java/org/apache/lenya/cms/publication/util/
java/org/apache/lenya/cms/publishing/ java/org/apache/lenya/cms/rc/
java/org/apache/lenya/cms/scheduler/ java/org/apache/lenya/cms/scheduler/xml/
java/org/apache/lenya/cms/search/usecases/ java/org/apache/lenya/cms/site/
java/org/apache/lenya/cms/site/tree/
java/org/apache/lenya/cms/site/usecases/ java/org/apache/lenya/cms/task/
java/org/apache/lenya/cms/usecase/ java/org/apache/lenya/cms/workflow/
java/org/apache/lenya/lucene/ java/org/apache/lenya/lucene/html/
java/org/apache/lenya/lucene/index/ java/org/apache/lenya/lucene/parser/
java/org/apache/lenya/net/ java/org/apache/lenya/search/
java/org/apache/lenya/search/crawler/ java/org/apache/lenya/util/
java/org/apache/lenya/workflow/ java/org/apache/lenya/workflow/impl/
java/org/apache/lenya/xml/ test/org/apache/lenya/ac/file/
test/org/apache/lenya/ac/impl/ test/org/apache/lenya/cms/
test/org/apache/lenya/cms/authoring/
test/org/apache/lenya/cms/cocoon/generation/
test/org/apache/lenya/cms/publication/
test/org/apache/lenya/cms/publication/file/ test/org/apache/lenya/cms/rc/
test/org/apache/lenya/cms/site/tree/ test/org/apache/lenya/cms/task/
test/org/apache/lenya/cms/workflow/ test/org/apache/lenya/net/
Modified: lenya/trunk/src/test/org/apache/lenya/cms/ExcaliburTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/ExcaliburTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/ExcaliburTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/ExcaliburTest.java Tue Feb 8 10:13:39 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: ExcaliburTest.java,v 1.2 2004/03/04 15:41:09 egli Exp $ */
+/* $Id$ */
package org.apache.lenya.cms;
@@ -23,17 +23,23 @@
import org.apache.avalon.excalibur.testcase.ExcaliburTestCase;
+/**
+ * Abstract base class for excalibur tests
+ */
public abstract class ExcaliburTest extends ExcaliburTestCase {
/**
+ * <code>CONFIGURATION</code> The path to the configuration
+ */
+ public static final String CONFIGURATION = "/" +
+ ExcaliburTest.class.getPackage().getName().replace('.', '/') + "/lenya.xtest";
+
+ /**
* @param test The test.
*/
public ExcaliburTest(String test) {
super(test);
}
-
- public static final String CONFIGURATION = "/" +
- ExcaliburTest.class.getPackage().getName().replace('.', '/') + "/lenya.xtest";
/**
* @see org.apache.avalon.excalibur.testcase.ExcaliburTestCase#prepare()
Modified: lenya/trunk/src/test/org/apache/lenya/cms/PublicationHelper.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/PublicationHelper.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/PublicationHelper.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/PublicationHelper.java Tue Feb 8 10:13:39 2005
@@ -26,23 +26,24 @@
import org.apache.lenya.cms.publication.PublicationException;
import org.apache.lenya.cms.publication.PublicationFactory;
+/**
+ * A publication helper
+ */
public class PublicationHelper {
/**
* Constructor for PublicationHelper.
- *
*/
protected PublicationHelper() {
+ // do nothing
}
/**
* Initializes the object with the first parameters from the command line
* arguments <code>args</code>. The remainder of the array is returned.
- *
* @param args The command line arguments of the test.
* @return The remainder of the arguments after the publication parameters
* are extracted.
- *
*/
public static String[] extractPublicationArguments(String[] args) {
String servletContextPath = args[0];
Modified: lenya/trunk/src/test/org/apache/lenya/cms/authoring/DocumentCreatorTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/authoring/DocumentCreatorTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/authoring/DocumentCreatorTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/authoring/DocumentCreatorTest.java Tue Feb 8 10:13:39 2005
@@ -36,9 +36,7 @@
import org.apache.lenya.cms.site.tree.TreeSiteManager;
/**
- *
- * To change the template for this generated type comment go to Window>Preferences>Java>Code
- * Generation>Code and Comments
+ *Document creator test
*/
public class DocumentCreatorTest extends TestCase {
/**
@@ -51,7 +49,6 @@
/**
* The main program. The parameters are set from the command line arguments.
- *
* @param args The command line arguments.
*/
public static void main(String[] args) {
@@ -74,7 +71,7 @@
*/
public void testCreator() throws CreatorException, SiteException {
Publication publication = PublicationHelper.getPublication();
- DocumentCreator creator = new DocumentCreator();
+ DefaultCreator creator = new DefaultCreator();
File authoringDirectory = new File(publication.getDirectory(), AUTHORING_DIR);
creator.create(publication, authoringDirectory, AREA, PARENT_ID, CHILD_ID, CHILD_NAME,
Modified: lenya/trunk/src/test/org/apache/lenya/cms/cocoon/generation/TestProxyGeneratorServlet.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/cocoon/generation/TestProxyGeneratorServlet.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/cocoon/generation/TestProxyGeneratorServlet.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/cocoon/generation/TestProxyGeneratorServlet.java Tue Feb 8 10:13:39 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: TestProxyGeneratorServlet.java,v 1.3 2004/03/04 15:41:09 egli Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.cocoon.generation;
@@ -32,26 +32,25 @@
import javax.servlet.http.HttpSession;
+/**
+ * Proxy Generator Servlet Test
+ */
public class TestProxyGeneratorServlet extends HttpServlet {
/**
- * DOCUMENT ME!
- *
- * @param config DOCUMENT ME!
- *
- * @throws ServletException DOCUMENT ME!
+ * Initialize, given a servlet configuration
+ * @param config The configuration
+ * @throws ServletException if an error occurs
*/
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
/**
- * DOCUMENT ME!
- *
- * @param request DOCUMENT ME!
- * @param response DOCUMENT ME!
- *
- * @throws IOException DOCUMENT ME!
- * @throws ServletException DOCUMENT ME!
+ * Get a request
+ * @param request The request to get
+ * @param response The response to put it in
+ * @throws IOException if an IO error occurs
+ * @throws ServletException if an error occurs
*/
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
@@ -70,13 +69,11 @@
}
/**
- * DOCUMENT ME!
- *
- * @param request DOCUMENT ME!
- * @param response DOCUMENT ME!
- *
- * @throws ServletException DOCUMENT ME!
- * @throws IOException DOCUMENT ME!
+ * Do a POST using the request and store the response in the response object
+ * @param request The request
+ * @param response The response
+ * @throws ServletException if an error occurs
+ * @throws IOException if an IO error occurs
*/
public void doPost(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
@@ -95,11 +92,9 @@
}
/**
- * DOCUMENT ME!
- *
- * @param request DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Return the information about a request: URI, Server name and port
+ * @param request The request
+ * @return The information (as XML)
*/
public String getRequestInfo(HttpServletRequest request) {
StringBuffer sb = new StringBuffer("");
@@ -111,11 +106,9 @@
}
/**
- * DOCUMENT ME!
- *
- * @param request DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Get all parameters from a request
+ * @param request The request
+ * @return The parameters (as XML)
*/
public String getParameters(HttpServletRequest request) {
StringBuffer sb = new StringBuffer("");
@@ -146,11 +139,9 @@
}
/**
- * DOCUMENT ME!
- *
- * @param request DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Get all session attributes of a request
+ * @param request The request
+ * @return The session attributes (in XML)
*/
public String getSession(HttpServletRequest request) {
StringBuffer sb = new StringBuffer("");
@@ -183,11 +174,9 @@
}
/**
- * DOCUMENT ME!
- *
- * @param request DOCUMENT ME!
- *
- * @return DOCUMENT ME!
+ * Return all cookies of a request
+ * @param request The request
+ * @return The cookies (as XML)
*/
public String getCookies(HttpServletRequest request) {
StringBuffer sb = new StringBuffer("");
Modified: lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/publication/DefaultDocumentTest.java Tue Feb 8 10:13:39 2005
@@ -42,7 +42,6 @@
/**
* The main program. The parameters are set from the command line arguments.
- *
* @param args The command line arguments.
*/
public static void main(String[] args) {
@@ -67,7 +66,7 @@
/**
* Tests a document test set.
* @param testSet The test set.
- * @throws DocumentBuildException when something went wrong.
+ * @throws DocumentBuildException if an error occurs
*/
protected void doDocumentTest(DocumentTestSet testSet) throws DocumentBuildException {
Document document = getDocument(testSet);
@@ -93,7 +92,7 @@
/**
* Tests the default document.
- * @throws DocumentBuildException when something went wrong.
+ * @throws DocumentBuildException if an error occurs
*/
public void testDefaultDocument() throws DocumentBuildException {
for (int i = 0; i < testSets.length; i++) {
@@ -115,7 +114,7 @@
* Returns the test document for a given test set.
* @param testSet A document test set.
* @return A document.
- * @throws DocumentBuildException when something went wrong.
+ * @throws DocumentBuildException if an error occurs
*/
protected Document getDocument(DocumentTestSet testSet) throws DocumentBuildException {
@@ -140,53 +139,53 @@
/**
* Ctor.
- * @param url The url.
- * @param id The ID.
- * @param area The area.
- * @param language The language.
- * @param extension The extension.
- */
- public DocumentTestSet(String url, String id, String area, String language, String extension) {
- this.url = url;
- this.id = id;
- this.area = area;
- this.language = language;
- this.extension = extension;
+ * @param _url The url.
+ * @param _id The ID.
+ * @param _area The area.
+ * @param _language The language.
+ * @param _extension The extension.
+ */
+ public DocumentTestSet(String _url, String _id, String _area, String _language, String _extension) {
+ this.url = _url;
+ this.id = _id;
+ this.area = _area;
+ this.language = _language;
+ this.extension = _extension;
}
/**
* @return The area.
*/
public String getArea() {
- return area;
+ return this.area;
}
/**
* @return The extension.
*/
public String getExtension() {
- return extension;
+ return this.extension;
}
/**
* @return The ID.
*/
public String getId() {
- return id;
+ return this.id;
}
/**
* @return The language.
*/
public String getLanguage() {
- return language;
+ return this.language;
}
/**
* @return The URL.
*/
public String getUrl() {
- return url;
+ return this.url;
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/publication/file/FilePublicationTest.java Tue Feb 8 10:13:39 2005
@@ -68,14 +68,28 @@
return new TestSuite(FilePublicationTest.class);
}
+ /**
+ * <code>sourceDocumentId</code> The source document id
+ */
public static final String sourceDocumentId = "/tutorial";
+ /**
+ * <code>destinationDocumentId</code> The destination document id
+ */
public static final String destinationDocumentId = "/doctypes/simple-document";
+ /**
+ * <code>sourceLanguage</code> The source language
+ */
public static final String sourceLanguage = "en";
+ /**
+ * <code>destinationLanguage</code> The destination language
+ */
public static final String destinationLanguage = "en";
/**
* Tests copying a document.
* @throws PublicationException when something went wrong.
+ * @throws DocumentException
+ * @throws SiteException
*/
public void testCopyDocument() throws PublicationException, DocumentException, SiteException {
testCopyDocument(Publication.AUTHORING_AREA, sourceDocumentId, sourceLanguage,
@@ -87,31 +101,33 @@
/**
* Tests copying a document.
* @param sourceArea The source area.
- * @param sourceDocumentId The source document ID.
- * @param sourceLanguage The source language.
+ * @param _sourceDocumentId The source document ID.
+ * @param _sourceLanguage The source language.
* @param destinationArea The destination area.
- * @param destinationDocumentId The destination document ID.
- * @param destinationLanguage The destination language.
+ * @param _destinationDocumentId The destination document ID.
+ * @param _destinationLanguage The destination language.
* @throws PublicationException when something went wrong.
+ * @throws DocumentException
+ * @throws SiteException
*/
- public void testCopyDocument(String sourceArea, String sourceDocumentId, String sourceLanguage,
- String destinationArea, String destinationDocumentId, String destinationLanguage)
+ public void testCopyDocument(String sourceArea, String _sourceDocumentId, String _sourceLanguage,
+ String destinationArea, String _destinationDocumentId, String _destinationLanguage)
throws PublicationException, DocumentException, SiteException {
System.out.println("Copy document");
System.out.println(" Source area: [" + sourceArea + "]");
- System.out.println(" Source document ID: [" + sourceDocumentId + "]");
- System.out.println(" Source language: [" + sourceLanguage + "]");
+ System.out.println(" Source document ID: [" + _sourceDocumentId + "]");
+ System.out.println(" Source language: [" + _sourceLanguage + "]");
System.out.println(" Destination area: [" + destinationArea + "]");
- System.out.println(" Destination document ID: [" + destinationDocumentId + "]");
- System.out.println(" Destination language: [" + destinationLanguage + "]");
+ System.out.println(" Destination document ID: [" + _destinationDocumentId + "]");
+ System.out.println(" Destination language: [" + _destinationLanguage + "]");
Publication publication = PublicationHelper.getPublication();
DocumentIdentityMap map = new DocumentIdentityMap(publication);
- Document sourceDocument = map.getFactory().get(sourceArea, sourceDocumentId, sourceLanguage);
- Document destinationDocument = map.getFactory().get(destinationArea, destinationDocumentId,
- destinationLanguage);
+ Document sourceDocument = map.getFactory().get(sourceArea, _sourceDocumentId, _sourceLanguage);
+ Document destinationDocument = map.getFactory().get(destinationArea, _destinationDocumentId,
+ _destinationLanguage);
publication.copyDocument(sourceDocument, destinationDocument);
@@ -119,13 +135,13 @@
TreeSiteManager manager = (TreeSiteManager) publication.getSiteManager(map);
SiteTree destinationTree = manager.getTree(destinationArea);
- SiteTreeNode destinationNode = destinationTree.getNode(destinationDocumentId);
+ SiteTreeNode destinationNode = destinationTree.getNode(_destinationDocumentId);
assertNotNull(destinationNode);
- Label destinationLabel = destinationNode.getLabel(destinationLanguage);
+ Label destinationLabel = destinationNode.getLabel(_destinationLanguage);
assertNotNull(destinationLabel);
- SiteTreeNode sourceNode = destinationTree.getNode(sourceDocumentId);
- Label sourceLabel = sourceNode.getLabel(sourceLanguage);
+ SiteTreeNode sourceNode = destinationTree.getNode(_sourceDocumentId);
+ Label sourceLabel = sourceNode.getLabel(_sourceLanguage);
assertTrue(destinationLabel.getLabel().equals(sourceLabel.getLabel()));
Modified: lenya/trunk/src/test/org/apache/lenya/cms/rc/RCMLTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/rc/RCMLTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/rc/RCMLTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/rc/RCMLTest.java Tue Feb 8 10:13:39 2005
@@ -15,30 +15,33 @@
*
*/
-/* $Id: RCMLTest.java,v 1.6 2004/03/04 15:41:10 egli Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.rc;
-import java.io.File;
import java.io.PrintWriter;
import java.util.Date;
import junit.framework.TestCase;
-import org.apache.lenya.xml.DOMParserFactory;
-import org.apache.lenya.xml.DOMWriter;
import org.w3c.dom.Document;
-import org.w3c.dom.Element;
+import org.apache.lenya.xml.DocumentHelper;
+/**
+ * RCML Test
+ */
public class RCMLTest extends TestCase {
+ /**
+ * <code>co</code> Checkout
+ */
public static final short co = 0;
+ /**
+ * <code>ci</code> Checkin
+ */
public static final short ci = 1;
- private File rcmlFile;
private Document document = null;
- private boolean dirty = false;
- private int maximalNumberOfEntries = 5;
/**
* Constructor.
@@ -66,7 +69,7 @@
RCML rcml = new RCML(args[0], args[1], args[2]);
rcml.checkOutIn(RCML.co, "michi", new Date().getTime(), false);
- new DOMWriter(new PrintWriter(System.out)).print(this.document);
+ (new PrintWriter(System.out)).print(this.document);
CheckOutEntry coe = rcml.getLatestCheckOutEntry();
System.out.println("\n");
@@ -103,11 +106,6 @@
/**
* initialise the RCML-document. Delete all entries
*/
- DOMParserFactory dpf = new DOMParserFactory();
- document = dpf.getDocument();
-
- Element root = dpf.newElementNode(document, "XPSRevisionControl");
- document.appendChild(root);
-
+ this.document = DocumentHelper.createDocument(null, "XPSRevisionControl", null);
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/rc/RevisionControllerTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/rc/RevisionControllerTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/rc/RevisionControllerTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/rc/RevisionControllerTest.java Tue Feb 8 10:13:39 2005
@@ -24,6 +24,9 @@
import junit.framework.TestCase;
+/**
+ * Revision Controller test
+ */
public class RevisionControllerTest extends TestCase {
/**
* Constructor.
@@ -101,5 +104,7 @@
}
*/
/** @see junit.framework.TestCase#setUp() */
- protected void setUp() throws Exception {}
+ protected void setUp() throws Exception {
+ // do nothing
+ }
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/site/tree/DefaultSiteTreeTest.java Tue Feb 8 10:13:39 2005
@@ -19,19 +19,16 @@
package org.apache.lenya.cms.site.tree;
-import java.io.IOException;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.TransformerException;
-
import junit.framework.TestCase;
import org.apache.lenya.cms.site.Label;
import org.apache.lenya.cms.site.SiteException;
import org.apache.lenya.cms.site.tree.DefaultSiteTree;
import org.apache.lenya.cms.site.tree.SiteTreeNode;
-import org.xml.sax.SAXException;
+/**
+ * Test class for the default site tree
+ */
public class DefaultSiteTreeTest extends TestCase {
private DefaultSiteTree siteTree = null;
@@ -59,20 +56,20 @@
*/
protected void setUp() throws Exception {
super.setUp();
- siteTree = new DefaultSiteTree("testTree.xml");
+ this.siteTree = new DefaultSiteTree("testTree.xml");
Label label = new Label("Foo", "en");
Label[] fooLabels = { label };
- siteTree.addNode("/foo", fooLabels, null, null, false);
+ this.siteTree.addNode("/foo", fooLabels, null, null, false);
label = new Label("Home", "en");
Label[] homeLabels = { label };
- siteTree.addNode("/index", homeLabels, null, null, false);
+ this.siteTree.addNode("/index", homeLabels, null, null, false);
label = new Label("Bar", "en");
Label label_de = new Label("Stab", "de");
Label[] barLabels = { label, label_de };
- siteTree.addNode("/foo/bar", barLabels, "http://exact.biz", "suffix", true);
+ this.siteTree.addNode("/foo/bar", barLabels, "http://exact.biz", "suffix", true);
label = new Label("Lala", "en");
Label[] lalaLabels = { label };
- siteTree.addNode("/foo/lala", lalaLabels, null, null, false);
+ this.siteTree.addNode("/foo/lala", lalaLabels, null, null, false);
}
/**
@@ -105,8 +102,8 @@
Label label = new Label("Tutorial", null);
Label[] labels = { label };
- siteTree.addNode("/foo", "tutorial", labels);
- SiteTreeNode node = siteTree.getNode("/foo/tutorial");
+ this.siteTree.addNode("/foo", "tutorial", labels);
+ SiteTreeNode node = this.siteTree.getNode("/foo/tutorial");
assertNotNull(node);
assertEquals(node.getId(), "tutorial");
}
@@ -128,15 +125,14 @@
Label label2 = new Label("Ding", "en");
Label[] labels = { label1, label2};
- siteTree.addNode("/foo/ding", labels, null, null, false);
+ this.siteTree.addNode("/foo/ding", labels, null, null, false);
- assertNotNull(siteTree.getNode("/foo/ding"));
- assertEquals(siteTree.getNode("/foo/ding").getId(), "ding");
+ assertNotNull(this.siteTree.getNode("/foo/ding"));
+ assertEquals(this.siteTree.getNode("/foo/ding").getId(), "ding");
}
/**
* Test for void addNode(String, String, Label[], String, String, boolean)
- *
* @throws SiteException if an error occurs
*/
final public void testAddNodeStringStringLabelArrayStringStringboolean() throws SiteException {
@@ -144,44 +140,41 @@
Label label2 = new Label("Ding", "en");
Label[] labels = { label1, label2};
- siteTree.addNode("/foo", "baz", labels, null, null, false);
+ this.siteTree.addNode("/foo", "baz", labels, null, null, false);
- assertNotNull(siteTree.getNode("/foo/baz"));
- assertEquals(siteTree.getNode("/foo/baz").getId(), "baz");
+ assertNotNull(this.siteTree.getNode("/foo/baz"));
+ assertEquals(this.siteTree.getNode("/foo/baz").getId(), "baz");
}
/**
* Test addLabel
- *
- * @throws SiteException if an error occurs
*/
- final public void testAddLabel() throws SiteException {
+ final public void testAddLabel() {
Label label = new Label("Tutorial", null);
Label[] labels = null;
- siteTree.addLabel("/foo/bar", label);
- labels = siteTree.getNode("/foo/bar").getLabels();
+ this.siteTree.addLabel("/foo/bar", label);
+ labels = this.siteTree.getNode("/foo/bar").getLabels();
assertEquals(labels.length, 3);
- label = siteTree.getNode("/foo/bar").getLabel("");
+ label = this.siteTree.getNode("/foo/bar").getLabel("");
assertNotNull(label);
assertEquals(label.getLabel(), "Tutorial");
}
/**
* Test removeLabel
- *
*/
final public void testRemoveLabel() {
- assertEquals(siteTree.getNode("/foo/bar").getLabels().length, 2);
+ assertEquals(this.siteTree.getNode("/foo/bar").getLabels().length, 2);
Label label = new Label("Stab", "de");
- siteTree.removeLabel("/foo/bar", label);
- assertEquals(siteTree.getNode("/foo/bar").getLabels().length, 1);
+ this.siteTree.removeLabel("/foo/bar", label);
+ assertEquals(this.siteTree.getNode("/foo/bar").getLabels().length, 1);
- assertEquals(siteTree.getNode("/foo/bar").getLabels()[0], new Label("Bar", "en"));
+ assertEquals(this.siteTree.getNode("/foo/bar").getLabels()[0], new Label("Bar", "en"));
- siteTree.addLabel("/foo/bar", label);
- assertEquals(siteTree.getNode("/foo/bar").getLabels().length, 2);
+ this.siteTree.addLabel("/foo/bar", label);
+ assertEquals(this.siteTree.getNode("/foo/bar").getLabels().length, 2);
}
/**
@@ -194,18 +187,18 @@
Label label2 = new Label("Ho", "en");
Label[] labels1 = { label1, label2};
- siteTree.addNode("/hi", labels1, null, null, false);
+ this.siteTree.addNode("/hi", labels1, null, null, false);
Label[] labels2 = { label1, label2};
- siteTree.addNode("/hi/ho", labels2, null, null, false);
+ this.siteTree.addNode("/hi/ho", labels2, null, null, false);
- assertNotNull(siteTree.getNode("/hi/ho"));
+ assertNotNull(this.siteTree.getNode("/hi/ho"));
- siteTree.removeNode("/hi");
+ this.siteTree.removeNode("/hi");
- assertNull(siteTree.getNode("/hi/ho"));
- assertNull(siteTree.getNode("/hi"));
+ assertNull(this.siteTree.getNode("/hi/ho"));
+ assertNull(this.siteTree.getNode("/hi"));
}
/**
@@ -213,9 +206,9 @@
*
*/
final public void testGetNode() {
- assertNotNull(siteTree.getNode("/foo/bar"));
+ assertNotNull(this.siteTree.getNode("/foo/bar"));
- assertNull(siteTree.getNode("/foo/baz"));
+ assertNull(this.siteTree.getNode("/foo/baz"));
}
/**
@@ -228,41 +221,29 @@
/**
* Test moving a node up
- *
* @throws SiteException if an error occurs
- * @throws IOException if an error occurs
- * @throws TransformerException if an error occurs
*/
- final public void testMoveUp() throws SiteException, IOException, TransformerException {
- siteTree.moveUp("/foo/lala");
- siteTree.save();
- assertNotNull(siteTree.getNode("/foo/lala"));
+ final public void testMoveUp() throws SiteException {
+ this.siteTree.moveUp("/foo/lala");
+ this.siteTree.save();
+ assertNotNull(this.siteTree.getNode("/foo/lala"));
}
/**
* Test moving a node down
- *
* @throws SiteException if an error occurs
- * @throws IOException if an error occurs
- * @throws TransformerException if an error occurs
*/
- final public void testMoveDown() throws SiteException, IOException, TransformerException {
- siteTree.moveDown("/foo");
- siteTree.save();
- assertNotNull(siteTree.getNode("/foo"));
+ final public void testMoveDown() throws SiteException {
+ this.siteTree.moveDown("/foo");
+ this.siteTree.save();
+ assertNotNull(this.siteTree.getNode("/foo"));
}
/**
* Test the import of a subtree
- *
- * @throws ParserConfigurationException if an error occurs.
- * @throws SAXException if an error occurs.
* @throws SiteException if an error occurs.
- * @throws IOException if an error occurs.
- * @throws TransformerException if an error occurs.
*/
- final public void testImportSubtree() throws ParserConfigurationException, SAXException,
- SiteException, IOException, TransformerException {
+ final public void testImportSubtree() throws SiteException {
DefaultSiteTree newSiteTree = new DefaultSiteTree("importedTree.xml");
Label label = new Label("root", "en");
Label[] rootLabels = { label };
@@ -278,11 +259,11 @@
newSiteTree.addNode("/root/subtree/child", childLabels, null, null, false);
SiteTreeNode node=newSiteTree.getNode("/root/subtree");
assertNotNull(node);
- SiteTreeNode parentNode=siteTree.getNode("/foo/lala");
+ SiteTreeNode parentNode=this.siteTree.getNode("/foo/lala");
assertNotNull(parentNode);
- siteTree.importSubtree(parentNode,node, "subtree", null);
- siteTree.save();
- assertNotNull(siteTree.getNode("/foo/lala/subtree"));
- assertNotNull(siteTree.getNode("/foo/lala/subtree/child"));
+ this.siteTree.importSubtree(parentNode,node, "subtree", null);
+ this.siteTree.save();
+ assertNotNull(this.siteTree.getNode("/foo/lala/subtree"));
+ assertNotNull(this.siteTree.getNode("/foo/lala/subtree/child"));
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/site/tree/SiteTreeNodeImplTest.java Tue Feb 8 10:13:39 2005
@@ -25,6 +25,9 @@
import junit.framework.TestCase;
+/**
+ * Tests the site tree
+ */
public class SiteTreeNodeImplTest extends TestCase {
private SiteTreeNode node = null;
@@ -66,7 +69,7 @@
"suffix",
true);
- node = siteTree.getNode("/foo/bar");
+ this.node = siteTree.getNode("/foo/bar");
}
/**
@@ -81,7 +84,7 @@
*
*/
final public void testGetAbsoluteId() {
- assertEquals(node.getAbsoluteId(), "/foo/bar");
+ assertEquals(this.node.getAbsoluteId(), "/foo/bar");
}
/**
@@ -89,7 +92,7 @@
*
*/
final public void testGetId() {
- assertEquals(node.getId(), "bar");
+ assertEquals(this.node.getId(), "bar");
}
/**
@@ -97,9 +100,9 @@
*
*/
final public void testGetLabels() {
- assertEquals(node.getLabels().length, 2);
- for (int i = 0; i < node.getLabels().length; i++) {
- Label label = node.getLabels()[i];
+ assertEquals(this.node.getLabels().length, 2);
+ for (int i = 0; i < this.node.getLabels().length; i++) {
+ Label label = this.node.getLabels()[i];
Label label1 = new Label("Bar", "en");
Label label2 = new Label("Stab", "de");
assertTrue(label.equals(label1) || label.equals(label2));
@@ -111,7 +114,7 @@
*
*/
final public void testGetLabel() {
- Label label = node.getLabel("en");
+ Label label = this.node.getLabel("en");
assertNotNull(label);
assertEquals(label.getLabel(), "Bar");
}
@@ -122,11 +125,11 @@
*/
final public void testAddLabel() {
Label label = new Label("Barolo", "it");
- node.addLabel(label);
- label = node.getLabel("it");
+ this.node.addLabel(label);
+ label = this.node.getLabel("it");
assertNotNull(label);
assertEquals(label.getLabel(), "Barolo");
- label = node.getLabel("ch");
+ label = this.node.getLabel("ch");
assertNull(label);
}
@@ -136,9 +139,9 @@
*/
final public void testRemoveLabel() {
Label label = new Label("Bar", "en");
- assertNotNull(node.getLabel("en"));
- node.removeLabel(label);
- assertNull(node.getLabel("en"));
+ assertNotNull(this.node.getLabel("en"));
+ this.node.removeLabel(label);
+ assertNull(this.node.getLabel("en"));
}
/**
@@ -146,7 +149,7 @@
*
*/
final public void testGetHref() {
- assertEquals(node.getHref(), "http://exact.biz");
+ assertEquals(this.node.getHref(), "http://exact.biz");
}
/**
@@ -155,7 +158,7 @@
*
*/
final public void testGetSuffix() {
- assertEquals(node.getSuffix(), "suffix");
+ assertEquals(this.node.getSuffix(), "suffix");
}
/**
@@ -163,7 +166,7 @@
*
*/
final public void testHasLink() {
- assertTrue(node.hasLink());
+ assertTrue(this.node.hasLink());
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/AntTaskTest.java Tue Feb 8 10:13:39 2005
@@ -69,7 +69,7 @@
/**
* Initializes the parameters. Call this method from your subclass
- * {@link main(String[])} method.
+ * {@link #main(String[])} method.
* @param args The command-line arguments.
*/
public static void initialize(String[] args) {
@@ -111,7 +111,7 @@
/**
* Tests an AntTask.
- * @param target the target of the task to test.
+ * @param _target the target of the task to test.
*
* @throws ExecutionException if an error occurs
* @throws IOException if an error occurs
@@ -119,8 +119,8 @@
* @throws SAXException if an error occurs
* @throws ConfigurationException if an error occurs
*/
- protected void doTest(String target) throws ExecutionException, ParameterException, ConfigurationException, SAXException, IOException {
- System.out.println("Testing target [" + target + "]:");
+ protected void doTest(String _target) throws ExecutionException, ParameterException, ConfigurationException, SAXException, IOException {
+ System.out.println("Testing target [" + _target + "]:");
Publication publication = PublicationHelper.getPublication();
@@ -128,9 +128,9 @@
AntTask task = (AntTask) manager.getTask(TaskManager.ANT_TASK);
Parameters parameters = getTaskParameters();
- parameters.setParameter(AntTask.PARAMETER_PUBLICATION_ID, publication.getId());
- parameters.setParameter(AntTask.PARAMETER_CONTEXT_PREFIX, "/");
- parameters.setParameter(AntTask.PARAMETER_SERVLET_CONTEXT,
+ parameters.setParameter(Task.PARAMETER_PUBLICATION_ID, publication.getId());
+ parameters.setParameter(Task.PARAMETER_CONTEXT_PREFIX, "/");
+ parameters.setParameter(Task.PARAMETER_SERVLET_CONTEXT,
publication.getServletContext().getCanonicalPath());
parameters.setParameter(AntTask.TARGET, getTarget());
task.parameterize(parameters);
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentCopyTaskTest.java Tue Feb 8 10:13:39 2005
@@ -65,14 +65,10 @@
TestRunner.run(getSuite());
}
- public static final String FIRST_DOCUMENT_ID = "/tutorial";
- public static final String SEC_DOCUMENT_ID = "/features";
- public static final String AUTHORING_PATH = "content/authoring"
+ private static final String FIRST_DOCUMENT_ID = "/tutorial";
+ private static final String SEC_DOCUMENT_ID = "/features";
+ private static final String AUTHORING_PATH = "content/authoring"
.replace('/', File.separatorChar);
- public static final String TREE_FILE = "sitetree.xml";
- public static final String AUTHORING_RESOURCE = "resources/authoring";
- public static final String RCML_DIR = "content/rcml";
- public static final String RCBAK_DIR = "content/rcbak";
/**
* @see org.apache.lenya.cms.task.AntTaskTest#getTaskParameters()
@@ -98,9 +94,6 @@
* @throws Exception if an error occurs
*/
protected void prepareTest() throws Exception {
- File publicationDirectory = PublicationHelper.getPublication().getDirectory();
- String publicationPath = publicationDirectory.getAbsolutePath() + File.separator;
- File authoringDirectory = new File(publicationPath, AUTHORING_PATH);
// TODO generate the resources
}
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentDeactivateTaskTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentDeactivateTaskTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentDeactivateTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentDeactivateTaskTest.java Tue Feb 8 10:13:39 2005
@@ -38,8 +38,6 @@
*/
public class DocumentDeactivateTaskTest extends AntTaskTest {
- private long time = 0;
-
/**
* Creates a new DocumentDeactivateTaskTest object.
* @param test The test.
@@ -58,7 +56,6 @@
/**
* The main program for the DocumentDeactivateTaskTest class
- *
* @param args The command line arguments
*/
public static void main(String[] args) {
@@ -66,10 +63,22 @@
TestRunner.run(getSuite());
}
+ /**
+ * <code>DOCUMENT_ID</code> The document id
+ */
public static final String DOCUMENT_ID = "/tutorial";
+ /**
+ * <code>LANGUAGE</code> The language
+ */
public static final String LANGUAGE = "en";
+ /**
+ * <code>AUTHORING_PATH</code> The authoring path
+ */
public static final String AUTHORING_PATH = "content/authoring"
.replace('/', File.separatorChar);
+ /**
+ * <code>LIVE_PATH</code> The live path
+ */
public static final String LIVE_PATH = "content/live".replace('/', File.separatorChar);
/**
@@ -91,18 +100,13 @@
}
/**
- * (non-Javadoc)
* @see org.apache.lenya.cms.task.AntTaskTest#prepareTest()
*/
protected void prepareTest() throws Exception {
- File publicationDirectory = PublicationHelper.getPublication().getDirectory();
- String publicationPath = publicationDirectory.getAbsolutePath() + File.separator;
-
// TODO generate the resources
}
/**
- * (non-Javadoc)
* @see org.apache.lenya.cms.task.AntTaskTest#evaluateTest()
*/
protected void evaluateTest() throws Exception {
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentMoveTaskTest.java Tue Feb 8 10:13:39 2005
@@ -40,11 +40,36 @@
*/
public class DocumentMoveTaskTest extends AntTaskTest {
+ /**
+ * <code>FIRST_DOCUMENT_ID</code> The first document id
+ */
+ public static final String FIRST_DOCUMENT_ID = "/concepts";
+ /**
+ * <code>SEC_DOCUMENT_ID</code> The second document id
+ */
+ public static final String SEC_DOCUMENT_ID = "/features";
+ /**
+ * <code>AUTHORING_PATH</code> The authoring path
+ */
+ public static final String AUTHORING_PATH = "content/authoring"
+ .replace('/', File.separatorChar);
+ /**
+ * <code>AUTHORING_RESOURCE</code> The authoring resource path
+ */
+ public static final String AUTHORING_RESOURCE = "resources/authoring";
+ /**
+ * <code>RCML_DIR</code> The RCML path
+ */
+ public static final String RCML_DIR = "content/rcml";
+ /**
+ * <code>RCBAK_DIR</code> The RCBAK path
+ */
+ public static final String RCBAK_DIR = "content/rcbak";
+
private long time = 0;
/**
* Creates a new DocumentMoveTaskTest object.
- *
* @param test the test
*/
public DocumentMoveTaskTest(String test) {
@@ -69,14 +94,6 @@
TestRunner.run(getSuite());
}
- public static final String FIRST_DOCUMENT_ID = "/concepts";
- public static final String SEC_DOCUMENT_ID = "/features";
- public static final String AUTHORING_PATH = "content/authoring"
- .replace('/', File.separatorChar);
- public static final String AUTHORING_RESOURCE = "resources/authoring";
- public static final String RCML_DIR = "content/rcml";
- public static final String RCBAK_DIR = "content/rcbak";
-
/**
* @see org.apache.lenya.cms.task.AntTaskTest#getTaskParameters()
*/
@@ -103,10 +120,6 @@
protected void prepareTest() throws Exception {
File publicationDirectory = PublicationHelper.getPublication().getDirectory();
String publicationPath = publicationDirectory.getAbsolutePath() + File.separator;
- File authoringDirectory = new File(publicationPath, AUTHORING_PATH);
-
- // TODO generate the resources
-
// generate the rcml and rcbak files
File rcmlDirectory = new File(publicationPath, RCML_DIR);
File rcbakDirectory = new File(publicationPath, RCBAK_DIR);
@@ -114,7 +127,7 @@
rcbakDirectory.getAbsolutePath(), publicationPath);
String filename = AUTHORING_PATH + FIRST_DOCUMENT_ID + File.separator + "index.xml";
rc.reservedCheckOut(filename, "lenya");
- time = rc.reservedCheckIn(filename, "lenya", true);
+ this.time = rc.reservedCheckIn(filename, "lenya", true);
}
/**
@@ -155,12 +168,12 @@
System.out.println("rcml file was deleted: " + firstRcmlFile.getAbsolutePath());
File rcbakDirectory = new File(publicationPath, RCBAK_DIR);
- String rcbakFilePath = filepath + ".bak." + time;
+ String rcbakFilePath = filepath + ".bak." + this.time;
File rcbakFile = new File(rcbakDirectory, AUTHORING_PATH + rcbakFilePath);
assertTrue(rcbakFile.exists());
System.out.println("Backup was copied: " + rcbakFile.getAbsolutePath());
- String firstRcbakFilePath = firstfilepath + ".bak." + time;
+ String firstRcbakFilePath = firstfilepath + ".bak." + this.time;
File firstRcbakFile = new File(rcbakDirectory, AUTHORING_PATH + firstRcbakFilePath);
assertFalse(firstRcbakFile.exists());
System.out.println("Backup was deleted: " + firstRcbakFile.getAbsolutePath());
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/DocumentRenameTaskTest.java Tue Feb 8 10:13:39 2005
@@ -68,13 +68,37 @@
TestRunner.run(getSuite());
}
+ /**
+ * <code>FIRST_DOCUMENT_ID</code> The first document id
+ */
public static final String FIRST_DOCUMENT_ID = "/doctypes/simple-document";
+ /**
+ * <code>SEC_DOCUMENT_ID</code> The second document id
+ */
public static final String SEC_DOCUMENT_ID = "newname";
+ /**
+ * <code>FIRST_AREA</code> The first area
+ */
public static final String FIRST_AREA = "authoring";
+ /**
+ * <code>SEC_AREA</code> The second area
+ */
public static final String SEC_AREA = "authoring";
+ /**
+ * <code>AUTHORING_PATH</code> The authoring path
+ */
public static final String AUTHORING_PATH = "content/authoring".replace('/', File.separatorChar);
+ /**
+ * <code>AUTHORING_RESOURCE</code> The authoring resources path
+ */
public static final String AUTHORING_RESOURCE = "resources/authoring";
+ /**
+ * <code>RCML_DIR</code> The RCML path
+ */
public static final String RCML_DIR = "content/rcml";
+ /**
+ * <code>RCBAK_DIR</code> The RCBAK path
+ */
public static final String RCBAK_DIR = "content/rcbak";
/**
@@ -112,7 +136,7 @@
File rcbakDirectory = new File(publicationPath , RCBAK_DIR);
RevisionController rc = new RevisionController(rcmlDirectory.getAbsolutePath(), rcbakDirectory.getAbsolutePath(), publicationPath);
rc.reservedCheckOut(filename, "lenya");
- time = rc.reservedCheckIn(filename, "lenya", true);
+ this.time = rc.reservedCheckIn(filename, "lenya", true);
// TODO generate the workflow, meta
}
@@ -169,12 +193,12 @@
//evaluate the backup
File rcbakDirectory = new File(publicationPath , RCBAK_DIR);
- String rcbakFilePath= filepath +".bak." +time ;
+ String rcbakFilePath= filepath +".bak." +this.time ;
File rcbakFile = new File(rcbakDirectory, AUTHORING_PATH + rcbakFilePath);
assertTrue(rcbakFile.exists());
System.out.println("Backup was copied: " + rcbakFile.getAbsolutePath());
- String firstRcbakFilePath= firstfilepath +".bak." +time ;
+ String firstRcbakFilePath= firstfilepath +".bak." +this.time ;
File firstRcbakFile = new File(rcbakDirectory, AUTHORING_PATH + firstRcbakFilePath);
assertFalse(firstRcbakFile.exists());
System.out.println("Backup was deleted: " + firstRcbakFile.getAbsolutePath());
Modified: lenya/trunk/src/test/org/apache/lenya/cms/task/PublisherTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/task/PublisherTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/task/PublisherTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/task/PublisherTest.java Tue Feb 8 10:13:39 2005
@@ -15,7 +15,7 @@
*
*/
-/* $Id: PublisherTest.java,v 1.7 2004/03/04 15:41:10 egli Exp $ */
+/* $Id$ */
package org.apache.lenya.cms.task;
@@ -32,11 +32,13 @@
import org.apache.lenya.cms.publication.Publication;
+/**
+ * Publisher test
+ */
public class PublisherTest extends AntTaskTest {
/**
* Create a test.
- *
* @param test the test
*/
public PublisherTest(String test) {
@@ -45,7 +47,6 @@
/**
* Creates a test suite.
- *
* @return a test
*/
public static Test getSuite() {
@@ -54,7 +55,6 @@
/**
* The main program for the PublisherTest class
- *
* @param args The command line arguments
*/
public static void main(String[] args) {
@@ -62,11 +62,16 @@
TestRunner.run(getSuite());
}
+ /**
+ * <code>DOCUMENT_ID</code> The document id
+ */
public static final String DOCUMENT_ID = "/tutorial";
+ /**
+ * <code>DOCUMENT_LANGUAGE</code> The document language
+ */
public static final String DOCUMENT_LANGUAGE = "en";
/**
- * (non-Javadoc)
* @see org.apache.lenya.cms.task.AntTaskTest#evaluateTest()
*/
protected void evaluateTest() throws IOException {
@@ -79,7 +84,6 @@
}
/**
- * (non-Javadoc)
* @see org.apache.lenya.cms.task.AntTaskTest#getTaskParameters()
*/
protected Parameters getTaskParameters() {
@@ -94,7 +98,6 @@
}
/**
- * (non-Javadoc)
* @see org.apache.lenya.cms.task.AntTaskTest#getTarget()
*/
protected String getTarget() {
Modified: lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/cms/workflow/WorkflowTest.java Tue Feb 8 10:13:39 2005
@@ -175,14 +175,14 @@
/**
* Creates a new test situation.
- * @param user The user.
- * @param event The event.
- * @param value The variable value.
+ * @param _user The user.
+ * @param _event The event.
+ * @param _value The variable value.
*/
- public TestSituation(String user, String event, boolean value) {
- this.user = user;
- this.event = event;
- this.value = value;
+ public TestSituation(String _user, String _event, boolean _value) {
+ this.user = _user;
+ this.event = _event;
+ this.value = _value;
}
/**
@@ -190,7 +190,7 @@
* @return An event.
*/
public String getEvent() {
- return event;
+ return this.event;
}
/**
@@ -198,7 +198,7 @@
* @return A string.
*/
public String getUser() {
- return user;
+ return this.user;
}
/**
@@ -206,7 +206,7 @@
* @return A value.
*/
public boolean getValue() {
- return value;
+ return this.value;
}
}
Modified: lenya/trunk/src/test/org/apache/lenya/net/InetAddressUtilTest.java
URL: http://svn.apache.org/viewcvs/lenya/trunk/src/test/org/apache/lenya/net/InetAddressUtilTest.java?view=diff&r1=152681&r2=152682
==============================================================================
--- lenya/trunk/src/test/org/apache/lenya/net/InetAddressUtilTest.java (original)
+++ lenya/trunk/src/test/org/apache/lenya/net/InetAddressUtilTest.java Tue Feb 8 10:13:39 2005
@@ -18,15 +18,16 @@
import java.net.InetAddress;
/**
- *
+ * Inet address util test
*/
public class InetAddressUtilTest {
/**
+ * @param args
*
*/
public static void main(String[] args) {
if (args.length != 3) {
- System.out.println("Usage: " + new InetAddressUtilTest().getClass().getName() + " network subnet ip");
+ System.out.println("Usage: InetAddressUtilTest network subnet ip");
return;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@lenya.apache.org
For additional commands, e-mail: commits-help@lenya.apache.org