From 569b6cf2aea66b729a7a702315d9ae80b9f12f7f Mon Sep 17 00:00:00 2001 From: James Dunkerley Date: Fri, 21 Apr 2017 17:44:28 +0100 Subject: [PATCH] Last few fixes and updates for 0.5.3 --- .../AlteryxAddIns.Roslyn.csproj | 12 +- AlteryxAddIns.Roslyn/packages.config | 6 +- AlteryxAddIns/AlteryxAddIns.csproj | 12 +- AlteryxAddIns/packages.config | 6 +- CreateRelease.ps1 | 2 +- OmniBus.AddIns.sln | 3 + .../OmniBus.DotNetEngines.csproj | 8 +- OmniBus.DotNetEngines/packages.config | 4 +- OmniBus.XmlTools/OmniBus.XmlTools.csproj | 12 +- OmniBus.XmlTools/XmlInputEngine.cs | 18 +- OmniBus.XmlTools/packages.config | 6 +- RunUnitTests.ps1 | 3 +- Test Workflows/ResultCompare.yxmc | 13 +- Test Workflows/XmlInputTest.xml | 18 ++ Test Workflows/XmlInputTest.yxmd | 205 ++++++++++++++++++ VersionInfo.cs | 8 +- 16 files changed, 287 insertions(+), 49 deletions(-) create mode 100644 Test Workflows/XmlInputTest.xml create mode 100644 Test Workflows/XmlInputTest.yxmd diff --git a/AlteryxAddIns.Roslyn/AlteryxAddIns.Roslyn.csproj b/AlteryxAddIns.Roslyn/AlteryxAddIns.Roslyn.csproj index 34ca64d..80f340d 100644 --- a/AlteryxAddIns.Roslyn/AlteryxAddIns.Roslyn.csproj +++ b/AlteryxAddIns.Roslyn/AlteryxAddIns.Roslyn.csproj @@ -50,14 +50,14 @@ ..\packages\Microsoft.CodeAnalysis.CSharp.1.3.2\lib\net45\Microsoft.CodeAnalysis.CSharp.dll True - - ..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll + + ..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll - - ..\packages\OmniBus.Framework.GUI.0.5.2\lib\net45\OmniBus.Framework.GUI.dll + + ..\packages\OmniBus.Framework.GUI.0.5.3\lib\net45\OmniBus.Framework.GUI.dll - - ..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll + + ..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll False diff --git a/AlteryxAddIns.Roslyn/packages.config b/AlteryxAddIns.Roslyn/packages.config index 96ad204..3a71ac6 100644 --- a/AlteryxAddIns.Roslyn/packages.config +++ b/AlteryxAddIns.Roslyn/packages.config @@ -3,9 +3,9 @@ - - - + + + diff --git a/AlteryxAddIns/AlteryxAddIns.csproj b/AlteryxAddIns/AlteryxAddIns.csproj index 69547e8..7d4b9b7 100644 --- a/AlteryxAddIns/AlteryxAddIns.csproj +++ b/AlteryxAddIns/AlteryxAddIns.csproj @@ -45,14 +45,14 @@ ..\packages\MathNet.Numerics.3.13.1\lib\net40\MathNet.Numerics.dll - - ..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll + + ..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll - - ..\packages\OmniBus.Framework.GUI.0.5.2\lib\net45\OmniBus.Framework.GUI.dll + + ..\packages\OmniBus.Framework.GUI.0.5.3\lib\net45\OmniBus.Framework.GUI.dll - - ..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll + + ..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll diff --git a/AlteryxAddIns/packages.config b/AlteryxAddIns/packages.config index 68f3555..1e5bd30 100644 --- a/AlteryxAddIns/packages.config +++ b/AlteryxAddIns/packages.config @@ -1,7 +1,7 @@  - - - + + + \ No newline at end of file diff --git a/CreateRelease.ps1 b/CreateRelease.ps1 index 10e876e..afc77b1 100644 --- a/CreateRelease.ps1 +++ b/CreateRelease.ps1 @@ -49,7 +49,7 @@ Get-ChildItem .\Release\Scripts\*.bat | Move-Item -Destination .\Release & .\Release\Install.bat .\RunUnitTests.ps1 -if ($LASTEXITCODE -eQ 2) { +if ($LASTEXITCODE -ne 0) { Pop-Location exit -1 } diff --git a/OmniBus.AddIns.sln b/OmniBus.AddIns.sln index ea0d158..5f6d12f 100644 --- a/OmniBus.AddIns.sln +++ b/OmniBus.AddIns.sln @@ -9,6 +9,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlteryxAddIns", "AlteryxAdd EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{E56FB22E-2BB8-4451-95E2-70CA5FF532AC}" ProjectSection(SolutionItems) = preProject + Installbin.ps1 = Installbin.ps1 + InstallbinDebug.bat = InstallbinDebug.bat + InstallbinRelease.bat = InstallbinRelease.bat OmniBus.ruleset = OmniBus.ruleset VersionInfo.cs = VersionInfo.cs EndProjectSection diff --git a/OmniBus.DotNetEngines/OmniBus.DotNetEngines.csproj b/OmniBus.DotNetEngines/OmniBus.DotNetEngines.csproj index aca6a96..52b9818 100644 --- a/OmniBus.DotNetEngines/OmniBus.DotNetEngines.csproj +++ b/OmniBus.DotNetEngines/OmniBus.DotNetEngines.csproj @@ -45,11 +45,11 @@ ..\packages\MathNet.Numerics.3.13.1\lib\net40\MathNet.Numerics.dll - - ..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll + + ..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll - - ..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll + + ..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll diff --git a/OmniBus.DotNetEngines/packages.config b/OmniBus.DotNetEngines/packages.config index 06625fd..c297c32 100644 --- a/OmniBus.DotNetEngines/packages.config +++ b/OmniBus.DotNetEngines/packages.config @@ -1,7 +1,7 @@  - - + + \ No newline at end of file diff --git a/OmniBus.XmlTools/OmniBus.XmlTools.csproj b/OmniBus.XmlTools/OmniBus.XmlTools.csproj index e4d57d8..1eee067 100644 --- a/OmniBus.XmlTools/OmniBus.XmlTools.csproj +++ b/OmniBus.XmlTools/OmniBus.XmlTools.csproj @@ -40,14 +40,14 @@ C:\Program Files\Alteryx\bin\AlteryxRecordInfo.Net.dll False - - ..\packages\OmniBus.Framework.0.5.2\lib\net45\OmniBus.Framework.dll + + ..\packages\OmniBus.Framework.0.5.3\lib\net45\OmniBus.Framework.dll - - ..\packages\OmniBus.Framework.GUI.0.5.2\lib\net45\OmniBus.Framework.GUI.dll + + ..\packages\OmniBus.Framework.GUI.0.5.3\lib\net45\OmniBus.Framework.GUI.dll - - ..\packages\OmniBus.Framework.Shared.0.5.2\lib\net45\OmniBus.Framework.Shared.dll + + ..\packages\OmniBus.Framework.Shared.0.5.3\lib\net45\OmniBus.Framework.Shared.dll diff --git a/OmniBus.XmlTools/XmlInputEngine.cs b/OmniBus.XmlTools/XmlInputEngine.cs index 724ce52..4d93f9b 100644 --- a/OmniBus.XmlTools/XmlInputEngine.cs +++ b/OmniBus.XmlTools/XmlInputEngine.cs @@ -80,7 +80,13 @@ public IEnumerable ReadNodes() return null; } - if (!System.IO.File.Exists(this.ConfigObject.FileName)) + var fileName = System.IO.Path.IsPathRooted(this.ConfigObject.FileName) + ? this.ConfigObject.FileName + : System.IO.Path.Combine( + this.Engine.GetInitVar(nameof(InitVar.DefaultDir)), + this.ConfigObject.FileName); + + if (!System.IO.File.Exists(fileName)) { this.Message($"File {this.ConfigObject.FileName} could not be read.", MessageStatus.STATUS_Error); return null; @@ -90,7 +96,7 @@ public IEnumerable ReadNodes() try { - document.Load(this.ConfigObject.FileName); + document.Load(fileName); } catch (XmlException ex) { @@ -105,6 +111,8 @@ public IEnumerable ReadNodes() /// Read All The Xml Nodes From A Node /// Recursive scan from input node /// + /// Xml node to scan + /// Current path to node /// List of nodes public IEnumerable ReadNodes(XmlNode node, string path = "") { @@ -115,14 +123,14 @@ public IEnumerable ReadNodes(XmlNode node, string path = "") path = path + "/" + (node is XmlAttribute ? "@" : "") + node.Name; - var nodes = node.ChildNodes.Cast(); + var nodes = node.ChildNodes.Cast().ToArray(); var txtNodes = nodes.Where(x => x.Name == "#text").ToArray(); - var txt = txtNodes.Length == 0 ? node.InnerText : null; + var txt = nodes.Length == 0 ? node.InnerText : null; if (txtNodes.Length == 1) { txt = txtNodes[0].InnerText; - nodes = nodes.Where(n => n.Name != "#text"); + nodes = nodes.Where(n => n.Name != "#text").ToArray(); } IEnumerable result = new[] { new object[] { path, txt, node.InnerXml } }; diff --git a/OmniBus.XmlTools/packages.config b/OmniBus.XmlTools/packages.config index 6f87c2a..e1b54e7 100644 --- a/OmniBus.XmlTools/packages.config +++ b/OmniBus.XmlTools/packages.config @@ -1,6 +1,6 @@  - - - + + + \ No newline at end of file diff --git a/RunUnitTests.ps1 b/RunUnitTests.ps1 index 3e7de6a..24990c7 100644 --- a/RunUnitTests.ps1 +++ b/RunUnitTests.ps1 @@ -34,4 +34,5 @@ foreach ($bin in $bins) { Write-Host "Unit Tests Passed." } -Pop-Location \ No newline at end of file +Pop-Location +exit 0 \ No newline at end of file diff --git a/Test Workflows/ResultCompare.yxmc b/Test Workflows/ResultCompare.yxmc index bfde172..b5f84be 100644 --- a/Test Workflows/ResultCompare.yxmc +++ b/Test Workflows/ResultCompare.yxmc @@ -580,7 +580,7 @@ IF ISNULL([Value]) THEN - ISNULL([Right_Value]) + NOT(ISNULL([Right_Value])) ELSEIF Type = "Float" then ABS(ToNumber([Right_Value]) - ToNumber(Value)) > 1e-5 ELSEIF Type = "Double" then @@ -593,8 +593,8 @@ ENDIF IF ISNULL([Value]) THEN - ISNULL([Right_Value]) -ELSEIF Type = ... + NOT(ISNULL([Right_Value])) +ELSEIF Ty... @@ -792,7 +792,10 @@ ELSEIF Type = ... Warning Medium False - "Value Difference: " + tostring([__RecordID],0) + ": " + [Name] + " Expected=" +[Value] + " Actual=" + [Right_Value] + "Value Difference: " + +tostring([__RecordID],0) + ": " + [Name] + " Expected=" + +IIF(ISNULL([Value]),"[NULL]",[Value]) + " Actual=" + +IIF(ISNULL([Right_Value]),"[NULL]",[Right_Value]) @@ -1125,7 +1128,7 @@ ELSEIF Type = ... Macro - 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 diff --git a/Test Workflows/XmlInputTest.xml b/Test Workflows/XmlInputTest.xml new file mode 100644 index 0000000..567a177 --- /dev/null +++ b/Test Workflows/XmlInputTest.xml @@ -0,0 +1,18 @@ + + + + Product One + Product One is an exciting new widget that will simplify your life. + $19.95 + $2.95 + + + Product Two + + + Product Three + This is such a terrific widget that you will most certainly want to buy one for your home and another one for your office! + $24.95 + $0.00 + + \ No newline at end of file diff --git a/Test Workflows/XmlInputTest.yxmd b/Test Workflows/XmlInputTest.yxmd new file mode 100644 index 0000000..6ebc9db --- /dev/null +++ b/Test Workflows/XmlInputTest.yxmd @@ -0,0 +1,205 @@ + + + + + + + + + + XmlInputTest.xml + + + + XmlInputTest.xml + + + + + + + + + + + + + + + + + + + + /productListing + + <product><name>Product One</name><description>Product One is an exciting new widget that will simplify your life.</description><cost>$19.95</cost><shipping>$2.95</shipping></product><product><name>Product Two</name></product><product><name>Product Three</name><description>This is such a terrific widget that you will most certainly want to buy one for your home and another one for your office!</description><cost>$24.95</cost><shipping>$0.00</shipping></product> + + + /productListing/@title + ABC Products + ABC Products + + + /productListing/product + + <name>Product One</name><description>Product One is an exciting new widget that will simplify your life.</description><cost>$19.95</cost><shipping>$2.95</shipping> + + + /productListing/product/name + Product One + Product One + + + /productListing/product/description + Product One is an exciting new widget that will simplify your life. + Product One is an exciting new widget that will simplify your life. + + + /productListing/product/cost + $19.95 + $19.95 + + + /productListing/product/shipping + $2.95 + $2.95 + + + /productListing/product + + <name>Product Two</name> + + + /productListing/product/name + Product Two + Product Two + + + /productListing/product + + <name>Product Three</name><description>This is such a terrific widget that you will most certainly want to buy one for your home and another one for your office!</description><cost>$24.95</cost><shipping>$0.00</shipping> + + + /productListing/product/name + Product Three + Product Three + + + /productListing/product/description + This is such a terrific widget that you will most certainly want to buy one for your home and another one for your office! + This is such a terrific widget that you will most certainly want to buy one for your home and another one for your office! + + + /productListing/product/cost + $24.95 + $24.95 + + + /productListing/product/shipping + $0.00 + $0.00 + + + + + ExpectXMLResults + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Horizontal + + + XmlInputTest + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/VersionInfo.cs b/VersionInfo.cs index 6f07937..cf89a45 100644 --- a/VersionInfo.cs +++ b/VersionInfo.cs @@ -7,8 +7,8 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("JDunkerley.co.uk")] -[assembly: AssemblyProduct("OmniBus.AlteryxAddIns")] -[assembly: AssemblyCopyright("Copyright © James Dunkerley 2016")] +[assembly: AssemblyProduct("OmniBus")] +[assembly: AssemblyCopyright("Copyright © James Dunkerley 2015 - 2017")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -29,5 +29,5 @@ // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.5.2.0")] -[assembly: AssemblyFileVersion("0.5.2.0")] \ No newline at end of file +[assembly: AssemblyVersion("0.5.3.0")] +[assembly: AssemblyFileVersion("0.5.3.0")] \ No newline at end of file