Author: jsong
Date: Mon Aug 16 10:03:14 2004
New Revision: 36478
Added:
incubator/beehive/trunk/controls/test/infra/mantis/
incubator/beehive/trunk/controls/test/infra/mantis/mantis.jar (contents,
props changed)
incubator/beehive/trunk/controls/test/infra/mantis/mantis.properties
incubator/beehive/trunk/controls/test/infra/mantis/tchschema.jar
(contents, props changed)
incubator/beehive/trunk/controls/test/infra/mantis/xbean-1.0.2.jar
(contents, props changed)
Removed:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/FreqVals.java
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/StatusVals.java
Modified:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
Log:
Contributed by Jamie Zyskowski: update mantis to have annotation values inside
the annotation class (only temporarily - will just use a string val in the near
future). Fix a bug with process exec
Added: incubator/beehive/trunk/controls/test/infra/mantis/mantis.jar
==============================================================================
Binary file. No diff available.
Added: incubator/beehive/trunk/controls/test/infra/mantis/mantis.properties
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/controls/test/infra/mantis/mantis.properties
Mon Aug 16 10:03:14 2004
@@ -0,0 +1 @@
+org.apache.beehive.mantis.annotations.tch=org.apache.beehive.mantis.TchProcessor
Added: incubator/beehive/trunk/controls/test/infra/mantis/tchschema.jar
==============================================================================
Binary file. No diff available.
Added: incubator/beehive/trunk/controls/test/infra/mantis/xbean-1.0.2.jar
==============================================================================
Binary file. No diff available.
Modified:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/MantisTask.java
Mon Aug 16 10:03:14 2004
@@ -4,7 +4,6 @@
import java.io.FileWriter;
import java.io.BufferedInputStream;
import java.io.IOException;
-import java.lang.InterruptedException;
import org.apache.tools.ant.taskdefs.MatchingTask;
import org.apache.tools.ant.BuildException;
@@ -130,24 +129,13 @@
Process p = Runtime.getRuntime().exec(cmd.toString());
stdout = new BufferedInputStream(p.getInputStream());
stderr = new BufferedInputStream(p.getErrorStream());
- int returnval = p.waitFor();
logStreams(stdout,stderr);
- System.out.println("RETURN: "+returnval);
+ System.out.println("RETURN: "+p.exitValue());
}
catch(IOException ioe)
{
ioe.printStackTrace();
System.out.println("ERROR: IOException during apt execution");
- }
- catch(InterruptedException ie)
- {
- ie.printStackTrace();
- System.out.println("ERROR: InterruptedException during apt execution");
- try
- {
- logStreams(stdout,stderr);
- }
- catch(IOException ioe){ioe.printStackTrace();}
}
}
Modified:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Freq.java
Mon Aug 16 10:03:14 2004
@@ -2,5 +2,7 @@
public @interface Freq
{
- String value() default FreqVals.CHECKIN;
+ String value() default Freq.CHECKIN;
+ public static final String CHECKIN = "checkin";
+ public static final String DETAILED = "detailed";
}
Modified:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/annotations/tch/Status.java
Mon Aug 16 10:03:14 2004
@@ -2,5 +2,7 @@
public @interface Status
{
- String value() default StatusVals.ACTIVE;
+ String value() default Status.ACTIVE;
+ public static final String ACTIVE = "active";
+ public static final String INACTIVE = "inactive";
}
Modified:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/CheckinTest.java
Mon Aug 16 10:03:14 2004
@@ -4,8 +4,8 @@
import org.apache.beehive.mantis.annotations.tch.*;
[EMAIL PROTECTED](FreqVals.CHECKIN)
[EMAIL PROTECTED](StatusVals.ACTIVE)
[EMAIL PROTECTED](Freq.CHECKIN)
[EMAIL PROTECTED](Status.ACTIVE)
@Desc("a class desc")
@Misc("a class misc")
public class CheckinTest extends TestCase
@@ -15,8 +15,8 @@
super(name);
}
- @Freq(FreqVals.DETAILED)
- @Status(StatusVals.INACTIVE)
+ @Freq(Freq.DETAILED)
+ @Status(Status.INACTIVE)
@Desc("a method desc")
@Misc("a method misc")
public void testPass() throws Exception
Modified:
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
==============================================================================
---
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
(original)
+++
incubator/beehive/trunk/controls/test/tools/mantis/src/org/apache/beehive/mantis/test/DetailedTest.java
Mon Aug 16 10:03:14 2004
@@ -11,8 +11,8 @@
super(name);
}
- @Freq(FreqVals.DETAILED)
- @Status(StatusVals.ACTIVE)
+ @Freq(Freq.DETAILED)
+ @Status(Status.ACTIVE)
@Desc("a method desc")
@Misc("a method misc")
public void testPass() throws Exception
