From a58ea550bddb7f1adca9beca3cc74337e59fddda Mon Sep 17 00:00:00 2001 From: Radu Gidei Date: Sat, 18 Aug 2018 21:31:27 +0300 Subject: [PATCH 01/11] Update README.md add Codacy and Travis badges --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9954c8b..d712757 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # DynaWeb -[![Build Status](https://travis-ci.org/radumg/DynWWW.svg?branch=master)](https://travis-ci.org/radumg/DynWWW) [![GitHub version](https://badge.fury.io/gh/radumg%2FDynaWeb.svg)](https://badge.fury.io/gh/radumg%2FDynaWeb) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/radumg/DynaWeb/blob/master/CONTRIBUTING.md) +[![Build Status](https://travis-ci.org/radumg/DynaWeb.svg?branch=master)](https://travis-ci.org/radumg/DynaWeb) [![GitHub version](https://badge.fury.io/gh/radumg%2FDynaWeb.svg)](https://badge.fury.io/gh/radumg%2FDynaWeb) [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/radumg/DynaWeb/blob/master/CONTRIBUTING.md) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f482d6c8bb27468e916bba4471511615)](https://www.codacy.com/project/radugidei/DynaWeb/dashboard?utm_source=github.com&utm_medium=referral&utm_content=radumg/DynaWeb&utm_campaign=Badge_Grade_Dashboard) --- __DynaWeb__ is a [Dynamo](http://www.dynamobim.org) package providing support for interaction with the interwebz in general and with REST APIs in particular. From 408c2342844483e9e9c269b4599df0fd7c474b29 Mon Sep 17 00:00:00 2001 From: Radu Gidei Date: Sat, 18 Aug 2018 21:48:35 +0300 Subject: [PATCH 02/11] rename solution & delete old redundant projects - rename to DynaWeb.sln - delete DebugApp & Tests project - both empty --- src/DebugApp/App.config | 6 -- src/DebugApp/DebugApp.csproj | 59 ------------------- src/DebugApp/Program.cs | 15 ----- src/DebugApp/Properties/AssemblyInfo.cs | 36 ----------- src/DebugApp/packages.config | 5 -- src/{DynaWeb.All.sln => DynaWeb.sln} | 19 +++--- test/DynaWeb.Core.Tests/Class1.cs | 12 ---- .../DynaWeb.Core.Tests.csproj | 56 ------------------ .../Properties/AssemblyInfo.cs | 36 ----------- test/DynaWeb.Core.Tests/packages.config | 5 -- 10 files changed, 8 insertions(+), 241 deletions(-) delete mode 100644 src/DebugApp/App.config delete mode 100644 src/DebugApp/DebugApp.csproj delete mode 100644 src/DebugApp/Program.cs delete mode 100644 src/DebugApp/Properties/AssemblyInfo.cs delete mode 100644 src/DebugApp/packages.config rename src/{DynaWeb.All.sln => DynaWeb.sln} (53%) delete mode 100644 test/DynaWeb.Core.Tests/Class1.cs delete mode 100644 test/DynaWeb.Core.Tests/DynaWeb.Core.Tests.csproj delete mode 100644 test/DynaWeb.Core.Tests/Properties/AssemblyInfo.cs delete mode 100644 test/DynaWeb.Core.Tests/packages.config diff --git a/src/DebugApp/App.config b/src/DebugApp/App.config deleted file mode 100644 index 88fa402..0000000 --- a/src/DebugApp/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/DebugApp/DebugApp.csproj b/src/DebugApp/DebugApp.csproj deleted file mode 100644 index 61a4e9f..0000000 --- a/src/DebugApp/DebugApp.csproj +++ /dev/null @@ -1,59 +0,0 @@ - - - - - Debug - AnyCPU - {F2D82A82-100B-4594-B50F-7C7C815C4370} - Exe - DebugApp - DebugApp - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/DebugApp/Program.cs b/src/DebugApp/Program.cs deleted file mode 100644 index 69c7c5d..0000000 --- a/src/DebugApp/Program.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DebugApp -{ - class Program - { - static void Main(string[] args) - { - } - } -} diff --git a/src/DebugApp/Properties/AssemblyInfo.cs b/src/DebugApp/Properties/AssemblyInfo.cs deleted file mode 100644 index 41dfbc1..0000000 --- a/src/DebugApp/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DebugApp")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DebugApp")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("f2d82a82-100b-4594-b50f-7c7c815c4370")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/src/DebugApp/packages.config b/src/DebugApp/packages.config deleted file mode 100644 index d186dc1..0000000 --- a/src/DebugApp/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/DynaWeb.All.sln b/src/DynaWeb.sln similarity index 53% rename from src/DynaWeb.All.sln rename to src/DynaWeb.sln index ae074cc..8c802f6 100644 --- a/src/DynaWeb.All.sln +++ b/src/DynaWeb.sln @@ -5,9 +5,7 @@ VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynaWeb", "DynaWeb\DynaWeb.csproj", "{CE19C882-1AAC-434C-99AF-4A285DA053BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DebugApp", "DebugApp\DebugApp.csproj", "{F2D82A82-100B-4594-B50F-7C7C815C4370}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynaWeb.Core.Tests", "..\test\DynaWeb.Core.Tests\DynaWeb.Core.Tests.csproj", "{50A649C6-FB32-4C6D-A7B6-6EB99DE8547D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynaWeb.Tests", "DynaWeb.Tests1\DynaWeb.Tests.csproj", "{86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,16 +17,15 @@ Global {CE19C882-1AAC-434C-99AF-4A285DA053BA}.Debug|Any CPU.Build.0 = Debug|Any CPU {CE19C882-1AAC-434C-99AF-4A285DA053BA}.Release|Any CPU.ActiveCfg = Release|Any CPU {CE19C882-1AAC-434C-99AF-4A285DA053BA}.Release|Any CPU.Build.0 = Release|Any CPU - {F2D82A82-100B-4594-B50F-7C7C815C4370}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2D82A82-100B-4594-B50F-7C7C815C4370}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2D82A82-100B-4594-B50F-7C7C815C4370}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2D82A82-100B-4594-B50F-7C7C815C4370}.Release|Any CPU.Build.0 = Release|Any CPU - {50A649C6-FB32-4C6D-A7B6-6EB99DE8547D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {50A649C6-FB32-4C6D-A7B6-6EB99DE8547D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {50A649C6-FB32-4C6D-A7B6-6EB99DE8547D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {50A649C6-FB32-4C6D-A7B6-6EB99DE8547D}.Release|Any CPU.Build.0 = Release|Any CPU + {86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {17904F06-2926-4867-BF32-DB627052F52D} + EndGlobalSection EndGlobal diff --git a/test/DynaWeb.Core.Tests/Class1.cs b/test/DynaWeb.Core.Tests/Class1.cs deleted file mode 100644 index 4dd88a6..0000000 --- a/test/DynaWeb.Core.Tests/Class1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DynaWeb.Core.Tests -{ - public class Class1 - { - } -} diff --git a/test/DynaWeb.Core.Tests/DynaWeb.Core.Tests.csproj b/test/DynaWeb.Core.Tests/DynaWeb.Core.Tests.csproj deleted file mode 100644 index 0bf7a22..0000000 --- a/test/DynaWeb.Core.Tests/DynaWeb.Core.Tests.csproj +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Debug - AnyCPU - {50A649C6-FB32-4C6D-A7B6-6EB99DE8547D} - Library - Properties - DynWWW.Core.Tests - DynWWW.Core.Tests - v4.5.2 - 512 - - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\..\src\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - - - ..\..\src\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/DynaWeb.Core.Tests/Properties/AssemblyInfo.cs b/test/DynaWeb.Core.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 1591b51..0000000 --- a/test/DynaWeb.Core.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("DynaWeb.Core.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("DynaWeb.Core.Tests")] -[assembly: AssemblyCopyright("Copyright © 2017")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("50a649c6-fb32-4c6d-a7b6-6eb99de8547d")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/DynaWeb.Core.Tests/packages.config b/test/DynaWeb.Core.Tests/packages.config deleted file mode 100644 index d186dc1..0000000 --- a/test/DynaWeb.Core.Tests/packages.config +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file From d55e023ead9297bc2ff4e52efe197430b3c060c7 Mon Sep 17 00:00:00 2001 From: Radu Gidei Date: Sat, 18 Aug 2018 21:52:11 +0300 Subject: [PATCH 03/11] add new Tests project & scaffold it - generate NUnit3 tests from the DynaWeb classes with simple Assert.Fail statement --- src/DynaWeb.sln | 2 +- test/DynaWeb.Tests/Classes/ExecuteTests.cs | 68 ++++++++++ test/DynaWeb.Tests/Classes/WebClientTests.cs | 74 ++++++++++ test/DynaWeb.Tests/Classes/WebRequestTests.cs | 128 ++++++++++++++++++ .../DynaWeb.Tests/Classes/WebResponseTests.cs | 20 +++ test/DynaWeb.Tests/DynaWeb.Tests.csproj | 105 ++++++++++++++ test/DynaWeb.Tests/Helpers/HelpersTests.cs | 62 +++++++++ test/DynaWeb.Tests/Properties/AssemblyInfo.cs | 36 +++++ test/DynaWeb.Tests/packages.config | 4 + 9 files changed, 498 insertions(+), 1 deletion(-) create mode 100644 test/DynaWeb.Tests/Classes/ExecuteTests.cs create mode 100644 test/DynaWeb.Tests/Classes/WebClientTests.cs create mode 100644 test/DynaWeb.Tests/Classes/WebRequestTests.cs create mode 100644 test/DynaWeb.Tests/Classes/WebResponseTests.cs create mode 100644 test/DynaWeb.Tests/DynaWeb.Tests.csproj create mode 100644 test/DynaWeb.Tests/Helpers/HelpersTests.cs create mode 100644 test/DynaWeb.Tests/Properties/AssemblyInfo.cs create mode 100644 test/DynaWeb.Tests/packages.config diff --git a/src/DynaWeb.sln b/src/DynaWeb.sln index 8c802f6..12ed51f 100644 --- a/src/DynaWeb.sln +++ b/src/DynaWeb.sln @@ -5,7 +5,7 @@ VisualStudioVersion = 15.0.26430.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynaWeb", "DynaWeb\DynaWeb.csproj", "{CE19C882-1AAC-434C-99AF-4A285DA053BA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynaWeb.Tests", "DynaWeb.Tests1\DynaWeb.Tests.csproj", "{86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynaWeb.Tests", "..\test\DynaWeb.Tests\DynaWeb.Tests.csproj", "{86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/test/DynaWeb.Tests/Classes/ExecuteTests.cs b/test/DynaWeb.Tests/Classes/ExecuteTests.cs new file mode 100644 index 0000000..ee21c1b --- /dev/null +++ b/test/DynaWeb.Tests/Classes/ExecuteTests.cs @@ -0,0 +1,68 @@ +using NUnit.Framework; +using DynaWeb; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DynaWeb.Tests +{ + [TestFixture()] + public class ExecuteTests + { + [Test()] + public void ByClientRequestMethod_Test() + { + Assert.Fail(); + } + + [Test()] + public void GET_Test() + { + Assert.Fail(); + } + + [Test()] + public void POST_Test() + { + Assert.Fail(); + } + + [Test()] + public void PUT_Test() + { + Assert.Fail(); + } + + [Test()] + public void DELETE_Test() + { + Assert.Fail(); + } + + [Test()] + public void HEAD_Test() + { + Assert.Fail(); + } + + [Test()] + public void MERGE_Test() + { + Assert.Fail(); + } + + [Test()] + public void OPTIONS_Test() + { + Assert.Fail(); + } + + [Test()] + public void PATCH_Test() + { + Assert.Fail(); + } + } +} \ No newline at end of file diff --git a/test/DynaWeb.Tests/Classes/WebClientTests.cs b/test/DynaWeb.Tests/Classes/WebClientTests.cs new file mode 100644 index 0000000..395e177 --- /dev/null +++ b/test/DynaWeb.Tests/Classes/WebClientTests.cs @@ -0,0 +1,74 @@ +using NUnit.Framework; +using DynaWeb; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DynaWeb.Tests +{ + [TestFixture()] + public class WebClientTests + { + [Test()] + public void ByUrlTest() + { + Assert.Fail(); + } + + [Test()] + public void ByUrlTokenTest() + { + Assert.Fail(); + } + + [Test()] + public void ExecuteTest() + { + Assert.Fail(); + } + + [Test()] + public void BuildUriTest() + { + Assert.Fail(); + } + + [Test()] + public void SetBaseURLTest() + { + Assert.Fail(); + } + + [Test()] + public void SetUserAgentTest() + { + Assert.Fail(); + } + + [Test()] + public void SetTimeoutTest() + { + Assert.Fail(); + } + + [Test()] + public void SetFollowRedirectsTest() + { + Assert.Fail(); + } + + [Test()] + public void SetMaxRedirectsTest() + { + Assert.Fail(); + } + + [Test()] + public void SetJsonTokenOverrideTest() + { + Assert.Fail(); + } + } +} \ No newline at end of file diff --git a/test/DynaWeb.Tests/Classes/WebRequestTests.cs b/test/DynaWeb.Tests/Classes/WebRequestTests.cs new file mode 100644 index 0000000..7d1c3ea --- /dev/null +++ b/test/DynaWeb.Tests/Classes/WebRequestTests.cs @@ -0,0 +1,128 @@ +using NUnit.Framework; +using DynaWeb; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DynaWeb.Tests +{ + [TestFixture()] + public class WebRequestTests + { + [Test()] + public void ByUrlTest() + { + Assert.Fail(); + } + + [Test()] + public void ByEndpointTest() + { + Assert.Fail(); + } + + [Test()] + public void ExecuteTest() + { + Assert.Fail(); + } + + [Test()] + public void SetMethodTest() + { + Assert.Fail(); + } + + [Test()] + public void SetRequestFormatTest() + { + Assert.Fail(); + } + + [Test()] + public void SetUrlTest() + { + Assert.Fail(); + } + + [Test()] + public void SetResourceTest() + { + Assert.Fail(); + } + + [Test()] + public void SetSecurityProtocolTest() + { + Assert.Fail(); + } + + [Test()] + public void AddFileTest() + { + Assert.Fail(); + } + + [Test()] + public void AddFileAsBytesTest() + { + Assert.Fail(); + } + + [Test()] + public void AddBodyTest() + { + Assert.Fail(); + } + + [Test()] + public void AddJsonBodyTest() + { + Assert.Fail(); + } + + [Test()] + public void AddXmlBodyTest() + { + Assert.Fail(); + } + + [Test()] + public void AddObjectTest() + { + Assert.Fail(); + } + + [Test()] + public void AddParameterTest() + { + Assert.Fail(); + } + + [Test()] + public void AddHeaderTest() + { + Assert.Fail(); + } + + [Test()] + public void AddCookieTest() + { + Assert.Fail(); + } + + [Test()] + public void AddUrlSegmentTest() + { + Assert.Fail(); + } + + [Test()] + public void AddQueryParameterTest() + { + Assert.Fail(); + } + } +} \ No newline at end of file diff --git a/test/DynaWeb.Tests/Classes/WebResponseTests.cs b/test/DynaWeb.Tests/Classes/WebResponseTests.cs new file mode 100644 index 0000000..b6a09ba --- /dev/null +++ b/test/DynaWeb.Tests/Classes/WebResponseTests.cs @@ -0,0 +1,20 @@ +using NUnit.Framework; +using DynaWeb; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DynaWeb.Tests +{ + [TestFixture()] + public class WebResponseTests + { + [Test()] + public void WebResponseTest() + { + Assert.Fail(); + } + } +} \ No newline at end of file diff --git a/test/DynaWeb.Tests/DynaWeb.Tests.csproj b/test/DynaWeb.Tests/DynaWeb.Tests.csproj new file mode 100644 index 0000000..e76b4c6 --- /dev/null +++ b/test/DynaWeb.Tests/DynaWeb.Tests.csproj @@ -0,0 +1,105 @@ + + + + + Debug + AnyCPU + {86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C} + Library + Properties + DynaWeb.Tests1 + DynaWeb.Tests1 + v4.5.2 + 512 + {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} + 10.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages + False + UnitTest + + + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + + ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll + + + + + + + + + + + + + + + + + + + + + + + + + {CE19C882-1AAC-434C-99AF-4A285DA053BA} + DynaWeb + + + + + + + False + + + False + + + False + + + False + + + + + + + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + + + \ No newline at end of file diff --git a/test/DynaWeb.Tests/Helpers/HelpersTests.cs b/test/DynaWeb.Tests/Helpers/HelpersTests.cs new file mode 100644 index 0000000..044709d --- /dev/null +++ b/test/DynaWeb.Tests/Helpers/HelpersTests.cs @@ -0,0 +1,62 @@ +using NUnit.Framework; +using DynaWeb; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DynaWeb.Tests +{ + [TestFixture()] + public class HelpersTests + { + [Test()] + public void ParseUriFromStringTest() + { + Assert.Fail(); + } + + [Test()] + public void CheckURITest() + { + Assert.Fail(); + } + + [Test()] + public void DeserialiseTest() + { + Assert.Fail(); + } + + [Test()] + public void DeserializeAsObjectTest() + { + Assert.Fail(); + } + + [Test()] + public void DeserializeByObjectTypeTest() + { + Assert.Fail(); + } + + [Test()] + public void DeserialiseAsDictionaryTest() + { + Assert.Fail(); + } + + [Test()] + public void SerializeToJSONTest() + { + Assert.Fail(); + } + + [Test()] + public void SelectJsonRootTest() + { + Assert.Fail(); + } + } +} \ No newline at end of file diff --git a/test/DynaWeb.Tests/Properties/AssemblyInfo.cs b/test/DynaWeb.Tests/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..90c3dd8 --- /dev/null +++ b/test/DynaWeb.Tests/Properties/AssemblyInfo.cs @@ -0,0 +1,36 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("DynaWeb.Tests1")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("DynaWeb.Tests1")] +[assembly: AssemblyCopyright("Copyright © 2018")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("86015c9c-deba-4c2e-b9ef-872c88ed7d6c")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/test/DynaWeb.Tests/packages.config b/test/DynaWeb.Tests/packages.config new file mode 100644 index 0000000..431a5b9 --- /dev/null +++ b/test/DynaWeb.Tests/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file From 652b144308a3b89dd232adb6c3171e8a8fba4d5c Mon Sep 17 00:00:00 2001 From: Radu Gidei Date: Sat, 18 Aug 2018 21:52:53 +0300 Subject: [PATCH 04/11] update to Dynamo 2.0 and all NuGet dependencies --- src/DynaWeb/DynaWeb.csproj | 108 ++++++++++------------ src/DynaWeb/NodeModels/WebRequestModel.cs | 41 -------- src/DynaWeb/Properties/AssemblyInfo.cs | 4 +- src/DynaWeb/app.config | 4 + src/DynaWeb/packages.config | 16 ++-- 5 files changed, 63 insertions(+), 110 deletions(-) delete mode 100644 src/DynaWeb/NodeModels/WebRequestModel.cs diff --git a/src/DynaWeb/DynaWeb.csproj b/src/DynaWeb/DynaWeb.csproj index 7183d69..cbdcd3b 100644 --- a/src/DynaWeb/DynaWeb.csproj +++ b/src/DynaWeb/DynaWeb.csproj @@ -1,5 +1,6 @@  + Debug @@ -11,6 +12,8 @@ DynaWeb v4.5.2 512 + + true @@ -31,49 +34,44 @@ 4 - - packages\DynamoVisualProgramming.DynamoCoreNodes.1.3.0\lib\net45\Analysis.dll - False + + ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.0.1.5055\lib\net45\Analysis.dll - - packages\DynamoVisualProgramming.DynamoCoreNodes.1.3.0\lib\net45\Display.dll - False + + ..\packages\CommonServiceLocator.2.0.4\lib\net45\CommonServiceLocator.dll - - packages\DynamoVisualProgramming.DynamoCoreNodes.1.3.0\lib\net45\DSCoreNodes.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DesignScriptBuiltin.dll - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\DSIronPython.dll - False + + ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.0.1.5055\lib\net45\DSCoreNodes.dll - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\DynamoApplications.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DSIronPython.dll - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\DynamoCore.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DynamoApplications.dll - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\DynamoInstallDetective.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DynamoCore.dll - - packages\DynamoVisualProgramming.DynamoServices.1.3.0\lib\net45\DynamoServices.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DynamoInstallDetective.dll - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\DynamoShapeManager.dll - False + + ..\packages\DynamoVisualProgramming.DynamoServices.2.0.1.5055\lib\net45\DynamoServices.dll - - packages\DynamoVisualProgramming.ZeroTouchLibrary.1.3.0\lib\net45\DynamoUnits.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DynamoShapeManager.dll - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\DynamoUtilities.dll - False + + ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.1.5055\lib\net45\DynamoUnits.dll + + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\DynamoUtilities.dll + + + ..\packages\DynamoVisualProgramming.DynamoCoreNodes.2.0.1.5055\lib\net45\GeometryColor.dll ..\packages\Prism.Composition.5.0.0\lib\NET45\Microsoft.Practices.Prism.Composition.dll @@ -99,45 +97,32 @@ ..\packages\Prism.Mvvm.1.0.0\lib\net45\Microsoft.Practices.Prism.SharedInterfaces.dll False - - ..\packages\CommonServiceLocator.1.3\lib\portable-net4+sl5+netcore45+wpa81+wp8\Microsoft.Practices.ServiceLocation.dll - False - - - ..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll - False + + ..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll - - packages\DynamoVisualProgramming.DynamoServices.1.3.0\lib\net45\NodeServices2.dll - False + + ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll - - ..\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll - False - - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\ProtoCore.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\ProtoCore.dll - packages\DynamoVisualProgramming.ZeroTouchLibrary.1.3.0\lib\net45\ProtoGeometry.dll - False + ..\packages\DynamoVisualProgramming.ZeroTouchLibrary.2.0.1.5055\lib\net45\ProtoGeometry.dll - - ..\packages\RestSharp.105.2.3\lib\net452\RestSharp.dll - False + + ..\packages\RestSharp.106.3.1\lib\net452\RestSharp.dll + - - packages\DynamoVisualProgramming.Core.1.3.0\lib\net45\VMDataBridge.dll - False + + ..\packages\DynamoVisualProgramming.Core.2.0.1.5055\lib\net45\VMDataBridge.dll @@ -146,7 +131,6 @@ - True @@ -171,4 +155,10 @@ (robocopy $(OutDir) C:\users\radug\desktop\testing /W:3 /R:3 /IT /IS /XF *.tmp) ^& IF %25ERRORLEVEL%25 LEQ 4 exit /B 0 + + + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + + + \ No newline at end of file diff --git a/src/DynaWeb/NodeModels/WebRequestModel.cs b/src/DynaWeb/NodeModels/WebRequestModel.cs deleted file mode 100644 index 3463638..0000000 --- a/src/DynaWeb/NodeModels/WebRequestModel.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dynamo.Graph.Nodes; -using DynaWeb.Properties; -using ProtoCore.AST.AssociativeAST; -using DynaWeb; - -namespace CoreNodeModels.Web -{ - /* - [NodeName("Web Request")] - [NodeDescription("WebRequestDescription", typeof(Resources))] - [NodeCategory(BuiltinNodeCategories.CORE_WEB)] - [IsDesignScriptCompatible] - [AlsoKnownAs("DynaWebNodesUI.WebRequest")] - public class SimpleWebRequest : NodeModel - { - public SimpleWebRequest() - { - InPortData.Add(new PortData("url", Resources.WebRequestPortDataUrlToolTip)); - OutPortData.Add(new PortData("result", Resources.WebRequestPortDataResultToolTip)); - RegisterAllPorts(); - - CanUpdatePeriodically = true; - } - - public override IEnumerable BuildOutputAst(List inputAstNodes) - { - var functionCall = AstFactory.BuildFunctionCall( - new Func(WebRequest.Execute), - inputAstNodes - ); - - return new[] { AstFactory.BuildAssignment(GetAstIdentifierForOutputIndex(0), functionCall) }; - } - } - */ -} diff --git a/src/DynaWeb/Properties/AssemblyInfo.cs b/src/DynaWeb/Properties/AssemblyInfo.cs index a9dada4..88c63c9 100644 --- a/src/DynaWeb/Properties/AssemblyInfo.cs +++ b/src/DynaWeb/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.3.0")] -[assembly: AssemblyFileVersion("1.0.3.0")] +[assembly: AssemblyVersion("1.1.0.0")] +[assembly: AssemblyFileVersion("1.1.0.0")] diff --git a/src/DynaWeb/app.config b/src/DynaWeb/app.config index 4fc378d..107fc28 100644 --- a/src/DynaWeb/app.config +++ b/src/DynaWeb/app.config @@ -6,6 +6,10 @@ + + + + \ No newline at end of file diff --git a/src/DynaWeb/packages.config b/src/DynaWeb/packages.config index eaebdf9..2f35e8c 100644 --- a/src/DynaWeb/packages.config +++ b/src/DynaWeb/packages.config @@ -1,16 +1,16 @@  - - - - - - - + + + + + + + - + \ No newline at end of file From 52db1125d05b396b9366661a4bcdd06cc0d3f637 Mon Sep 17 00:00:00 2001 From: Radu Gidei Date: Sat, 18 Aug 2018 22:48:23 +0300 Subject: [PATCH 05/11] fix Tests proj packages --- test/DynaWeb.Tests/DynaWeb.Tests.csproj | 34 +++++++++++++++---------- test/DynaWeb.Tests/app.config | 11 ++++++++ test/DynaWeb.Tests/packages.config | 1 + 3 files changed, 33 insertions(+), 13 deletions(-) create mode 100644 test/DynaWeb.Tests/app.config diff --git a/test/DynaWeb.Tests/DynaWeb.Tests.csproj b/test/DynaWeb.Tests/DynaWeb.Tests.csproj index e76b4c6..f6139b6 100644 --- a/test/DynaWeb.Tests/DynaWeb.Tests.csproj +++ b/test/DynaWeb.Tests/DynaWeb.Tests.csproj @@ -1,14 +1,14 @@  - + Debug AnyCPU {86015C9C-DEBA-4C2E-B9EF-872C88ED7D6C} Library Properties - DynaWeb.Tests1 - DynaWeb.Tests1 + DynaWeb.Tests + DynaWeb.Tests v4.5.2 512 {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} @@ -38,12 +38,6 @@ prompt 4 - - - ..\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll - - - @@ -60,15 +54,29 @@ - - - {CE19C882-1AAC-434C-99AF-4A285DA053BA} DynaWeb + + + + + + + ..\..\src\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll + True + + + ..\..\src\packages\NUnit.3.10.1\lib\net45\nunit.framework.dll + True + + + ..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.5.2\System.dll + + @@ -93,7 +101,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - +