Skip to content

Commit 2c60188

Browse files
committed
Cleaned up Validate
1 parent 21fa0ba commit 2c60188

File tree

4 files changed

+29
-20
lines changed

4 files changed

+29
-20
lines changed

Build/CommonFunctionsAndMethods.psm1

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ Function Invoke-SQLFileOrQuery
103103
$dddbefore = Get-Date;Write-Verbose("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-SQLFileOrQuery:Invoke-SqlFile[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
104104
$QueryOutput = Invoke-SqlFile @parameters
105105
$dddafter = Get-Date;Write-Verbose("------->>After<<-------(tSQLt_Validate.ps1:Invoke-SQLFileOrQuery:Invoke-SqlFile[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
106-
$dddafter-$dddbefore
107-
return $QueryOutput
106+
Write-Verbose("Runtime in Milliseconds: $(($dddafter-$dddbefore).TotalMilliseconds)")
107+
return $QueryOutput
108108
}
109109
catch{
110110
throw

Build/LocalValidate.ps1

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
[CmdletBinding()]
12
param(
23
[Parameter(Mandatory=$false)][ValidateNotNullOrEmpty()][string] $ServerName = 'localhost,1433',
34
[Parameter(Mandatory=$true, ParameterSetName = 'UserPass')][ValidateNotNullOrEmpty()][string] $UserName = "sa" ,
@@ -9,23 +10,23 @@ param(
910
$PSDefaultParameterValues = $PSDefaultParameterValues.clone()
1011
$PSDefaultParameterValues += @{'*:ErrorAction' = 'Stop'}
1112

12-
Write-Host "Starting execution of LocalBuild.ps1"
13+
Write-Verbose "Starting execution of LocalBuild.ps1"
1314
$__=$__ #quiesce warnings
1415
$invocationDir = $PSScriptRoot
1516
Push-Location -Path $invocationDir
1617
$cfam = (Join-Path $invocationDir "CommonFunctionsAndMethods.psm1" | Resolve-Path)
17-
Write-Host "Attempting to load module from: $cfam"
18+
Write-Verbose "Attempting to load module from: $cfam"
1819
Import-Module "$cfam" -Force -Verbose
1920
. (Join-Path $invocationDir 'SQLServerConnection.ps1');
2021

2122

2223
try{
2324

2425
if($TrustedConnection){
25-
Write-Warning('GH:TC')
26+
Log-Output('Selecting Trusted Connection')
2627
$SqlServerConnection = [SqlServerConnection]::new($ServerName,"LocalBuild");
2728
}else{
28-
Write-Warning('GH:UP')
29+
Log-Output('Selecting UserName/Password Connection')
2930
$SqlServerConnection = [SqlServerConnection]::new($ServerName,$UserName,$Password,"LocalBuild");
3031
}
3132

Build/tSQLt_Validate.ps1

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Param(
99
);
1010

1111

12-
12+
$validateStartTime = Get-Date;
1313

1414
$__=$__ #quiesce warnings
1515
$invocationDir = $PSScriptRoot
@@ -206,15 +206,23 @@ try{
206206
$matchingFiles = ($ActualTestResultFiles|Where-Object{$ExpectedTestResultFiles -Contains $_})
207207
Write-Warning("Matching Files:")
208208
$matchingFiles
209-
Write-Warning("Missing Files:")
210-
$missingFiles
211-
Write-Warning("Unexpected Files:")
212-
$superfluousFiles
209+
if($missingFiles.length -gt 0){
210+
Write-Warning("There are files missing:");
211+
$missingFiles
212+
}
213+
if($superfluousFiles.length -gt 0){
214+
Write-Warning("There are unexpected files:")
215+
$superfluousFiles
216+
}
213217
if($missingFiles.Length + $superfluousFiles.Length -gt 0){
214218
Write-Error("Missing or Unexpected Test Result Files!")
215219
}
216220
}
217221
finally{
218222
Pop-Location
223+
$validateEndTime = Get-Date;
224+
Log-Output("------------------------------------")
225+
Log-Output("Total Duration: $($validateEndTime-$validateStartTime)")
226+
Log-Output("------------------------------------")
219227
}
220228

Build/tSQLt_ValidateRunAll.ps1

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -67,28 +67,28 @@ Function Invoke-Tests
6767
DatabaseName = $DatabaseName
6868
PrintSqlOutput = $true
6969
}
70-
$dddbefore = Get-Date;Write-Warning("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
70+
$dddbefore = Get-Date;Write-Verbose("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
7171
$parameters;
7272
Invoke-SQLFileOrQuery @parameters;
73-
$dddafter = Get-Date;Write-Warning("------->>After<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
74-
$dddafter-$dddbefore
73+
$dddafter = Get-Date;Write-Verbose("------->>After<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
74+
Write-Verbose("Duration: $($dddafter-$dddbefore)")
7575

76-
$dddbefore = Get-Date;Write-Warning("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-Tests:Copy-SQLXmlToFile[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
76+
$dddbefore = Get-Date;Write-Verbose("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-Tests:Copy-SQLXmlToFile[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
7777
Copy-SQLXmlToFile $SqlServerConnection $DatabaseName "EXEC [tSQLt].[XmlResultFormatter]" $OutputFile
78-
$dddafter = Get-Date;Write-Warning("------->>After<<-------(tSQLt_Validate.ps1:Invoke-Tests:Copy-SQLXmlToFile[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
79-
$dddafter-$dddbefore
78+
$dddafter = Get-Date;Write-Verbose("------->>After<<-------(tSQLt_Validate.ps1:Invoke-Tests:Copy-SQLXmlToFile[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
79+
Write-Verbose("Duration: $($dddafter-$dddbefore)")
8080

8181
$parameters = @{
8282
SqlServerConnection = $SqlServerConnection
8383
HelperSQLPath = $HelperSQLPath
8484
DatabaseName = $DatabaseName
8585
Query = "EXEC tSQLt_testutil.LogMultiRunResult '$TestSetName';"
8686
}
87-
$dddbefore = Get-Date;Write-Warning("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
87+
$dddbefore = Get-Date;Write-Verbose("------->>BEFORE<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddbefore|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
8888
# $parameters;
8989
Invoke-SQLFileOrQuery @parameters;
90-
$dddafter = Get-Date;Write-Warning("------->>After<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
91-
$dddafter-$dddbefore
90+
$dddafter = Get-Date;Write-Verbose("------->>After<<-------(tSQLt_Validate.ps1:Invoke-Tests:Invoke-SQLFileOrQuery[$($dddafter|Get-Date -Format "yyyy:MM:dd;HH:mm:ss.fff")])")
91+
Write-Verbose("Duration: $($dddafter-$dddbefore)")
9292

9393
}
9494
Function Invoke-TestsFromFile

0 commit comments

Comments
 (0)