knut 2004/12/21 01:43:48
Modified: framework/src/test/org/apache/hivemind/conditional
TestEvaluationContext.java
framework build.xml
examples/src/test/com/panorama/startup/impl
TestTaskExecutor.java
Log:
Now all unit tests run successfully in Eclipse's JUnit runner without tweaking
Revision Changes Path
1.2 +1 -3
jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestEvaluationContext.java
Index: TestEvaluationContext.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/framework/src/test/org/apache/hivemind/conditional/TestEvaluationContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestEvaluationContext.java 19 Dec 2004 15:42:45 -0000 1.1
+++ TestEvaluationContext.java 21 Dec 2004 09:43:47 -0000 1.2
@@ -30,9 +30,7 @@
{
EvaluationContext ec = new EvaluationContextImpl(new
DefaultClassResolver());
- // Note: test will fail unless
- // -Dproperty-set-for-evaluation-context=true
- // is on JVM command line.
+ System.setProperty("property-set-for-evaluation-context", "true");
assertEquals(true,
ec.isPropertySet("property-set-for-evaluation-context"));
assertEquals(false,
ec.isPropertySet("this-property-does-not-exist"));
1.18 +0 -2 jakarta-hivemind/framework/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-hivemind/framework/build.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- build.xml 19 Dec 2004 15:44:33 -0000 1.17
+++ build.xml 21 Dec 2004 09:43:47 -0000 1.18
@@ -47,8 +47,6 @@
<!-- Adjust for wrong current directory when
framework/build.xml invoked from the project. -->
<sysproperty key="FRAMEWORK_ROOT"
value="${basedir}/"/>
- <!-- Needed for
org.apache.hivemind.conditional.TestEvaluationContext -->
- <sysproperty key="property-set-for-evaluation-context"
value="true"/>
</junit-elements>
</default-run-tests>
</target>
1.8 +1 -2
jakarta-hivemind/examples/src/test/com/panorama/startup/impl/TestTaskExecutor.java
Index: TestTaskExecutor.java
===================================================================
RCS file:
/home/cvs/jakarta-hivemind/examples/src/test/com/panorama/startup/impl/TestTaskExecutor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TestTaskExecutor.java 2 Nov 2004 17:46:12 -0000 1.7
+++ TestTaskExecutor.java 21 Dec 2004 09:43:48 -0000 1.8
@@ -21,7 +21,6 @@
import org.apache.commons.logging.Log;
import org.apache.hivemind.ApplicationRuntimeException;
-import org.apache.hivemind.ErrorHandler;
import org.apache.hivemind.ErrorLog;
import org.apache.hivemind.Messages;
import org.apache.hivemind.Resource;
@@ -66,7 +65,7 @@
public Messages getMessages()
{
- String projectRoot = System.getProperty("PROJECT_ROOT", "..");
+ String projectRoot = System.getProperty("PROJECT_ROOT", ".");
String path = projectRoot +
"/examples/src/descriptor/META-INF/panorama.startup.xml";
Resource r = new FileResource(path);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
