From 75bef167bd54d44c02dc608aeb9565fcf5bbe37b Mon Sep 17 00:00:00 2001 From: Mashhur Date: Tue, 24 Jun 2025 21:49:56 -0700 Subject: [PATCH 1/2] Fix failed Java test and run Java unit test while compiling. --- Rakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Rakefile b/Rakefile index 58824d84..bd62bf1c 100644 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ require 'logstash/devutils/rake' task :install_jars do - sh('./gradlew clean vendor') + sh('./gradlew clean vendor test') end task :prepare_geoip_resources do sh('./gradlew geoipTestResources') From 9797635393fcb7177e6e19ab23aaa0f90447c0b0 Mon Sep 17 00:00:00 2001 From: Mashhur Date: Thu, 26 Jun 2025 14:10:26 -0700 Subject: [PATCH 2/2] Run Java tests in unit test CIs. --- .ci/logstash-run.sh | 1 + Rakefile | 16 +++++----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/.ci/logstash-run.sh b/.ci/logstash-run.sh index 23f92042..22e4ea62 100755 --- a/.ci/logstash-run.sh +++ b/.ci/logstash-run.sh @@ -27,6 +27,7 @@ bundle exec rake prepare_geoip_resources if [[ "$INTEGRATION" != "true" ]]; then bundle exec rspec --format=documentation spec/unit --tag ~integration --tag ~secure_integration + bundle exec rake java_test else if [[ "$SECURE_INTEGRATION" == "true" ]]; then diff --git a/Rakefile b/Rakefile index bd62bf1c..710bd50a 100644 --- a/Rakefile +++ b/Rakefile @@ -1,19 +1,13 @@ require 'logstash/devutils/rake' -task :install_jars do - sh('./gradlew clean vendor test') +task :vendor do + sh('./gradlew clean vendor') end + task :prepare_geoip_resources do sh('./gradlew geoipTestResources') end -task :vendor => :install_jars - -task :test do - require 'rspec' - require 'rspec/core/runner' - Rake::Task[:install_jars].invoke - Rake::Task[:generate_ssl].invoke - sh './gradlew test' - exit(RSpec::Core::Runner.run(Rake::FileList['spec/**/*_spec.rb'])) +task :java_test do + sh('./gradlew test') end \ No newline at end of file