Skip to content

Commit

Permalink
moved AssertStringInTests to 2008 folder
Browse files Browse the repository at this point in the history
added functionality to not compile AssertStringIn and AssertStringTable in 2005
  • Loading branch information
mbt1 committed Nov 11, 2015
1 parent b0fae59 commit 7242c3a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 19 deletions.
11 changes: 8 additions & 3 deletions Source/tSQLt.AssertStringIn.ssp.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,26 @@ IF OBJECT_ID('tSQLt.AssertStringIn') IS NOT NULL DROP PROCEDURE tSQLt.AssertStri
GO
---Build+
GO
IF NOT(CAST(SERVERPROPERTY('ProductVersion') AS VARCHAR(MAX)) LIKE '9.%')
BEGIN
EXEC('
CREATE PROCEDURE tSQLt.AssertStringIn
@Expected tSQLt.AssertStringTable READONLY,
@Actual NVARCHAR(MAX),
@Message NVARCHAR(MAX) = ''
@Message NVARCHAR(MAX) = ''''
AS
BEGIN
IF(NOT EXISTS(SELECT 1 FROM @Expected WHERE value = @Actual))
BEGIN
DECLARE @ExpectedMessage NVARCHAR(MAX);
SELECT value INTO #ExpectedSet FROM @Expected;
EXEC tSQLt.TableToText @TableName = '#ExpectedSet', @OrderBy = 'value',@txt = @ExpectedMessage OUTPUT;
SET @ExpectedMessage = ISNULL('<'+@Actual+'>','NULL')+CHAR(13)+CHAR(10)+'is not in'+CHAR(13)+CHAR(10)+@ExpectedMessage;
EXEC tSQLt.TableToText @TableName = ''#ExpectedSet'', @OrderBy = ''value'',@txt = @ExpectedMessage OUTPUT;
SET @ExpectedMessage = ISNULL(''<''+@Actual+''>'',''NULL'')+CHAR(13)+CHAR(10)+''is not in''+CHAR(13)+CHAR(10)+@ExpectedMessage;
EXEC tSQLt.Fail @Message, @ExpectedMessage;
END;
END;
');
END;
GO
---Build-
GO
Expand Down
5 changes: 4 additions & 1 deletion Source/tSQLt.AssertStringTable.udt.sql
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@ IF TYPE_ID('tSQLt.AssertStringTable') IS NOT NULL DROP TYPE tSQLt.AssertStringTa
GO
---Built+
GO
CREATE TYPE tSQLt.AssertStringTable AS TABLE(value NVARCHAR(MAX));
IF NOT(CAST(SERVERPROPERTY('ProductVersion') AS VARCHAR(MAX)) LIKE '9.%')
BEGIN
EXEC('CREATE TYPE tSQLt.AssertStringTable AS TABLE(value NVARCHAR(MAX));');
END;
GO
---Build-
GO
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
EXEC tSQLt.NewTestClass 'AssertStringInTests';
EXEC tSQLt.NewTestClass 'AssertStringInTests_2008';
GO
CREATE PROCEDURE AssertStringInTests.[test fails if set is empty]
CREATE PROCEDURE AssertStringInTests_2008.[test fails if set is empty]
AS
BEGIN

Expand All @@ -11,7 +11,7 @@ BEGIN
@Actual = ''Some String'';';
END;
GO
CREATE PROCEDURE AssertStringInTests.[test succeeds if value is the only element]
CREATE PROCEDURE AssertStringInTests_2008.[test succeeds if value is the only element]
AS
BEGIN

Expand All @@ -24,7 +24,7 @@ BEGIN

END;
GO
CREATE PROCEDURE AssertStringInTests.[test succeeds if value is one of many elements]
CREATE PROCEDURE AssertStringInTests_2008.[test succeeds if value is one of many elements]
AS
BEGIN

Expand All @@ -37,7 +37,7 @@ BEGIN

END;
GO
CREATE PROCEDURE AssertStringInTests.[test includes string and ordered table in fail message]
CREATE PROCEDURE AssertStringInTests_2008.[test includes string and ordered table in fail message]
AS
BEGIN
CREATE TABLE #ExpectedSet (value NVARCHAR(MAX));
Expand Down Expand Up @@ -65,7 +65,7 @@ BEGIN
EXEC tSQLt.AssertEqualsString @Expected = @ExpectedMessage, @Actual = @FailMessage;
END;
GO
CREATE PROCEDURE AssertStringInTests.[test produces adequate failure message if @Actual = 'NULL']
CREATE PROCEDURE AssertStringInTests_2008.[test produces adequate failure message if @Actual = 'NULL']
AS
BEGIN
CREATE TABLE #ExpectedSet (value NVARCHAR(MAX));
Expand Down Expand Up @@ -93,7 +93,7 @@ BEGIN
EXEC tSQLt.AssertEqualsString @Expected = @ExpectedMessage, @Actual = @FailMessage;
END;
GO
CREATE PROCEDURE AssertStringInTests.[test produces adequate failure message if @Expected is empty]
CREATE PROCEDURE AssertStringInTests_2008.[test produces adequate failure message if @Expected is empty]
AS
BEGIN
DECLARE @FailMessage NVARCHAR(MAX);
Expand All @@ -118,7 +118,7 @@ BEGIN
EXEC tSQLt.AssertEqualsString @Expected = @ExpectedMessage, @Actual = @FailMessage;
END;
GO
CREATE PROCEDURE AssertStringInTests.[test produces adequate failure message if @Expected is empty and @Actual is NULL]
CREATE PROCEDURE AssertStringInTests_2008.[test produces adequate failure message if @Expected is empty and @Actual is NULL]
AS
BEGIN
DECLARE @FailMessage NVARCHAR(MAX);
Expand All @@ -143,7 +143,7 @@ BEGIN
EXEC tSQLt.AssertEqualsString @Expected = @ExpectedMessage, @Actual = @FailMessage;
END;
GO
CREATE PROC AssertStringInTests.[test AssertStringIn passes supplied message before original failure message when calling fail]
CREATE PROC AssertStringInTests_2008.[test AssertStringIn passes supplied message before original failure message when calling fail]
AS
BEGIN
EXEC tSQLt_testutil.AssertFailMessageLike
Expand Down
6 changes: 6 additions & 0 deletions Tests.2008/Tests.2008.ssmssqlproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@
<AssociatedConnUserName />
<FullPath>AssertEqualsTableTests_2008.class.sql</FullPath>
</FileNode>
<FileNode Name="AssertStringInTests_2008.class.sql">
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
<AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
<AssociatedConnUserName />
<FullPath>AssertStringInTests_2008.class.sql</FullPath>
</FileNode>
<FileNode Name="FakeFunctionTests_2008.class.sql">
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
<AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
Expand Down
6 changes: 0 additions & 6 deletions Tests/Tests.ssmssqlproj
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,6 @@
<AssociatedConnUserName />
<FullPath>AssertObjectExistsTests.class.sql</FullPath>
</FileNode>
<FileNode Name="AssertStringInTests.class.sql">
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
<AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
<AssociatedConnUserName />
<FullPath>AssertStringInTests.class.sql</FullPath>
</FileNode>
<FileNode Name="BootStrapTest.sql">
<AssociatedConnectionMoniker>8c91a03d-f9b4-46c0-a305-b5dcc79ff907:Dev_tSQLt:True</AssociatedConnectionMoniker>
<AssociatedConnSrvName>Dev_tSQLt</AssociatedConnSrvName>
Expand Down

0 comments on commit 7242c3a

Please sign in to comment.