From d056eeda0178a2a3e86050b037bf81a5bc892864 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Mon, 17 Oct 2022 13:51:53 -0400 Subject: [PATCH 1/2] Changes for PASS Summit 2022 --- tSQLtVSTemplate/Code/Code.sqlproj | 5 +- .../Code/dbo.CalculateDiscount.sql | 9 ++-- tSQLtVSTemplate/Tests/Tests.sqlproj | 5 +- .../Tests/dbo_CalculateDiscountTests.sql | 48 ++++++++----------- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/tSQLtVSTemplate/Code/Code.sqlproj b/tSQLtVSTemplate/Code/Code.sqlproj index 1a562a3..996c1ce 100644 --- a/tSQLtVSTemplate/Code/Code.sqlproj +++ b/tSQLtVSTemplate/Code/Code.sqlproj @@ -16,13 +16,14 @@ 1033, CI BySchemaAndSchemaType True - v4.8 + v4.5.2 CS Properties False True True tSQLtVSTemplate + bin\Release\ @@ -63,4 +64,4 @@ - + \ No newline at end of file diff --git a/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql b/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql index ad35e5f..f914518 100644 --- a/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql +++ b/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql @@ -1,13 +1,10 @@ /*-- DROP FUNCTION IF EXISTS dbo.CalculateDiscount; -GO --*/ -CREATE FUNCTION [dbo].[CalculateDiscount] -( - @Value NUMERIC(13,2) -) +GO +CREATE FUNCTION dbo.CalculateDiscount(@ammount DECIMAL(13,2)) RETURNS TABLE AS RETURN - SELECT CASE WHEN @Value >= 50 THEN @Value * 0.10 ELSE 0 END discount; + SELECT CASE WHEN @ammount>=50 THEN @ammount*0.1 ELSE 0 END discount; GO diff --git a/tSQLtVSTemplate/Tests/Tests.sqlproj b/tSQLtVSTemplate/Tests/Tests.sqlproj index 5292ce4..d87c0e4 100644 --- a/tSQLtVSTemplate/Tests/Tests.sqlproj +++ b/tSQLtVSTemplate/Tests/Tests.sqlproj @@ -16,13 +16,14 @@ 1033, CI BySchemaAndSchemaType True - v4.8 + v4.5.2 CS Properties False True True tSQLtVSTemplate + bin\Release\ @@ -81,4 +82,4 @@ - + \ No newline at end of file diff --git a/tSQLtVSTemplate/Tests/dbo_CalculateDiscountTests.sql b/tSQLtVSTemplate/Tests/dbo_CalculateDiscountTests.sql index 22a9afa..5e2ab07 100644 --- a/tSQLtVSTemplate/Tests/dbo_CalculateDiscountTests.sql +++ b/tSQLtVSTemplate/Tests/dbo_CalculateDiscountTests.sql @@ -1,45 +1,39 @@ /*-- -EXEC tSQLt.DropClass [dbo_CalculateDiscountTests]; -GO +EXEC tSQLt.DropClass dbo_CalculateDiscountTests; --*/ -CREATE SCHEMA [dbo_CalculateDiscountTests] AUTHORIZATION [tSQLt.TestClass]; GO -CREATE PROCEDURE dbo_CalculateDiscountTests.[test returns no discount for order value 49.00] +CREATE SCHEMA dbo_CalculateDiscountTests AUTHORIZATION [tSQLt.TestClass]; +GO +CREATE PROCEDURE dbo_CalculateDiscountTests.[test returns no discount if order ammount is $49] AS BEGIN - --Assemble - - --Act - DECLARE @Actual NUMERIC(13,2) = (SELECT discount FROM dbo.CalculateDiscount(49.00) AS CD); - - --Assert - EXEC tSQLt.AssertEquals @Expected = 0, @Actual = @Actual; + /*Assemble*/ + /*Act*/ + DECLARE @Actual DECIMAL(13,2) = (SELECT Discount FROM dbo.CalculateDiscount(49.00)); + /*Assert*/ + EXEC tSQLt.AssertEquals 0, @Actual; END; GO -CREATE PROCEDURE dbo_CalculateDiscountTests.[test returns 10% discount for order value 51.00] +CREATE PROCEDURE dbo_CalculateDiscountTests.[test returns no discount if order ammount is $51] AS BEGIN - --Assemble - - --Act - DECLARE @Actual NUMERIC(13,2) = (SELECT discount FROM dbo.CalculateDiscount(51.00) AS CD); - - --Assert - EXEC tSQLt.AssertEquals @Expected = 5.10, @Actual = @Actual; + /*Assemble*/ + /*Act*/ + DECLARE @Actual DECIMAL(13,2) = (SELECT Discount FROM dbo.CalculateDiscount(51.00)); + /*Assert*/ + EXEC tSQLt.AssertEquals 5.1, @Actual; END; GO -CREATE PROCEDURE dbo_CalculateDiscountTests.[test returns 10% discount for order value 50.00] +CREATE PROCEDURE dbo_CalculateDiscountTests.[test returns no discount if order ammount is $50] AS BEGIN - --Assemble - - --Act - DECLARE @Actual NUMERIC(13,2) = (SELECT discount FROM dbo.CalculateDiscount(50.00) AS CD); - - --Assert - EXEC tSQLt.AssertEquals @Expected = 5.00, @Actual = @Actual; + /*Assemble*/ + /*Act*/ + DECLARE @Actual DECIMAL(13,2) = (SELECT Discount FROM dbo.CalculateDiscount(50.00)); + /*Assert*/ + EXEC tSQLt.AssertEquals 5, @Actual; END; GO From 20167f289087f8938750f1f37d74c9cb96d97143 Mon Sep 17 00:00:00 2001 From: mbt1 Date: Fri, 18 Nov 2022 16:43:03 -0500 Subject: [PATCH 2/2] fixed typo --- tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql b/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql index f914518..59c8b7b 100644 --- a/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql +++ b/tSQLtVSTemplate/Code/dbo.CalculateDiscount.sql @@ -6,5 +6,5 @@ CREATE FUNCTION dbo.CalculateDiscount(@ammount DECIMAL(13,2)) RETURNS TABLE AS RETURN - SELECT CASE WHEN @ammount>=50 THEN @ammount*0.1 ELSE 0 END discount; + SELECT CASE WHEN @ammount>=50 THEN @ammount*0.1 ELSE 0 END Discount; GO