From 3c0a57b4fdab0a32863bddf1618f84e395fba96a Mon Sep 17 00:00:00 2001 From: Your Name Date: Wed, 8 Mar 2023 15:44:28 +0000 Subject: [PATCH 1/3] Made some changes --- labs/web-app/src/package-lock.json | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/labs/web-app/src/package-lock.json b/labs/web-app/src/package-lock.json index 930b19a..87cd022 100644 --- a/labs/web-app/src/package-lock.json +++ b/labs/web-app/src/package-lock.json @@ -304,6 +304,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "dev": true, "dependencies": { "safe-buffer": "5.1.2" }, @@ -314,7 +315,8 @@ "node_modules/basic-auth/node_modules/safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true }, "node_modules/bluebird": { "version": "3.7.2", @@ -1352,7 +1354,6 @@ "integrity": "sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==", "optional": true, "dependencies": { - "encoding": "^0.1.12", "minipass": "^3.1.0", "minipass-sized": "^1.0.3", "minizlib": "^2.0.0" @@ -1446,6 +1447,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "dev": true, "dependencies": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -1461,6 +1463,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "dev": true, "dependencies": { "ee-first": "1.1.1" }, @@ -1647,6 +1650,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "dev": true, "engines": { "node": ">= 0.8" } @@ -2083,7 +2087,6 @@ "dependencies": { "@mapbox/node-pre-gyp": "^1.0.0", "node-addon-api": "^4.2.0", - "node-gyp": "8.x", "tar": "^6.1.11" }, "optionalDependencies": { @@ -2179,9 +2182,6 @@ "resolved": "https://registry.npmjs.org/terraformer/-/terraformer-1.0.12.tgz", "integrity": "sha512-MokUp0+MFal4CmJDVL6VAO1bKegeXcBM2RnPVfqcFIp2IIv8EbPAjG0j/vEy/vuKB8NVMMSF2vfpVS/QLe4DBg==", "deprecated": "terraformer is deprecated and no longer supported. Please use @terraformer/arcgis.", - "dependencies": { - "@types/geojson": "^7946.0.0 || ^1.0.0" - }, "engines": { "node": ">=4.2.6" }, @@ -2584,6 +2584,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", + "dev": true, "requires": { "safe-buffer": "5.1.2" }, @@ -2591,7 +2592,8 @@ "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" + "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", + "dev": true } } }, @@ -3465,6 +3467,7 @@ "version": "1.10.0", "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz", "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==", + "dev": true, "requires": { "basic-auth": "~2.0.1", "debug": "2.6.9", @@ -3477,6 +3480,7 @@ "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", + "dev": true, "requires": { "ee-first": "1.1.1" } @@ -3613,7 +3617,8 @@ "on-headers": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz", - "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==" + "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==", + "dev": true }, "once": { "version": "1.4.0", From 7ad1801c7693b30445efbc5f5708a35d20c3ff01 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 9 Mar 2023 14:02:35 +0000 Subject: [PATCH 2/3] Updated app message --- labs/continuous-integration/src/HelloWorld/Program.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/labs/continuous-integration/src/HelloWorld/Program.cs b/labs/continuous-integration/src/HelloWorld/Program.cs index 45057e3..44b2ff0 100644 --- a/labs/continuous-integration/src/HelloWorld/Program.cs +++ b/labs/continuous-integration/src/HelloWorld/Program.cs @@ -1,6 +1,7 @@ using Humanizer; -namespace HelloWorld; +namespace Heyy, it's Mubarak ! +; public class Program { From 21361c4fefe953da32aa52c7099f0cf09468f421 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 10 Mar 2023 14:21:54 +0000 Subject: [PATCH 3/3] Added failing test --- .vscode/launch.json | 26 ++++++++++++ .vscode/tasks.json | 41 +++++++++++++++++++ .../Services/AdditionServiceTests.cs | 9 +++- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..7ba0b31 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,26 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/labs/automated-testing/src/Calculator.App/bin/Debug/net6.0/Calculator.App.dll", + "args": [], + "cwd": "${workspaceFolder}/labs/automated-testing/src/Calculator.App", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..fbd1791 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,41 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/labs/automated-testing/src/Calculator.App/Calculator.App.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/labs/automated-testing/src/Calculator.App/Calculator.App.csproj", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/labs/automated-testing/src/Calculator.App/Calculator.App.csproj" + ], + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/labs/automated-testing/src/Calculator.App.Tests/Services/AdditionServiceTests.cs b/labs/automated-testing/src/Calculator.App.Tests/Services/AdditionServiceTests.cs index ed3716e..36ddf28 100644 --- a/labs/automated-testing/src/Calculator.App.Tests/Services/AdditionServiceTests.cs +++ b/labs/automated-testing/src/Calculator.App.Tests/Services/AdditionServiceTests.cs @@ -47,5 +47,12 @@ public void RandomIntegers() Assert.Equal(expected, actual); } - + [Fact] + public void Number17() + { + var service = new AdditionService(); + var expected = 19; + var actual = service.Operate(2, 17); + Assert.Equal(expected, actual); + } } \ No newline at end of file