Author: henning
Date: Thu May 3 07:08:19 2007
New Revision: 534873
URL: http://svn.apache.org/viewvc?view=rev&rev=534873
Log:
update the tests to use the separated out anakia engine.
Modified:
velocity/anakia/trunk/src/test/org/apache/anakia/AnakiaTestCase.java
velocity/anakia/trunk/src/test/org/apache/anakia/test/Log.java
velocity/anakia/trunk/src/test/org/apache/anakia/test/TestUtil.java
Modified: velocity/anakia/trunk/src/test/org/apache/anakia/AnakiaTestCase.java
URL:
http://svn.apache.org/viewvc/velocity/anakia/trunk/src/test/org/apache/anakia/AnakiaTestCase.java?view=diff&rev=534873&r1=534872&r2=534873
==============================================================================
--- velocity/anakia/trunk/src/test/org/apache/anakia/AnakiaTestCase.java
(original)
+++ velocity/anakia/trunk/src/test/org/apache/anakia/AnakiaTestCase.java Thu
May 3 07:08:19 2007
@@ -21,6 +21,7 @@
*/
import java.io.File;
+import java.util.Collections;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -41,15 +42,18 @@
{
public static final String TEST_DIR_KEY = "test.compare.dir";
public static final String RESULTS_DIR_KEY = "test.results.dir";
-
- private String resultsDir;
- private String compareDir;
-
+
+ private File resultsDir;
+ private File compareDir;
+ private File testDir;
+
+ private static final Log log = new Log();
+
/**
* Creates a new instance.
*
*/
- public AnakiaTestCase(String name)
+ public AnakiaTestCase(final String name)
{
super(name);
}
@@ -58,14 +62,15 @@
{
return new TestSuite(AnakiaTestCase.class);
}
-
+
/**
* Find the directories.
*/
public void setUp()
{
- resultsDir = System.getProperty(RESULTS_DIR_KEY, "bin/test") +
"/anakia";
- compareDir = System.getProperty(TEST_DIR_KEY, "test") +
"/anakia/compare";
+ resultsDir = new File(System.getProperty(RESULTS_DIR_KEY, "bin/test"),
"anakia");
+ testDir = new File(System.getProperty(TEST_DIR_KEY, "test"));
+ compareDir = new File (testDir, "anakia/compare");
}
/**
@@ -73,21 +78,37 @@
* code to do the Anakia output is in the .xml file that runs
* this test.
*/
- public void testAnakiaResults ()
+ public void testAnakia()
throws Exception
{
TestUtil.assureResultsDirectoryExists(resultsDir);
+ Anakia anakia = new Anakia();
+
+ File baseDir = new File(testDir, "anakia/xdocs");
+ anakia.setBaseDir(baseDir);
+ anakia.setDestDir(resultsDir);
+ anakia.setProjectFile(new File(baseDir, "stylesheets/project.xml"));
+ anakia.setPropertiesFile(new File(testDir,
"anakia/velocity.properties"));
+ anakia.setStyleTemplate("site_contexts.vsl");
+ anakia.setTemplatePath(new File(baseDir, "stylesheets"));
+ anakia.setCheckLastModified(false);
+ anakia.setExtension(".html");
+ anakia.setLog(log);
+
+ anakia.setFiles(Collections.singletonList("index.xml"));
+ anakia.execute();
+
// compare standard run
if (!TestUtil.compareFiles(
new File(compareDir, "index.html").toString(),
new File(resultsDir, "index.html").toString()))
{
- fail("Anakia results are incorrect");
+ fail("Anakia results are incorrect");
}
else
{
- Log.log ("Passed (standard)!");
+ log.info ("Passed (standard)!");
}
}
@@ -101,6 +122,27 @@
{
TestUtil.assureResultsDirectoryExists(resultsDir);
+ Anakia anakia = new Anakia();
+
+ File baseDir = new File(testDir, "anakia/xdocs");
+ anakia.setBaseDir(baseDir);
+ anakia.setDestDir(resultsDir);
+ anakia.setProjectFile(new File(baseDir, "stylesheets/project.xml"));
+ anakia.setStyleTemplate("site_contexts.vsl");
+ anakia.setTemplatePath(new File(baseDir, "stylesheets"));
+ anakia.setCheckLastModified(false);
+ anakia.setExtension(".context.html");
+ anakia.setLog(log);
+
+ anakia.setFiles(Collections.singletonList("index.xml"));
+
+ Anakia.Context context = anakia.new Context();
+ context.setName("customContext");
+ context.setFile("stylesheets/customContext.xml");
+ anakia.setContexts(Collections.singletonList(context));
+
+ anakia.execute();
+
// compare with custom context
if (!TestUtil.compareFiles(
new File(compareDir, "index.context.html").toString(),
@@ -110,7 +152,7 @@
}
else
{
- Log.log ("Passed (custom context)!");
+ log.info ("Passed (custom context)!");
}
}
Modified: velocity/anakia/trunk/src/test/org/apache/anakia/test/Log.java
URL:
http://svn.apache.org/viewvc/velocity/anakia/trunk/src/test/org/apache/anakia/test/Log.java?view=diff&rev=534873&r1=534872&r2=534873
==============================================================================
--- velocity/anakia/trunk/src/test/org/apache/anakia/test/Log.java (original)
+++ velocity/anakia/trunk/src/test/org/apache/anakia/test/Log.java Thu May 3
07:08:19 2007
@@ -1,5 +1,7 @@
package org.apache.anakia.test;
+import org.apache.anakia.AnakiaLog;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -26,21 +28,29 @@
*/
public class Log
+ implements AnakiaLog
{
- /**
- * Do not instantiate.
- */
- private Log ()
- {
+ public Log ()
+ {
}
/**
* Output a message;
* @param message
*/
- public static void log(String message)
+ public void log(final String message, final int level)
+ {
+ System.out.println("(Level " + level + ") " + message);
+ }
+
+ public void info(final String message)
+ {
+ System.out.println(message);
+ }
+
+ public void error(final String message)
{
- System.out.println(message);
+ System.err.println(message);
}
}
Modified: velocity/anakia/trunk/src/test/org/apache/anakia/test/TestUtil.java
URL:
http://svn.apache.org/viewvc/velocity/anakia/trunk/src/test/org/apache/anakia/test/TestUtil.java?view=diff&rev=534873&r1=534872&r2=534873
==============================================================================
--- velocity/anakia/trunk/src/test/org/apache/anakia/test/TestUtil.java
(original)
+++ velocity/anakia/trunk/src/test/org/apache/anakia/test/TestUtil.java Thu May
3 07:08:19 2007
@@ -29,33 +29,31 @@
*/
public class TestUtil
{
-
+ private static final Log log = new Log();
+
/**
* Do not instantiate.
*/
private TestUtil()
- {
+ {
}
/**
* Assures that the results directory exists. If the results directory
* cannot be created, fails the test.
*/
- public static void assureResultsDirectoryExists (String resultsDirectory)
+ public static void assureResultsDirectoryExists (final File
resultsDirectory)
{
- File dir = new File(resultsDirectory);
- if (!dir.exists())
+ if (!resultsDirectory.exists())
{
- Log.log("Template results directory does not exist");
- if (dir.mkdirs())
+ log.info("Template results directory does not exist");
+ if (resultsDirectory.mkdirs())
{
- Log.log("Created template results directory");
+ log.info("Created template results directory");
}
else
{
- String errMsg = "Unable to create template results directory";
- Log.log(errMsg);
- throw new RuntimeException(errMsg);
+ throw new RuntimeException("Unable to create template results
directory");
}
}
}
@@ -85,13 +83,13 @@
public static boolean compareFiles(String compareFileName, String
resultsFileName)
throws Exception
{
- Log.log("Comparing result file '" + resultsFileName + "' with compare
file '" + compareFileName + "'");
+ log.info("Comparing result file '" + resultsFileName + "' with compare
file '" + compareFileName + "'");
String resultText =
org.apache.velocity.util.StringUtils.fileContentsToString(resultsFileName);
return compareTextWithFile(resultText, compareFileName);
}
-
+
/**
* Returns whether the processed template matches the
* content of the provided comparison file.
@@ -115,5 +113,5 @@
return normalizedResultText.equals( normalizedCompareText );
}
-
+
}
