Merge pull request #232 from pixlise/bugfix/new-scan-notification

Fixing auto quant detector, making test fail error more specific
pixlise · May 24, 2024 · 79afcd6 · 79afcd6
2 parents c4e5050 + b358a20
commit 79afcd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/api/quantification/autoQuantification.go b/api/quantification/autoQuantification.go
@@ -29,7 +29,7 @@ func RunAutoQuantifications(scanId string, svcs *services.APIServices) {
 		[]string{"Na2O", "MgO", "Al2O3", "SiO2", "P2O5", "SO3", "Cl", "K2O", "CaO", "TiO2", "Cr2O3", "MnO", "FeO-T", "NiO", "ZnO", "Br"},
 		[]string{"Na2O", "MgO", "Al2O3", "SiO2", "P2O5", "SO3", "Cl", "K2O", "CaO", "TiO2", "Cr2O3", "MnO", "FeO-T", "NiO", "ZnO", "GeO", "Br", "Rb2O", "SrO", "Y2O3", "ZrO2"},
 	}
-	detector := "PIXL/v7"
+	detector := "PIXL/PiquantConfigs/v7"
 
 	allNames := []string{}
 	for _, name := range quantNames {

diff --git a/internal/cmd-line-tools/api-integration-test/testScanData.go b/internal/cmd-line-tools/api-integration-test/testScanData.go
@@ -1593,7 +1593,7 @@ func testScanDataHasPermission(apiHost string, actionMsg string, editAllowed boo
 	// Check that the file was created
 	exists, err := apiStorageFileAccess.ObjectExists(apiDatasetBucket, "Image-Cache/048300551/PCW_0125_0678031992_000RCM_N00417120483005510091075J02-width200.png")
 	failIf(err != nil, fmt.Errorf("Failed to check generated GET thumbnail exists: %v", err))
-	failIf(!exists, fmt.Errorf("generated GET thumbnail not found in Image-Cache/"))
+	failIf(!exists, fmt.Errorf("generated GET thumbnail not found in Image-Cache/ width 200"))
 
 	// Now run it again, because this time it should be using the cached copy
 	testImageGetScaled_OK(apiHost, imageGetJWT, 12, 200, 154)
@@ -1607,7 +1607,7 @@ func testScanDataHasPermission(apiHost string, actionMsg string, editAllowed boo
 	// Check that the file was created
 	exists, err = apiStorageFileAccess.ObjectExists(apiDatasetBucket, "Image-Cache/048300551/PCW_0125_0678031992_000RCM_N00417120483005510091075J02-width400.png")
 	failIf(err != nil, fmt.Errorf("Failed to check generated GET thumbnail exists: %v", err))
-	failIf(!exists, fmt.Errorf("generated GET thumbnail not found in Image-Cache/"))
+	failIf(!exists, fmt.Errorf("generated GET thumbnail not found in Image-Cache/ width 400"))
 
 	// Now run it again, because this time it should be using the cached copy
 	testImageGetScaled_OK(apiHost, imageGetJWT, 450, 400, 308)