[jboss-svn-commits] JBL Code SVN: r26910 - labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit.

[jboss-svn-commits at lists.jboss.org]

Author: adinn
Date: 2009-06-10 12:48:56 -0400 (Wed, 10 Jun 2009)
New Revision: 26910

Modified:
   labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/XML2JUnit.java
Log:
modified to use the timeout specified in the test group definition (element default_timeout in the testdef file) as the timeout for each individual task

Modified: labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/XML2JUnit.java
===================================================================
--- labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/XML2JUnit.java	2009-06-10 16:26:48 UTC (rev 26909)
+++ labs/jbosstm/trunk/qa/tests/src/org/jboss/jbossts/qa/junit/XML2JUnit.java	2009-06-10 16:48:56 UTC (rev 26910)
@@ -270,14 +270,17 @@
         TaskDefinition taskDefinition = getTaskDef(action, testDefinition);
         String outputDirectory;
         String filename;
+        int timeout;
+
         switch(action.getType()) {
             case Action.PERFORM_TASK:
                 String name = (action.getAssociatedRuntimeTaskId() == null ? ("task"+(nameCount++)) : action.getAssociatedRuntimeTaskId());
                 outputDirectory = testOutputDirectory(testDefinition, isSetup);
                 filename = testOutputFilename(testDefinition, name);
+                timeout = testTimeout(action, testDefinition);
                 buffer.append("\t\tTask "+name+" = createTask(");
                 buffer.append(taskDefinition.getClassName()+".class, Task.TaskType."+taskDefinition.getTypeText());
-                buffer.append(", \"" + outputDirectory + filename + "\", 600);\n");
+                buffer.append(", \"" + outputDirectory + filename + "\", " + timeout + ");\n");
                 if(action.getParameterList().length != 0) {
                     buffer.append("\t\t"+name+".perform("); // new String[] {
 
@@ -303,9 +306,10 @@
                 }
                 outputDirectory = testOutputDirectory(testDefinition, isSetup);
                 filename = testOutputFilename(testDefinition, action.getAssociatedRuntimeTaskId());
+                timeout = testTimeout(action, testDefinition);
                 buffer.append(action.getAssociatedRuntimeTaskId() + " = createTask(");
                 buffer.append(taskDefinition.getClassName()+".class, Task.TaskType."+taskDefinition.getTypeText());
-                buffer.append(", \"" + outputDirectory + filename + "\", 600);\n");
+                buffer.append(", \"" + outputDirectory + filename + "\", " + timeout + ");\n");
                 if(action.getParameterList().length != 0) {
                     buffer.append("\t\t"+action.getAssociatedRuntimeTaskId()+".start("); // new String[] {
 
@@ -361,6 +365,21 @@
         }
     }
 
+    private int testTimeout(Action action, TestDefinition testDefinition)
+    {
+        int timeout = 480;
+        try {
+            TaskDefinition taskDef = getTaskDef(action, testDefinition);
+            if (taskDef != null) {
+                timeout = taskDef.getTimeout();
+            }
+        } catch (Exception e) {
+            // ignore -- just use default timeout
+        }
+
+        return timeout;
+    }
+
     public void generateTest(TestDefinition testDefinition) throws Exception {
 
         if(testDefinition == null) {