This commit is contained in:
Anthony Stirling 2024-05-27 22:30:25 +01:00
parent 11497f52d4
commit 32209534a0
4 changed files with 37 additions and 18 deletions

View File

@ -32,6 +32,15 @@ jobs:
sudo curl -SL "https://github.com/docker/compose/releases/download/v2.26.1/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose
# sudo chmod +x /usr/local/bin/docker-compose
- name: Set up Python
uses: actions/setup-python@v4
with:
python-version: "3.7"
- name: Pip requirements
run: |
pip install -r ./cucumber/requirements.txt
- name: Run Docker Compose Tests
run: |
chmod +x ./test.sh

View File

@ -176,7 +176,8 @@ public class ExtractImageScansController {
return WebResponseUtils.bytesToWebResponse(
zipBytes, outputZipFilename, MediaType.APPLICATION_OCTET_STREAM);
} if (processedImageBytes.size() == 0) {
}
if (processedImageBytes.size() == 0) {
throw new IllegalArgumentException("No images detected");
} else {

View File

@ -71,6 +71,5 @@ public class RepairController {
Files.deleteIfExists(tempInputFile);
Files.deleteIfExists(tempOutputFile);
}
}
}

20
test.sh
View File

@ -42,11 +42,6 @@ test_compose() {
status=1
fi
# Perform additional tests if needed
# Tear down the service
docker-compose -f "$compose_file" down
return $status
}
@ -83,7 +78,20 @@ main() {
# Test each configuration
run_tests "Stirling-PDF-Ultra-Lite" "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml"
docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite.yml" down
run_tests "Stirling-PDF" "./exampleYmlFiles/docker-compose-latest.yml"
if [ $? -eq 0 ]; then
cd cucumber
if behave; then
passed_tests+=("Stirling-PDF-Regression")
else
failed_tests+=("Stirling-PDF-Regression")
fi
cd ..
fi
docker-compose -f "./exampleYmlFiles/docker-compose-latest.yml" down
export DOCKER_ENABLE_SECURITY=true
# Run the gradlew build command and check if it fails
@ -99,7 +107,9 @@ main() {
# Test each configuration with security
run_tests "Stirling-PDF-Ultra-Lite-Security" "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml"
docker-compose -f "./exampleYmlFiles/docker-compose-latest-ultra-lite-security.yml" down
run_tests "Stirling-PDF-Security" "./exampleYmlFiles/docker-compose-latest-security.yml"
docker-compose -f "./exampleYmlFiles/docker-compose-latest-security.yml" down
# Report results
echo "All tests completed in $SECONDS seconds."