6 files changed, 46 insertions, 3 deletions
diff --git a/spec/ruby/core/time/iso8601_spec.rb b/spec/ruby/core/time/iso8601_spec.rb
new file mode 100644
index 0000000000..ad60c3bb32
--- /dev/null
+++ b/spec/ruby/core/time/iso8601_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/xmlschema'
+
+describe "Time#iso8601" do
+  it_behaves_like :time_xmlschema, :iso8601
+end
diff --git a/spec/ruby/core/time/shared/xmlschema.rb b/spec/ruby/core/time/shared/xmlschema.rb
new file mode 100644
index 0000000000..d68c18df36
--- /dev/null
+++ b/spec/ruby/core/time/shared/xmlschema.rb
@@ -0,0 +1,31 @@
+describe :time_xmlschema, shared: true do
+  ruby_version_is "3.4" do
+    it "generates ISO-8601 strings in Z for UTC times" do
+      t = Time.utc(1985, 4, 12, 23, 20, 50, 521245)
+      t.send(@method).should == "1985-04-12T23:20:50Z"
+      t.send(@method, 2).should == "1985-04-12T23:20:50.52Z"
+      t.send(@method, 9).should == "1985-04-12T23:20:50.521245000Z"
+    end
+
+    it "generates ISO-8601 string with timeone offset for non-UTC times" do
+      t = Time.new(1985, 4, 12, 23, 20, 50, "+02:00")
+      t.send(@method).should == "1985-04-12T23:20:50+02:00"
+      t.send(@method, 2).should == "1985-04-12T23:20:50.00+02:00"
+    end
+
+    it "year is always at least 4 digits" do
+      t = Time.utc(12, 4, 12)
+      t.send(@method).should ==  "0012-04-12T00:00:00Z"
+    end
+
+    it "year can be more than 4 digits" do
+      t = Time.utc(40_000, 4, 12)
+      t.send(@method).should ==  "40000-04-12T00:00:00Z"
+    end
+
+    it "year can be negative" do
+      t = Time.utc(-2000, 4, 12)
+      t.send(@method).should ==  "-2000-04-12T00:00:00Z"
+    end
+  end
+end
diff --git a/spec/ruby/core/time/xmlschema_spec.rb b/spec/ruby/core/time/xmlschema_spec.rb
new file mode 100644
index 0000000000..bdf1dc7923
--- /dev/null
+++ b/spec/ruby/core/time/xmlschema_spec.rb
@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/xmlschema'
+
+describe "Time#xmlschema" do
+  it_behaves_like :time_xmlschema, :xmlschema
+end
diff --git a/spec/ruby/library/time/iso8601_spec.rb b/spec/ruby/library/time/iso8601_spec.rb
index 4a9eb45613..9e2607fbd0 100644
--- a/spec/ruby/library/time/iso8601_spec.rb
+++ b/spec/ruby/library/time/iso8601_spec.rb
@@ -3,5 +3,5 @@ require_relative 'shared/xmlschema'
 require 'time'
 
 describe "Time.xmlschema" do
-  it_behaves_like :time_xmlschema, :iso8601
+  it_behaves_like :time_library_xmlschema, :iso8601
 end
diff --git a/spec/ruby/library/time/shared/xmlschema.rb b/spec/ruby/library/time/shared/xmlschema.rb
index 44d33cda7e..831d8509a7 100644
--- a/spec/ruby/library/time/shared/xmlschema.rb
+++ b/spec/ruby/library/time/shared/xmlschema.rb
@@ -1,4 +1,4 @@
-describe :time_xmlschema, shared: true do
+describe :time_library_xmlschema, shared: true do
   it "parses ISO-8601 strings" do
     t = Time.utc(1985, 4, 12, 23, 20, 50, 520000)
     s = "1985-04-12T23:20:50.52Z"
diff --git a/spec/ruby/library/time/xmlschema_spec.rb b/spec/ruby/library/time/xmlschema_spec.rb
index 4279311199..ff3c864a02 100644
--- a/spec/ruby/library/time/xmlschema_spec.rb
+++ b/spec/ruby/library/time/xmlschema_spec.rb
@@ -3,5 +3,5 @@ require_relative 'shared/xmlschema'
 require 'time'
 
 describe "Time.xmlschema" do
-  it_behaves_like :time_xmlschema, :xmlschema
+  it_behaves_like :time_library_xmlschema, :xmlschema
 end