test run fix

evgeniy-khatko · Apr 7, 2014 · ba648f1 · ba648f1
1 parent 9e521ae
commit ba648f1
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 60 deletions.
diff --git a/CLAPOptions.cs b/CLAPOptions.cs
@@ -56,4 +56,4 @@ static void junit_update(
                 TfsCliUpdater updater = new TfsCliUpdater(run, results, _conData);
                 updater.UpdateResults();
             }            
-        }        [Verb(Aliases = "enc", Description = "Encrypts provided string to be used in App.config\nUsage: tfs_cli enc <password>")]        static void encrypt(            [RequiredAttribute, DescriptionAttribute("Password to be encrypted")]            string password            )        {            System.Console.WriteLine(StringEncriptor.Encrypt(password));            System.Environment.Exit(0);        }    }}
+        }        [Verb(Aliases = "enc", Description = "Encrypts provided string to be used in App.config\nUsage: tfs_cli enc /p=<password>")]        static void encrypt(            [RequiredAttribute, DescriptionAttribute("Password to be encrypted")]            string password            )        {            System.Console.WriteLine(StringEncriptor.Encrypt(password));            System.Environment.Exit(0);        }    }}

diff --git a/JunitReportParser.cs b/JunitReportParser.cs
@@ -19,11 +19,10 @@ public JunitReportParser(string report, string attach)
 
             if (ts == null)
                 throw new Exception("Could not parse " + report);
-            string run_comment = String.Concat(ts.Attributes());
+            string run_comment = String.Join(", ", ts.Attributes());
             var testcases = ts.Elements("testcase");
             foreach (var testcase in testcases)
-            {
-                TfsCliHelper.Debug(string.Format("JunitParseTest: \"{0}\"", testcase.Name));
+            {                
                 // parsing
                 string suite = testcase.Attribute("classname").Value;
                 string test = testcase.Attribute("name").Value;
@@ -33,20 +32,18 @@ public JunitReportParser(string report, string attach)
                 string outcome = (failed) ? "Failed" : "Passed";
                 if (failed)
                     failure_message = testcase.Descendants("failure").First().Attribute("message").Value;
-                string comment = testcase.Descendants().First().Value;
-
+                string comment = testcase.Descendants().First().Value;                
                 // put to dict
                 IRunResultProvider run = findRun(suite);
                 if (run == null)
                 {
                     run = new RunResultProvider(suite, "Autotest", "0", run_comment, attach, suite);
-                    _runs[run] = new List<ITestResultProvider>();
-                    _runs[run].Add(new TestResultProvider(test, outcome, suite, comment, null, "Unknown", failure_message, duration));
-                }
-                else
-                {
-                    _runs[run].Add(new TestResultProvider(test, outcome, suite, comment, null, "Unknown", failure_message, duration));
+                    _runs[run] = new List<ITestResultProvider>();                   
                 }
+                _runs[run].Add(new TestResultProvider(test, outcome, suite, comment, null, "Unknown", failure_message, duration));
+                TfsCliHelper.Debug(string.Format("JunitParseTest: {0} -> [suite={1}] [outcome={2}] [duration={3}] [failure={4}] ", 
+                    test, suite, outcome, duration, failure_message
+                    ));
             }
         }
 

diff --git a/TfsApi.cs b/TfsApi.cs
@@ -9,7 +9,8 @@
 namespace tfs_cli
 {
     class TfsApi
-    {
+    {
+        public const int DURATION_MULTIPLIER = 10000000;
         private TfsTeamProjectCollection _tfs;
         private ConnectionData _conData;
         private ITestManagementTeamProject _project;
@@ -109,7 +110,7 @@ string attach
                 result.Owner = _tfs.AuthorizedIdentity;
                 result.RunBy = _tfs.AuthorizedIdentity;
                 result.DateStarted = DateTime.Now;
-                result.Duration = new TimeSpan(10000000000 * (long.Parse(duration)));
+                result.Duration = new TimeSpan(DURATION_MULTIPLIER * (long.Parse(duration) + 1));
                 result.DateCompleted = DateTime.Now.AddTicks(result.Duration.Ticks);
                 result.FailureType = (FailureType)Enum.Parse(typeof(FailureType), failure_type);
                 result.ErrorMessage = error_message;
@@ -200,7 +201,7 @@ private ITestIterationResult CreateIteration(ITestCaseResult result, string outc
                 iteration.Outcome = (TestOutcome)Enum.Parse(typeof(TestOutcome), outcome);
                 iteration.DateStarted = DateTime.Now;
                 iteration.DateCompleted = DateTime.Now;
-                iteration.Duration = new TimeSpan(10000 * (int.Parse(duration)));
+                iteration.Duration = new TimeSpan(DURATION_MULTIPLIER * (long.Parse(duration) + 1));
                 iteration.Comment = comment;
                 if (attach != null)
                     iteration.Attachments.Add(iteration.CreateAttachment(attach));

diff --git a/TfsCliUpdater.cs b/TfsCliUpdater.cs
@@ -20,28 +20,24 @@ public void UpdateResults()
             connector.Connect();
 
             TfsApi tfsapi = new TfsApi(connector.Collection(), _conData);
-
+            Microsoft.TeamFoundation.TestManagement.Client.ITestRun run = tfsapi.CreateRun(
+                        tfsapi.GetSuite(_runRes.Suite()),
+                        _runRes.Title(), _runRes.Comment(),
+                        _runRes.BuildNumber(),
+                        _runRes.Attachment()
+                    );
             foreach (ITestResultProvider res in _results)
             {
                 tfsapi.UpdateTestResult
-                    (
-                    tfsapi.GetTestResult
-                    (
-                        tfsapi.CreateRun(
-                        tfsapi.GetSuite(_runRes.Suite()), 
-                        _runRes.Title(), _runRes.Comment(),
-                        _runRes.BuildNumber(), 
-                        _runRes.Attachment()
-                    ), 
-                    res.Title()
-                    ),
+                (
+                    tfsapi.GetTestResult(run, res.Title()),
                     res.Outcome(),
                     res.Duration(),
                     res.Comment(),
                     res.FailureType(),
                     res.ErrorMessage(),
                     res.Attachment()
-                    );
+                );
             }
         }
     }

diff --git a/bin/Release/tfs_cli.exe b/bin/Release/tfs_cli.exe
diff --git a/bin/Release/tfs_cli.pdb b/bin/Release/tfs_cli.pdb
diff --git a/bin/Release/tfs_cli.vshost.exe b/bin/Release/tfs_cli.vshost.exe
diff --git a/bin/Release/tfs_cli.vshost.exe.config b/bin/Release/tfs_cli.vshost.exe.config
diff --git a/bin/Release/tfs_cli.vshost.exe.manifest b/bin/Release/tfs_cli.vshost.exe.manifest
diff --git a/report.xml b/report.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<testsuite failures="0" tests="2">
+<testcase classname="pilot" name="initial" time="0.196592">
+<system-out><![CDATA[* use profile "cca_huawei".........................................................passed
+]]></system-out>
+</testcase>
+<testcase classname="pilot" name="use_profile" time="0.019922">
+<system-out><![CDATA[* use profile "cca_huawei".........................................................passed
+]]></system-out>
+</testcase>
+</testsuite>