Merge pull request #154 from rsim/feature/minitest

Migrate from RSpec to Minitest

Author: rsim

.github/workflows/clickhouse/download.sh

@@ -6,11 +6,11 @@ set -ev
 # Check https://github.com/ClickHouse/clickhouse-java/releases for latest version
 CLICKHOUSE_JDBC_VERSION=0.9.6
 wget https://repo1.maven.org/maven2/com/clickhouse/clickhouse-jdbc/${CLICKHOUSE_JDBC_VERSION}/clickhouse-jdbc-${CLICKHOUSE_JDBC_VERSION}-all.jar
-cp clickhouse-jdbc-${CLICKHOUSE_JDBC_VERSION}-all.jar spec/support/jars/
+cp clickhouse-jdbc-${CLICKHOUSE_JDBC_VERSION}-all.jar test/support/jars/
 
 # Download SLF4J dependencies (required for ClickHouse JDBC driver logging)
 SLF4J_VERSION=2.0.17
 wget https://repo1.maven.org/maven2/org/slf4j/slf4j-api/${SLF4J_VERSION}/slf4j-api-${SLF4J_VERSION}.jar
 wget https://repo1.maven.org/maven2/org/slf4j/slf4j-simple/${SLF4J_VERSION}/slf4j-simple-${SLF4J_VERSION}.jar
-cp slf4j-api-${SLF4J_VERSION}.jar spec/support/jars/
-cp slf4j-simple-${SLF4J_VERSION}.jar spec/support/jars/
+cp slf4j-api-${SLF4J_VERSION}.jar test/support/jars/
+cp slf4j-simple-${SLF4J_VERSION}.jar test/support/jars/

.github/workflows/sqlserver/download.sh

@@ -1,3 +1,3 @@
 wget https://download.microsoft.com/download/4/D/C/4DCD85FA-0041-4D2E-8DD9-833C1873978C/sqljdbc_7.2.2.0_enu.tar.gz
 tar xzf sqljdbc_7.2.2.0_enu.tar.gz
-cp sqljdbc_7.2/enu/mssql-jdbc-7.2.2.jre8.jar spec/support/jars
+cp sqljdbc_7.2/enu/mssql-jdbc-7.2.2.jre8.jar test/support/jars

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ env:
   JRUBY_OPTS: -W0
 
 jobs:
-  rspec:
+  test:
     runs-on: ubuntu-24.04
     strategy:
       fail-fast: false
@@ -23,9 +23,8 @@ jobs:
             JAVA_VERSION: 11
           - JRUBY_VERSION: 9.4.14.0
             JAVA_VERSION: 17
-          # Tests on JRuby 10 are failing due to https://github.com/jruby/jruby/issues/8987
-          # - JRUBY_VERSION: 10.0.2.0
-          #   JAVA_VERSION: 21
+          - JRUBY_VERSION: 10.0.4.0
+            JAVA_VERSION: 21
     env:
       JRUBY_VERSION: ${{ matrix.JRUBY_VERSION }}
       JAVA_VERSION: ${{ matrix.JAVA_VERSION }}
@@ -98,15 +97,15 @@ jobs:
       - name: Run Tests
         run: |
           for driver in mysql postgresql oracle sqlserver; do
-            MONDRIAN_DRIVER=$driver bundle exec rake spec
+            MONDRIAN_DRIVER=$driver bundle exec rake test
           done
       - name: Export test data and run ClickHouse tests
         run: |
           MONDRIAN_DRIVER=mysql bundle exec rake db:export_data
           MONDRIAN_DRIVER=clickhouse bundle exec rake db:create_data
-          MONDRIAN_DRIVER=clickhouse bundle exec rake spec
+          MONDRIAN_DRIVER=clickhouse bundle exec rake test
 
-  windows-rspec:
+  windows-test:
     runs-on: windows-2025
     strategy:
       fail-fast: false
@@ -118,8 +117,8 @@ jobs:
             JAVA_VERSION: 11
           - JRUBY_VERSION: 9.4.14.0
             JAVA_VERSION: 17
-          # - JRUBY_VERSION: 10.0.2.0
-          #   JAVA_VERSION: 21
+          - JRUBY_VERSION: 10.0.4.0
+            JAVA_VERSION: 21
     env:
       JRUBY_VERSION: ${{ matrix.JRUBY_VERSION }}
       JAVA_VERSION: ${{ matrix.JAVA_VERSION }}
@@ -150,7 +149,7 @@ jobs:
         run: |
           Invoke-WebRequest -Uri "https://download.microsoft.com/download/4/D/C/4DCD85FA-0041-4D2E-8DD9-833C1873978C/sqljdbc_7.2.1.0_enu.exe" -OutFile "sqljdbc_7.2.1.0_enu.exe"
           7z x sqljdbc_7.2.1.0_enu.exe -y > nul
-          Copy-Item -Path "sqljdbc_7.2\enu\mssql-jdbc-7.2.1.jre8.jar" -Destination "spec\support\jars\"
+          Copy-Item -Path "sqljdbc_7.2\enu\mssql-jdbc-7.2.1.jre8.jar" -Destination "test\support\jars\"
       - name: Setup Ruby and install gems
         uses: ruby/setup-ruby@v1
         with:
@@ -164,4 +163,4 @@ jobs:
       - name: Create Database Data
         run: bundle exec rake db:create_data
       - name: Run Tests
-        run: bundle exec rake spec:sqlserver
+        run: bundle exec rake test:sqlserver

.rspec

@@ -36,18 +36,18 @@ mondrian-olap is a JRuby gem for performing multidimensional queries of relation
 
 ### Making Changes
 
-1. **Adding new schema features** - Modify `lib/mondrian/olap/schema.rb` and add corresponding specs in
-   `spec/schema_definition_spec.rb`
-2. **Extending query capabilities** - Update `lib/mondrian/olap/query.rb` and test in `spec/query_spec.rb`
-3. **Connection enhancements** - Change `lib/mondrian/olap/connection.rb` with tests in `spec/connection_spec.rb`
-4. **Cube operations** - Modify `lib/mondrian/olap/cube.rb` and add specs in `spec/cube_spec.rb`
+1. **Adding new schema features** - Modify `lib/mondrian/olap/schema.rb` and add corresponding tests in
+   `test/schema_definition_test.rb`
+2. **Extending query capabilities** - Update `lib/mondrian/olap/query.rb` and test in `test/query_test.rb`
+3. **Connection enhancements** - Change `lib/mondrian/olap/connection.rb` with tests in `test/connection_test.rb`
+4. **Cube operations** - Modify `lib/mondrian/olap/cube.rb` and add tests in `test/cube_test.rb`
 
 ### Testing Changes
 
-1. Write or update RSpec tests for the changed functionality.
-2. Run specific test file: `rspec spec/cube_spec.rb`.
-3. Run all tests with default database: `rake spec`.
-4. Test with specific databases: `rake spec:postgresql`, `rake spec:mysql`, etc.
+1. Write or update Minitest tests for the changed functionality.
+2. Run specific test file: `ruby -Itest test/cube_test.rb`.
+3. Run all tests with default database: `rake test` (with the default `mysql` database).
+4. Test with specific databases: `rake test:mysql`, `rake test:postgresql`, `rake test:sqlserver`, `rake test:oracle`.
 5. Ensure tests pass with multiple database backends before finalizing changes.
 
 ## Technology Stack
@@ -56,7 +56,7 @@ mondrian-olap is a JRuby gem for performing multidimensional queries of relation
 - **Java** 8 or later LTS version
 - **Mondrian OLAP** Java library from a fork https://github.com/rsim/mondrian-olap-java
 - **Databases**: PostgreSQL, MySQL, Oracle, Microsoft SQL Server, ClickHouse or other JDBC compatible databases
-- **Testing**: RSpec
+- **Testing**: Minitest (with minitest-hooks)
 
 ### JRuby-Specific Considerations
 
@@ -101,16 +101,28 @@ mondrian-olap is a JRuby gem for performing multidimensional queries of relation
 ### mise
 
 - mise might be used to manage Ruby and Java versions.
-- If mise is available then prefix ruby, rspec, rake, java calls with `mise exec --` to initialize the correct environment.
+- If mise is available then prefix ruby, rake, java calls with `mise exec --` to initialize the correct environment.
 
 ### Testing
 
-- Use RSpec for Ruby testing.
-- Run individual RSpec test file with e.g. `rspec spec/cube_spec.rb`.
-- Run all RSpec tests with `rake spec` (with the default `mysql` database).
+- Use Minitest for Ruby testing with the minitest-hooks gem for lifecycle hooks.
+- Run individual test file with e.g. `ruby -Itest test/cube_test.rb`.
+- Run all tests with `rake test` (with the default `mysql` database).
 - Run all tests with a specified database:
-  `rake spec:mysql`, `rake spec:postgresql`, `rake spec:sqlserver`, `rake spec:oracle`
-- In most cases use RSpec should syntax and not expect syntax, for example, `result.should == expected`.
-- Use RSpec expect syntax only for block expectations, for example, `expect { action }.to raise_error(SomeError)`.
-- Test data is located in `spec/support/data/` directory.
-- Database-specific schema fixtures are in `spec/fixtures/` directory.
+  `rake test:mysql`, `rake test:postgresql`, `rake test:sqlserver`, `rake test:oracle`.
+- Use Minitest Spec-style syntax with `describe` and `it` blocks. Nest `describe` blocks for logical grouping.
+- Use `before` and `after` hooks for per-test setup and teardown.
+- Use `before(:all)` and `after(:all)` hooks (from minitest-hooks) for expensive setup shared across all tests
+  in a `describe` block, such as establishing database connections or defining schemas.
+- Use standard Minitest assertions: `assert_equal`, `assert_nil`, `assert_empty`, `assert_kind_of`, `assert_match`.
+- Use `assert_raises` with a block for exception testing, for example,
+  `error = assert_raises(Mondrian::OLAP::Error) { action }`.
+- Use `refute` and `refute_nil` for negation assertions.
+- Prefer `assert_equal true, method?` and `assert_equal false, method?` for boolean methods
+  instead of simple `assert` and `refute` assertions.
+- Use the custom `assert_like` matcher for comparing XML strings with normalized whitespace.
+- Use instance variables (`@olap`, `@schema`, `@cube`) for shared state between hooks and tests.
+- Conditionally skip tests for specific database drivers using `unless` guards, for example,
+  `unless %w(vertica snowflake clickhouse).include?(MONDRIAN_DRIVER)`.
+- Test files are located in `test/` directory and follow the naming pattern `*_test.rb`.
+- Test helper and database configuration are in `test/test_helper.rb`.

AGENTS.md

@@ -3,3 +3,23 @@ source 'https://rubygems.org'
 ruby RUBY_VERSION, engine: 'jruby', engine_version: JRUBY_VERSION
 
 gemspec
+
+gem 'rake', '~> 13.3.0'
+gem 'minitest', '~> 5.25'
+gem 'minitest-hooks', '~> 1.5'
+gem 'minitest-reporters', '~> 1.7'
+gem 'rdoc', '~> 6.14.0'
+gem 'jdbc-mysql', '~> 8.0.30'
+gem 'jdbc-postgres', '~> 42.7.8'
+gem 'activerecord', '~> 6.1.7.10'
+gem 'activerecord-jdbc-adapter', '~> 61.3'
+gem 'activerecord-oracle_enhanced-adapter', '~> 6.1.6'
+gem 'pry', '~> 0.14.1'
+
+if JRUBY_VERSION.to_i >= 10
+  gem 'mutex_m'
+  gem 'base64'
+  gem 'bigdecimal'
+  gem 'drb'
+  gem 'csv'
+end

Gemfile

@@ -181,7 +181,7 @@ where('[Time].[2010].[Q1]').
 execute
 ```
 
-See more examples of queries in `spec/query_spec.rb`.
+See more examples of queries in `test/query_test.rb`.
 
 Currently there are query builder methods just for most frequently used MDX functions, there will be new query builder methods in next releases of mondrian-olap gem.
 
@@ -210,7 +210,7 @@ cube.member('[Customers].[USA]').descendants_at_level('City')
                                         # => get all descendants of member in specified hierarchy level
 ```
 
-See more examples of dimension and member queries in `spec/cube_spec.rb`.
+See more examples of dimension and member queries in `test/cube_test.rb`.
 
 ### Cache control
 
@@ -237,7 +237,7 @@ cube.flush_region_cache_with_segments(
 
 The `flush_region_cache_with_segments` method is particularly useful for partial cache clearing when you know which specific dimension members have changed data, avoiding the need to flush the entire cache.
 
-See more examples of cache control in `spec/cube_cache_control_spec.rb`.
+See more examples of cache control in `test/cube_cache_control_test.rb`.
 
 ### Query timeout
 
@@ -372,7 +372,7 @@ schema = Mondrian::OLAP::Schema.define do
 end
 ```
 
-See more examples of user defined functions in `spec/schema_definition_spec.rb`.
+See more examples of user defined functions in `test/schema_definition_test.rb`.
 
 ### Data access roles
 
@@ -397,7 +397,7 @@ schema = Mondrian::OLAP::Schema.define do
 end
 ```
 
-See more examples of data access roles in `spec/connection_role_spec.rb`.
+See more examples of data access roles in `test/connection_role_test.rb`.
 
 ### Drill through
 
@@ -453,7 +453,7 @@ drill_through = olap.from('Sales').
   )
 ```
 
-See more examples of drill through in `spec/query_spec.rb`.
+See more examples of drill through in `test/query_test.rb`.
 
 ### Additional schema options
 
@@ -483,7 +483,8 @@ end
 REQUIREMENTS
 ------------
 
-mondrian-olap gem is compatible with JRuby versions 9.3.x and 9.4.x, JVM 8, 11, and 17. mondrian-olap works only with JRuby and not with other Ruby implementations as it includes Mondrian OLAP Java libraries.
+mondrian-olap gem is compatible with JRuby versions 9.4 and 10, Java 8 (deprecated), 11, 17, 21, 25.
+mondrian-olap works only with JRuby and not with other Ruby implementations as it includes Mondrian OLAP Java libraries.
 
 mondrian-olap supports MySQL, PostgreSQL, Oracle, Microsoft SQL Server, Vertica, Snowflake, and ClickHouse databases as well as other databases that are supported by Mondrian OLAP engine (using jdbc_driver and jdbc_url connection parameters). When using MySQL or PostgreSQL databases then install jdbc-mysql or jdbc-postgres gem and require "jdbc/mysql" or "jdbc/postgres" to load the corresponding JDBC database driver. When using Oracle then require Oracle JDBC driver `ojdbc*.jar`. When using MS SQL Server you then use the Microsoft JDBC driver `mssql-jdbc-*.jar`. When using Vertica, Snowflake, or ClickHouse then require corresponding JDBC drivers.
 

README.md

@@ -0,0 +1,78 @@
+# Creating test database
+
+By default unit tests use MySQL database but PostgreSQL, Oracle and SQL Server databases are supported as well. Set `MONDRIAN_DRIVER` environment variable to `mysql` (default), `postgresql`, `oracle`, `sqlserver` (Microsoft JDBC), `vertica`, `snowflake`, `clickhouse`, `mariadb` to specify database driver that should be used.
+
+If using a MySQL, PostgreSQL or MS SQL Server database then create database user `mondrian_test` with password `mondrian_test`, create database `mondrian_test` and grant full access to this database for `mondrian_test` user. By default it is assumed that database is located on localhost (can be overridden with `DATABASE_HOST` environment variable).
+
+If using Oracle database then create database user `mondrian_test` with password `mondrian_test`. By default it is assumed that database `orcl` is located on localhost (can be overridden with `DATABASE_NAME` and `DATABASE_HOST` environment variables).
+
+If using Vertica then specify environment variables `VERTICA_DATABASE_HOST`, `VERTICA_DATABASE_NAME`, `VERTICA_DATABASE_USER`, `VERTICA_DATABASE_PASSWORD` and create the `mondrian_test` schema.
+
+If using Snowflake then create `MONDRIAN_TEST` user, database and schema and specify environment variables `SNOWFLAKE_DATABASE_HOST` and `SNOWFLAKE_DATABASE_PASSWORD`.
+
+If using ClickHouse then create database user `mondrian_test` with password `mondrian_test`, create database `mondrian_test` and grant full access to this database for `mondrian_test` user. Specify environment variable `CLICKHOUSE_DATABASE_HOST`. Download the latest `clickhouse-jdbc-*-all.jar` and copy to `test/support/jars`.
+
+If using MariaDB ColumnStore then create database user `mondrian_test` with password `mondrian_test`, create database `mondrian_test` and grant full access to this database for `mondrian_test` user. Specify environment variable `MARIADB_DATABASE_HOST`. Download `mariadb-java-client-*.jar` and copy to `test/support/jars`.
+
+See `test/test_helper.rb` for details of default connection parameters and how to override them.
+
+# Creating test data
+
+Install necessary gems with
+
+    bundle install
+
+Create tables with test data using
+
+    rake db:create_data
+
+or specify which database driver to use
+
+    rake db:create_data MONDRIAN_DRIVER=mysql
+    rake db:create_data MONDRIAN_DRIVER=postgresql
+    rake db:create_data MONDRIAN_DRIVER=oracle
+    rake db:create_data MONDRIAN_DRIVER=sqlserver
+
+In case of Vertica, Snowflake, ClickHouse, MariaDB ColumnStore at first create test data in MySQL and export test data into CSV files and then import CSV files into the analytical database (because inserting individual records into these analytical databases is very slow):
+
+    rake db:export_data MONDRIAN_DRIVER=mysql
+    rake db:create_data MONDRIAN_DRIVER=vertica
+    rake db:create_data MONDRIAN_DRIVER=snowflake
+    rake db:create_data MONDRIAN_DRIVER=clickhouse
+    rake db:create_data MONDRIAN_DRIVER=mariadb
+
+# Running tests
+
+Run tests with
+
+    rake test
+
+or specify which database driver to use
+
+    rake test MONDRIAN_DRIVER=mysql
+    rake test MONDRIAN_DRIVER=postgresql
+    rake test MONDRIAN_DRIVER=oracle
+    rake test MONDRIAN_DRIVER=sqlserver
+    rake test MONDRIAN_DRIVER=vertica
+    rake test MONDRIAN_DRIVER=snowflake
+    rake test MONDRIAN_DRIVER=clickhouse
+    rake test MONDRIAN_DRIVER=mariadb
+
+or also alternatively with
+
+    rake test:mysql
+    rake test:postgresql
+    rake test:oracle
+    rake test:sqlserver
+    rake test:vertica
+    rake test:snowflake
+    rake test:clickhouse
+    rake test:mariadb
+
+You can also run all tests on all standard databases (mysql jdbc_mysql postgresql oracle sqlserver) with
+
+    rake test:all
+
+# JRuby versions
+
+It is recommended to use mise to run tests with different JRuby implementations. mondrian-olap is being tested with latest versions of JRuby 9.4 and 10 on Java 8 (deprecated), 11, 17, 21, and 25.