Merge branch 'move_to_jruby'

headius · headius · commit ec21e9cfd543 · 2023-08-04T17:47:34.000-05:00
diff --git a/minitest-maven-plugin/src/it/minitest-failure/pom.xml b/minitest-maven-plugin/src/it/minitest-failure/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>minitest</artifactId>
-      <version>2.10.0</version>
+      <version>5.3.3</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
diff --git a/minitest-maven-plugin/src/it/minitest-failure/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-failure/test/simple_test.rb
@@ -1,4 +1,4 @@
-class SimpleTest < MiniTest::Unit::TestCase
+class SimpleTest < Minitest::Unit::TestCase
 
   def test_it
      assert false
diff --git a/minitest-maven-plugin/src/it/minitest-from-jruby/pom.xml b/minitest-maven-plugin/src/it/minitest-from-jruby/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>minitest</artifactId>
-      <version>5.14.4</version>
+      <version>5.3.3</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
diff --git a/minitest-maven-plugin/src/it/minitest-from-jruby/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-from-jruby/test/simple_test.rb
@@ -1,4 +1,4 @@
-class SimpleTest < MiniTest::Unit::TestCase
+class SimpleTest < Minitest::Unit::TestCase
 
   def test_it
      assert true
diff --git a/minitest-maven-plugin/src/it/minitest-pom-210/invoker.properties b/minitest-maven-plugin/src/it/minitest-pom-210/invoker.properties
diff --git a/minitest-maven-plugin/src/it/minitest-pom-210/pom.xml b/minitest-maven-plugin/src/it/minitest-pom-210/pom.xml
diff --git a/minitest-maven-plugin/src/it/minitest-pom-210/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-pom-210/test/simple_test.rb
diff --git a/minitest-maven-plugin/src/it/minitest-pom-210/verify.bsh b/minitest-maven-plugin/src/it/minitest-pom-210/verify.bsh
diff --git a/minitest-maven-plugin/src/it/minitest-pom-508/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-pom-508/test/simple_test.rb
@@ -1,4 +1,4 @@
-class SimpleTest < MiniTest::Unit::TestCase
+class SimpleTest < Minitest::Unit::TestCase
 
   def test_it
      assert true
diff --git a/minitest-maven-plugin/src/it/minitest-somewhere/pom.xml b/minitest-maven-plugin/src/it/minitest-somewhere/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>minitest</artifactId>
-      <version>2.10.0</version>
+      <version>5.3.3</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
diff --git a/minitest-maven-plugin/src/it/minitest-somewhere/somewhere/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-somewhere/somewhere/test/simple_test.rb
@@ -1,4 +1,4 @@
-class SimpleTest < MiniTest::Unit::TestCase
+class SimpleTest < Minitest::Unit::TestCase
 
   def test_it
      assert true
diff --git a/minitest-maven-plugin/src/it/minitest-summary-report/pom.xml b/minitest-maven-plugin/src/it/minitest-summary-report/pom.xml
@@ -29,7 +29,7 @@
     <dependency>
       <groupId>rubygems</groupId>
       <artifactId>minitest</artifactId>
-      <version>2.10.0</version>
+      <version>5.3.3</version>
       <type>gem</type>
       <scope>test</scope>
     </dependency>
diff --git a/minitest-maven-plugin/src/it/minitest-summary-report/test/simple_test.rb b/minitest-maven-plugin/src/it/minitest-summary-report/test/simple_test.rb
@@ -1,4 +1,4 @@
-class SimpleTest < MiniTest::Unit::TestCase
+class SimpleTest < Minitest::Unit::TestCase
 
   def test_it
      assert true
diff --git a/minitest-maven-plugin/src/main/java/de/saumya/mojo/minitest/MinitestMavenTestScriptFactory.java b/minitest-maven-plugin/src/main/java/de/saumya/mojo/minitest/MinitestMavenTestScriptFactory.java
@@ -34,6 +34,7 @@ void getAddTestCases(StringBuilder builder){
         builder.append("begin\n");
         builder.append("  gem 'minitest'\n");
         builder.append("  require 'minitest/autorun'\n");
+        builder.append("  require 'minitest/unit'\n");
         builder.append("rescue\n");
         builder.append("  raise 'looks like minitest gem is missing'\n");
         builder.append("end\n");
@@ -43,8 +44,8 @@ void getAddTestCases(StringBuilder builder){
     private void getTestRunnerScript(StringBuilder builder) {
         builder.append("require 'fileutils'\n");
         builder.append("FileUtils.mkdir_p( File.dirname( REPORT_PATH ) )\n");
-        builder.append("if MiniTest::Unit.respond_to? :output\n");
-        builder.append("  MiniTest::Unit.output = Tee.open(REPORT_PATH, 'w')\n");
+        builder.append("if Minitest::Unit.respond_to? :output\n");
+        builder.append("  Minitest::Unit.output = Tee.open(REPORT_PATH, 'w')\n");
         builder.append("else\n");
         builder.append("  $stdout = Tee.open(REPORT_PATH, 'w')\n");
         builder.append("end\n");
diff --git a/runit-maven-plugin/src/main/java/de/saumya/mojo/runit/RunitMavenTestScriptFactory.java b/runit-maven-plugin/src/main/java/de/saumya/mojo/runit/RunitMavenTestScriptFactory.java
@@ -16,7 +16,7 @@ void getTestRunnerScript(StringBuilder builder) {
         builder.append("else\n");
         builder.append("  begin\n");
         builder.append("    require 'minitest/autorun'\n");
-        builder.append("    MiniTest::Unit.output = Tee.open(REPORT_PATH, 'w') if MiniTest::Unit.respond_to? :output=\n");
+        builder.append("    Minitest::Unit.output = Tee.open(REPORT_PATH, 'w') if Minitest::Unit.respond_to? :output=\n");
         builder.append("  rescue LoadError\n");
         builder.append("    require 'test/unit/ui/console/testrunner'\n");
         builder.append("    class Test::Unit::UI::Console::TestRunner\n");

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-class SimpleTest < MiniTest::Unit::TestCase`
	`1`	`+class SimpleTest < Minitest::Unit::TestCase`
`2`	`2`
`3`	`3`	`def test_it`
`4`	`4`	`assert false`