Fixes

Signed-off-by: Juan Cruz Viotti <jv@jviotti.com>

Author: jviotti

test/CMakeLists.txt

@@ -17,7 +17,7 @@ endmacro()
 macro(add_jsonschema_test_windows_ci name)
   if(JSONSCHEMA_TESTS_CI AND WIN32)
     add_test(NAME JSONSchema.ci.${name} COMMAND
-      powershell -ExecutionPolicy Bypass -File
+      powershell -NoProfile -ExecutionPolicy Bypass -File
       "${CMAKE_CURRENT_SOURCE_DIR}/ci/${name}.ps1"
       "$<TARGET_FILE:jsonschema_cli>")
   endif()

test/ci/fail_bundle_http_non_200.ps1

@@ -37,7 +37,7 @@ try {
 
     $actualNorm = ($stderr -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"

test/ci/fail_bundle_http_non_schema.ps1

@@ -43,7 +43,7 @@ error: The JSON document is not a valid JSON Schema
 
     $actualNorm = ($stderr -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"

test/ci/fail_validate_http_non_200.ps1

@@ -40,7 +40,7 @@ try {
 
     $actualNorm = ($stderr -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"

test/ci/fail_validate_http_non_schema.ps1

@@ -46,7 +46,7 @@ error: The JSON document is not a valid JSON Schema
 
     $actualNorm = ($stderr -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"

test/ci/pass_bundle_http.ps1

@@ -6,7 +6,7 @@ New-Item -ItemType Directory -Path $TMP | Out-Null
 function Check-Diff($actual, $expected) {
     $actualNorm = ($actual -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"

test/ci/pass_install_add_http.ps1

@@ -6,7 +6,7 @@ New-Item -ItemType Directory -Path $TMP | Out-Null
 function Check-Diff($actual, $expected) {
     $actualNorm = ($actual -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"
@@ -49,7 +49,7 @@ try {
     }
 
     $resolvedTmp = (Resolve-Path $TMP).Path.TrimEnd('\')
-    $output = $result.Stdout + $result.Stderr
+    $output = $result.Stderr
     $expectedOutput = @"
 Adding         : https://schemas.sourcemeta.com/sourcemeta/std/v0/jsonrpc/v2.0/identifier -> ./vendor/identifier.json
 Fetching       : https://schemas.sourcemeta.com/sourcemeta/std/v0/jsonrpc/v2.0/identifier
@@ -72,7 +72,7 @@ Installed      : $resolvedTmp\project\vendor\identifier.json
 
     Check-Diff $actualConfig $expectedConfig
 
-    $identifierFile = Join-Path $projectDir "vendor" "identifier.json"
+    $identifierFile = Join-Path (Join-Path $projectDir "vendor") "identifier.json"
     $actualSchema = [System.IO.File]::ReadAllText($identifierFile)
     $expectedSchema = @'
 {

test/ci/pass_install_http.ps1

@@ -6,7 +6,7 @@ New-Item -ItemType Directory -Path $TMP | Out-Null
 function Check-Diff($actual, $expected) {
     $actualNorm = ($actual -replace "`r`n", "`n").TrimEnd()
     $expectedNorm = ($expected -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne $expectedNorm) {
+    if ($actualNorm -cne $expectedNorm) {
         Write-Host "EXPECTED:"
         Write-Host $expected
         Write-Host "---"
@@ -57,7 +57,7 @@ try {
     }
 
     $resolvedTmp = (Resolve-Path $TMP).Path.TrimEnd('\')
-    $output = $result.Stdout + $result.Stderr
+    $output = $result.Stderr
     $expectedOutput = @"
 Fetching       : https://schemas.sourcemeta.com/sourcemeta/std/v0/jsonrpc/v2.0/response
 Installed      : $resolvedTmp\project\vendor\response.json
@@ -67,7 +67,7 @@ Installed      : $resolvedTmp\project\vendor\response.json
     [System.IO.File]::WriteAllText((Join-Path $TMP "expected.txt"), $expectedOutput)
     Check-Diff $output $expectedOutput
 
-    $responseFile = Join-Path $projectDir "vendor" "response.json"
+    $responseFile = Join-Path (Join-Path $projectDir "vendor") "response.json"
     $actualSchema = [System.IO.File]::ReadAllText($responseFile)
     $expectedSchema = @'
 {

test/ci/pass_validate_http.ps1

@@ -39,7 +39,7 @@ try {
     [System.IO.File]::WriteAllText((Join-Path $TMP "expected.txt"), "")
 
     $actualNorm = ($stderr -replace "`r`n", "`n").TrimEnd()
-    if ($actualNorm -ne "") {
+    if ($actualNorm -cne "") {
         Write-Host "EXPECTED: (empty)"
         Write-Host "ACTUAL:"
         Write-Host $stderr