Improve interface for get/set/copy.

2 files changed, 18 insertions, 13 deletions

diff --git a/test/fiber/scheduler.rb b/test/fiber/scheduler.rb
index 0e352a1cc9..4138015e4b 100644
--- a/test/fiber/scheduler.rb
+++ b/test/fiber/scheduler.rb
@@ -288,7 +288,7 @@ class IOBufferScheduler < Scheduler
       else
         break unless result
 
-        buffer.copy(result, offset)
+        buffer.set_string(result, offset)
 
         size = result.bytesize
         offset += size
@@ -306,7 +306,7 @@ class IOBufferScheduler < Scheduler
     while true
       maximum_size = buffer.size - offset
 
-      chunk = buffer.to_str(offset, maximum_size)
+      chunk = buffer.get_string(offset, maximum_size)
       result = blocking{io.write_nonblock(chunk, exception: false)}
 
       # blocking{pp write: maximum_size, result: result, length: length}
diff --git a/test/ruby/test_io_buffer.rb b/test/ruby/test_io_buffer.rb
index 2b371f873d..1107c4b708 100644
--- a/test/ruby/test_io_buffer.rb
+++ b/test/ruby/test_io_buffer.rb
@@ -61,11 +61,11 @@ class TestIOBuffer < Test::Unit::TestCase
     assert buffer.immutable?
 
     assert_raise IO::Buffer::MutationError do
-      buffer.copy("", 0)
+      buffer.set_string("")
     end
 
     assert_raise IO::Buffer::MutationError do
-      buffer.copy("!", 1)
+      buffer.set_string("!", 1)
     end
   end
 
@@ -93,7 +93,7 @@ class TestIOBuffer < Test::Unit::TestCase
       string[0] = "h"
     end
 
-    buffer.set(:U8, 0, "h".ord)
+    buffer.set_value(:U8, 0, "h".ord)
 
     # Buffer releases it's ownership of the string:
     buffer.free
@@ -131,7 +131,7 @@ class TestIOBuffer < Test::Unit::TestCase
   def test_resize_preserve
     message = "Hello World"
     buffer = IO::Buffer.new(1024)
-    buffer.copy(message, 0)
+    buffer.set_string(message)
     buffer.resize(2048)
     assert_equal message, buffer.get_string(0, message.bytesize)
   end
@@ -141,8 +141,8 @@ class TestIOBuffer < Test::Unit::TestCase
     assert_equal buffer1, buffer1
 
     buffer2 = IO::Buffer.new(1)
-    buffer1.set(:U8, 0, 0x10)
-    buffer2.set(:U8, 0, 0x20)
+    buffer1.set_value(:U8, 0, 0x10)
+    buffer2.set_value(:U8, 0, 0x20)
 
     assert_negative buffer1 <=> buffer2
     assert_positive buffer2 <=> buffer1
@@ -159,7 +159,7 @@ class TestIOBuffer < Test::Unit::TestCase
   def test_slice
     buffer = IO::Buffer.new(128)
     slice = buffer.slice(8, 32)
-    slice.copy("Hello World", 0)
+    slice.set_string("Hello World")
     assert_equal("Hello World", buffer.get_string(8, 11))
   end
 
@@ -195,7 +195,7 @@ class TestIOBuffer < Test::Unit::TestCase
     message = "Hello World 🤓"
 
     buffer = IO::Buffer.new(128)
-    buffer.copy(message, 0)
+    buffer.set_string(message)
 
     chunk = buffer.get_string(0, message.bytesize, Encoding::UTF_8)
     assert_equal message, chunk
@@ -229,17 +229,22 @@ class TestIOBuffer < Test::Unit::TestCase
     :F64 => [-1.0, 0.0, 0.5, 1.0, 128.0],
   }
 
-  def test_get_set
+  def test_get_set_primitives
     buffer = IO::Buffer.new(128)
 
     RANGES.each do |type, values|
       values.each do |value|
-        buffer.set(type, 0, value)
-        assert_equal value, buffer.get(type, 0), "Converting #{value} as #{type}."
+        buffer.set_value(type, 0, value)
+        assert_equal value, buffer.get_value(type, 0), "Converting #{value} as #{type}."
       end
     end
   end
 
+  def test_clear
+    buffer = IO::Buffer.new(16)
+    buffer.set_string("Hello World!")
+  end
+
   def test_invalidation
     input, output = IO.pipe