Changeset 4199

Timestamp:

04/18/08 13:45:30 (8 months ago)

Author:

jani.laakso@…

Message:

Warn only if email sending fails.

Testcase execution time is more accurate, now only one decimal for execution time shown on results.

Location:

ToolkitAutomatedTesting

Files:

• config.xml (modified) (2 diffs)
• src/com/itmill/toolkit/automatedtests/client/Email.java (modified) (1 diff)
• src/com/itmill/toolkit/automatedtests/client/LaunchToolkitTests.java (modified) (6 diffs)
• src/com/itmill/toolkit/automatedtests/client/TestResult.java (modified) (3 diffs)
• src/com/itmill/toolkit/automatedtests/client/TestRun.java (modified) (1 diff)
• src/com/itmill/toolkit/automatedtests/client/Util.java (modified) (1 diff)

ToolkitAutomatedTesting/config.xml

@@ -24 +24 @@
         <!-- Define alerts, what triggers email sending -->
         <alert>
-                <!--  alert if memory consumption for subsequent testruns changes more than 5% -->
-                <memconsumptionchangepercent>0.05</memconsumptionchangepercent>
-                <!--  alert if execution time for subsequent testcases changes more than 5% -->
-                <exectimechangepercent>0.05</exectimechangepercent>
+                <!--  alert if memory consumption for subsequent testruns changes more than 10% -->
+                <memconsumptionchangepercent>0.1</memconsumptionchangepercent>
+                <!--  alert if execution time for subsequent testcases changes more than 10% -->
+                <exectimechangepercent>0.1</exectimechangepercent>
         </alert>
 
@@ -157 +157 @@
                                 <testcase>
                                         <script>robustness-complex.txt</script>
-                                        <timeout>300</timeout>
+                                        <timeout>200</timeout>
                                         <target>3</target>
                                         <host>0</host>

ToolkitAutomatedTesting/src/com/itmill/toolkit/automatedtests/client/Email.java

@@ -39 +39 @@
 
                 // send the email
-                email.send();
-
+                try {
+                        email.send();
+                } catch (org.apache.commons.mail.EmailException e) {
+                        System.err.println("Could not send email, reason: "
+                                        + e.getMessage());
+                }
         }
 }

ToolkitAutomatedTesting/src/com/itmill/toolkit/automatedtests/client/LaunchToolkitTests.java

@@ -153 +153 @@
         private void executeTestcases(HierarchicalConfiguration testRun)
                         throws Exception {
+                // Get testrun name
                 String name = testRun.getString("name");
 
@@ -164 +165 @@
 
                 // Get used memory before testrun
-                Long memoryUsedBefore = ToolkitStatus.getMemoryUsage(120);
+                Long memoryUsedBefore = ToolkitStatus.getMemoryUsage(180);
 
                 TestRun run = new TestRun(name);
@@ -233 +234 @@
 
                         // wait task to finish
-                        Thread.sleep(8000);
-                        int pollCount = (timeout - 8) * 4;
+                        Thread.sleep(6000);
+                        int pollCount = (timeout - 6) * 2;
                         TaskStatus taskStatus = TaskStatus.NOT_STARTED;
                         while (pollCount > 0) {
                                 pollCount--;
-                                // poll every 250ms
-                                Thread.sleep(250);
+                                // poll every 500ms
+                                Thread.sleep(500);
                                 taskStatus = api.getTaskStatus(taskId);
                                 if (taskStatus != TaskStatus.RUNNING)
@@ -248 +249 @@
                         // Store test result
                         if (taskStatus == TaskStatus.FINISHED) {
-                                String testCaseHtmlRaport = api.getTaskResults(taskId).get(0);
-                                // Modify test result:
-                                // open "Details" and "Script" divs by default
-                                // also makes backbutton to work correctly
-                                testCaseHtmlRaport = testCaseHtmlRaport.replaceAll(
-                                                "\\<div style=\"display:none\"\\>", "<div style=\"\">");
-                                if (testCaseHtmlRaport.contains("<title>Passed:")) {
+                                String testReport = api.getTaskResults(taskId).get(0);
+                                // Open raport divs, which are normally hidden
+                                testReport = TestResult.openDivs(testReport);
+                                // Update started end ended from testresult
+                                try {
+                                        String started = TestResult.getId(testReport, "started");
+                                        if (started != null)
+                                                result.setStart(Util.dfTestResult.parse(started));
+                                        String ended = TestResult.getId(testReport, "ended");
+                                        if (ended != null)
+                                                result.setEnd(Util.dfTestResult.parse(ended));
+                                } catch (Exception ignored) {
+                                }
+                                // Get status
+                                if (testReport.contains("<title>Passed:")) {
                                         status = Status.PASSED;
                                 } else {
@@ -262 +271 @@
                                                 + testcaseName + ".html";
                                 Util.writeFile("results" + File.separator + filename,
-                                                testCaseHtmlRaport);
+                                                testReport);
                                 result.setTestresultLink(filename);
                         } else {
@@ -303 +312 @@
 
                         LaunchToolkitTests client = new LaunchToolkitTests();
-                        // test locally: for (int i = 0; i < 1000; i++)
-                        client.executeTestRuns();
+                        // test locally:
+                        for (int i = 0; i < 1000; i++)
+                                client.executeTestRuns();
 
                 } catch (Exception e) {

ToolkitAutomatedTesting/src/com/itmill/toolkit/automatedtests/client/TestResult.java

@@ -4 +4 @@
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
@@ -76 +78 @@
                 float f = (float) (end.getTime() - start.getTime()) / 1000;
                 BigDecimal dec = new BigDecimal(f);
-                dec = dec.setScale(2, BigDecimal.ROUND_HALF_UP);
+                dec = dec.setScale(1, BigDecimal.ROUND_HALF_UP);
                 return dec.toString();
         }
@@ -88 +90 @@
         }
 
+        /**
+         * Modify test result: open "Details" and "Script" divs by default also
+         * makes backbutton to work correctly.
+         * 
+         * @param testResult
+         * @return
+         */
+        public static String openDivs(String testResult) {
+                return testResult.replaceAll("\\<div style=\"display:none\"\\>",
+                                "<div style=\"\">");
+        }
+
+        public static String getId(String testResult, String id) {
+                Pattern pattern = Pattern.compile("<td id=\"" + id + "\">(.*)</td>");
+                Matcher matcher = pattern.matcher(testResult);
+                if (matcher.find())
+                        return matcher.group(1);
+                else
+                        return null;
+        }
+
 }

ToolkitAutomatedTesting/src/com/itmill/toolkit/automatedtests/client/TestRun.java

@@ -121 +121 @@
                 float f = (float) (end.getTime() - start.getTime()) / 1000;
                 BigDecimal dec = new BigDecimal(f);
-                dec = dec.setScale(2, BigDecimal.ROUND_HALF_UP);
+                dec = dec.setScale(1, BigDecimal.ROUND_HALF_UP);
                 return dec.toString();
         }

ToolkitAutomatedTesting/src/com/itmill/toolkit/automatedtests/client/Util.java

@@ -15 +15 @@
 
         public static DateFormat dfHuman = new SimpleDateFormat("yyyy-MM-dd HH:mm");
+
+        public static DateFormat dfTestResult = new SimpleDateFormat(
+                        "yyyy-MM-dd HH:mm:ss.S");
 
         // read file to String