report added to junit

evgeniy-khatko · Apr 3, 2014 · b7a4a7e · b7a4a7e
1 parent 7249cbf
commit b7a4a7e
Show file tree

Hide file tree

Showing 11 changed files with 74 additions and 97 deletions.
diff --git a/App.config b/App.config
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-  <appSettings>
-    <add key="url" value="https://user.visualstudio.com/DefaultCollection/" />
-    <add key="login" value="" />
-    <!-- following is password '123' encrpted-->
-    <add key="password" value="" />
-    <add key="project" value="" />
-    <add key="testplan" value="" />
-    <!-- proxy settings (OPTIONAL) -->
-    <add key="proxy_login" value="" />
-    <add key="proxy_password" value="" />
-    <add key="proxy_domain" value="" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" indentsize="4">
-      <listeners>
-        <add name="myListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="tfs_cli.log" />
-        <remove name="Default" />
-      </listeners>
-    </trace>
-  </system.diagnostics>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+  <appSettings>
+    <add key="url" value="http://ms-bssdev001.bee.vimpelcom.ru:8080/tfs/IT_SYSTEMS/" />
+    <add key="login" value="Ekhatko" />
+    <!-- following is password '123' encrpted-->
+    <add key="password" value="swiNjQLE2uWkZaQpf2D7ew==" />
+    <add key="project" value="CMD_ON" />
+    <add key="testplan" value="pilot" />
+    <!-- proxy settings (OPTIONAL) -->
+    <add key="proxy_login" value="" />
+    <add key="proxy_password" value="" />
+    <add key="proxy_domain" value="" />
+  </appSettings>
+  <system.diagnostics>
+    <trace autoflush="true" indentsize="4">
+      <listeners>
+        <add name="myListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="tfs_cli.log" />
+        <remove name="Default" />
+      </listeners>
+    </trace>
+  </system.diagnostics>
 </configuration>
diff --git a/CLAPOptions.cs b/CLAPOptions.cs
@@ -42,12 +42,13 @@ static void get_features(
         static void junit_update(
             [AliasesAttribute("r"), DescriptionAttribute("Junit report file"), RequiredAttribute]            [FileExists]
             string junit_report,
-            [AliasesAttribute("tp"), DefaultValue(""), DescriptionAttribute("Testplan to get tests from (overrides .config option)")]            string testplan
+            [AliasesAttribute("tp"), DefaultValue(""), DescriptionAttribute("Testplan to get tests from (overrides .config option)")]            string testplan,
+            [AliasesAttribute("ra"), DescriptionAttribute("Run attachment. E.g. overall run report")]            [FileExists]            string run_attachment
             )
         {
             if (testplan != "")
                 _conData.setTestPlan(testplan);
-            JunitReportParser jrp = new JunitReportParser(junit_report);
+            JunitReportParser jrp = new JunitReportParser(junit_report, run_attachment);
             IList<IRunResultProvider> RunResults = jrp.GetRunResults();
             foreach (IRunResultProvider run in RunResults)
             {

diff --git a/FeatureWriter.cs b/FeatureWriter.cs
@@ -19,7 +19,7 @@ protected override void WriteToOutput()
                 TfsCliHelper.Debug(string.Format("CopyFeaturesTo: \"{0}\"", _output));
                 foreach (var file in Directory.GetFiles(from))
                     File.Copy(file, Path.Combine(_output, Path.GetFileName(file)), true);
-                //Directory.Delete(from, true);
+                Directory.Delete(from, true);
             }
             catch (IOException e)
             {

diff --git a/JunitReportParser.cs b/JunitReportParser.cs
@@ -11,20 +11,24 @@ class JunitReportParser
     {
         private XDocument _doc;
         private Dictionary<IRunResultProvider, List<ITestResultProvider>> _runs = new Dictionary<IRunResultProvider, List<ITestResultProvider>>();
-        public JunitReportParser(string report)
+        public JunitReportParser(string report, string attach)
         {
             TfsCliHelper.Debug(string.Format("JunitParseFile: \"{0}\"", report));
             _doc = XDocument.Load(report);
-            XElement ts = _doc.Root.Element("testsuite");
+            XElement ts = _doc.Element("testsuite");
+            //XElement root = _doc.Element("testsuite");
+            //XElement testsuite = root.Element("testsuite");
+            if (ts == null)
+                throw new Exception("Could not parse " + report);
             string run_comment = String.Concat(ts.Attributes());
-            var testcases = _doc.Root.Element("testsuite").Elements("testcase");
+            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;
-                string duration =(1000*(Math.Floor(double.Parse(testcase.Attribute("time").Value)))).ToString();
+                string duration =(1000*(Math.Floor(double.Parse(testcase.Attribute("time").Value.Replace('.',','))))).ToString();
                 bool failed = (testcase.Descendants("failure").Count() > 0);
                 string failure_message = "";
                 string outcome = (failed) ? "Failed" : "Passed";
@@ -36,7 +40,7 @@ public JunitReportParser(string report)
                 IRunResultProvider run = findRun(suite);
                 if (run == null)
                 {
-                    run = new RunResultProvider(suite, "Autotest", "0", run_comment, report, suite);
+                    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));
                 }

diff --git a/bin/Release/tests.xml b/bin/Release/tests.xml
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.config b/bin/Release/tfs_cli.vshost.exe.config
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-    </startup>
-  <appSettings>
-    <add key="url" value="https://ekhatko.visualstudio.com/DefaultCollection/" />
-    <add key="login" value="[email protected]" />
-    <!-- following is password '123' encrpted-->
-    <add key="password" value="aYsKvHyDEQnoIuJ8Y1Qrfg==" />
-    <add key="project" value="cmd" />
-    <add key="testplan" value="bestplan" />
-    <!-- proxy settings (OPTIONAL) -->
-    <add key="proxy_login" value="Ekhatko" />
-    <add key="proxy_password" value="1Vimpelcom5!" />
-    <add key="proxy_domain" value="VIMPELCOM_MAIN" />
-  </appSettings>
-  <system.diagnostics>
-    <trace autoflush="true" indentsize="4">
-      <listeners>
-        <add name="myListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="tfs_cli.log" />
-        <remove name="Default" />
-      </listeners>
-    </trace>
-  </system.diagnostics>
+<?xml version="1.0" encoding="utf-8" ?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    </startup>
+  <appSettings>
+    <add key="url" value="http://ms-bssdev001.bee.vimpelcom.ru:8080/tfs/IT_SYSTEMS/" />
+    <add key="login" value="Ekhatko" />
+    <!-- following is password '123' encrpted-->
+    <add key="password" value="swiNjQLE2uWkZaQpf2D7ew==" />
+    <add key="project" value="CMD_ON" />
+    <add key="testplan" value="pilot" />
+    <!-- proxy settings (OPTIONAL) -->
+    <add key="proxy_login" value="" />
+    <add key="proxy_password" value="" />
+    <add key="proxy_domain" value="" />
+  </appSettings>
+  <system.diagnostics>
+    <trace autoflush="true" indentsize="4">
+      <listeners>
+        <add name="myListener" type="System.Diagnostics.TextWriterTraceListener" initializeData="tfs_cli.log" />
+        <remove name="Default" />
+      </listeners>
+    </trace>
+  </system.diagnostics>
 </configuration>
diff --git a/tfs_cli.csproj b/tfs_cli.csproj
@@ -93,7 +93,9 @@
     <Compile Include="TestsWriter.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config" />
+    <None Include="App.config">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>

diff --git a/tfs_cli.userprefs b/tfs_cli.userprefs
@@ -0,0 +1,8 @@
+<Properties>
+  <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
+  <MonoDevelop.Ide.Workbench />
+  <MonoDevelop.Ide.DebuggingService.Breakpoints>
+    <BreakpointStore />
+  </MonoDevelop.Ide.DebuggingService.Breakpoints>
+  <MonoDevelop.Ide.DebuggingService.PinnedWatches />
+</Properties>
diff --git a/tmp/TESTS-TestSuites.xml b/tmp/TESTS-TestSuites.xml