hlship 2005/01/05 17:33:26
Modified: framework/src/test/hivemind/test/ant
TestConstructRegistry.java
Log:
Fix some missing copyrights and some Java compile warnings.
Revision Changes Path
1.13 +28 -24
jakarta-hivemind/framework/src/test/hivemind/test/ant/TestConstructRegistry.java
Index: TestConstructRegistry.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/hivemind/test/ant/TestConstructRegistry.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- TestConstructRegistry.java 14 Oct 2004 14:31:32 -0000 1.12
+++ TestConstructRegistry.java 6 Jan 2005 01:33:26 -0000 1.13
@@ -1,4 +1,4 @@
-// Copyright 2004 The Apache Software Foundation
+// Copyright 2004, 2005 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -31,17 +31,15 @@
import org.apache.tools.ant.types.Path;
/**
- * Tests for the [EMAIL PROTECTED] org.apache.hivemind.ant.ConstructRegistry}
- * Ant task.
- *
- * <p>An earlier version of this suite built using the real hivemodule.xml
(in src/META-INF)
- * but that caused issues because it was constantly changing, so we
- * use a copy (src/test-data/TestConstructRegistry/master.xml).
- *
+ * Tests for the [EMAIL PROTECTED]
org.apache.hivemind.ant.ConstructRegistry}Ant task.
* <p>
- * These tests are *VERY* dependent on JDK version (really, on the version
of the
- * XML parser provided with the JDK). Therefore, we skip the tests for JDK
1.3.
- *
+ * An earlier version of this suite built using the real hivemodule.xml (in
src/META-INF) but that
+ * caused issues because it was constantly changing, so we use a copy
+ * (src/test-data/TestConstructRegistry/master.xml).
+ * <p>
+ * These tests are *VERY* dependent on JDK version (really, on the version
of the XML parser
+ * provided with the JDK). Therefore, we skip the tests for JDK 1.3.
+ *
* @author Howard Lewis Ship
*/
public class TestConstructRegistry extends FrameworkTestCase
@@ -110,9 +108,9 @@
Path p = cr.createDescriptors();
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/master.xml")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/master.xml")));
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/Symbols.xml")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/Symbols.xml")));
File output = File.createTempFile("testBasic-", ".xml");
@@ -126,7 +124,9 @@
cr.execute();
- compare(output,
getFrameworkPath("src/test-data/TestConstructRegistry/testBasic.xml"));
+ compare(
+ output,
+
getFrameworkPath("src/test-data/TestConstructRegistry/testBasic.xml.master"));
}
public void testLocalRefs() throws Exception
@@ -139,7 +139,7 @@
Path p = cr.createDescriptors();
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/LocalRefs.xml")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/LocalRefs.xml")));
File output = File.createTempFile("testLocalRefs-", ".xml");
@@ -153,7 +153,9 @@
cr.execute();
- compare(output,
getFrameworkPath("src/test-data/TestConstructRegistry/testLocalRefs.xml"));
+ compare(
+ output,
+
getFrameworkPath("src/test-data/TestConstructRegistry/testLocalRefs.xml.master"));
}
public void testUptoDate() throws Exception
@@ -166,9 +168,9 @@
Path p = cr.createDescriptors();
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/master.xml")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/master.xml")));
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/Symbols.xml")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/Symbols.xml")));
File output = File.createTempFile("testUptoDate-", ".xml");
@@ -182,7 +184,9 @@
cr.execute();
- compare(output,
getFrameworkPath("src/test-data/TestConstructRegistry/testUptoDate.xml"));
+ compare(
+ output,
+
getFrameworkPath("src/test-data/TestConstructRegistry/testUptoDate.xml.master"));
long stamp = output.lastModified();
@@ -201,11 +205,11 @@
Path p = cr.createDescriptors();
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/master.xml")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/master.xml")));
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/empty.jar")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/empty.jar")));
p.createPath().setLocation(
- new
File(getFrameworkPath("src/test-data/TestConstructRegistry/module.jar")));
+ new
File(getFrameworkPath("src/test-data/TestConstructRegistry/module.jar")));
File output = File.createTempFile("testJars-", ".xml");
@@ -217,7 +221,7 @@
cr.execute();
- compare(output,
getFrameworkPath("src/test-data/TestConstructRegistry/testJars.xml"));
+ compare(output,
getFrameworkPath("src/test-data/TestConstructRegistry/testJars.xml.master"));
}
protected void compare(File actual, String expectedPath) throws Exception
@@ -254,4 +258,4 @@
return buffer.toString();
}
-}
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
