Synced with 1.26.

1 files changed, 35 insertions, 4 deletions

diff --git a/samples/10_advanced_debugging/03_unit_tests/serialize_deserialize_tests.rb b/samples/10_advanced_debugging/03_unit_tests/serialize_deserialize_tests.rb
index 22fa862..e67b1ee 100644
--- a/samples/10_advanced_debugging/03_unit_tests/serialize_deserialize_tests.rb
+++ b/samples/10_advanced_debugging/03_unit_tests/serialize_deserialize_tests.rb
@@ -2,12 +2,12 @@ def test_serialize args, assert
   GTK::Entity.__reset_id__!
   args.state.player_one = "test"
   result = args.gtk.serialize_state args.state
-  assert.equal! result, "{:entity_id=>3, :tick_count=>-1, :player_one=>\"test\"}"
+  assert.equal! result, "{:entity_id=>3, :entity_keys_by_ref=>{}, :tick_count=>-1, :player_one=>\"test\"}"
 
   GTK::Entity.__reset_id__!
   args.gtk.write_file 'state.txt', ''
   result = args.gtk.serialize_state 'state.txt', args.state
-  assert.equal! result, "{:entity_id=>3, :tick_count=>-1, :player_one=>\"test\"}"
+  assert.equal! result, "{:entity_id=>3, :entity_keys_by_ref=>{}, :tick_count=>-1, :player_one=>\"test\"}"
 end
 
 def test_deserialize args, assert
@@ -38,8 +38,9 @@ def test_strict_entity_serialization args, assert
   args.state.player_two = args.state.new_entity_strict(:player_strict, name: "Ken")
 
   serialized_state = args.gtk.serialize_state args.state
-  assert.equal! serialized_state, '{:entity_id=>1, :tick_count=>-1, :player_one=>{:entity_id=>1, :entity_name=>:player, :entity_type=>:player, :created_at=>-1, :global_created_at=>-1, :name=>"Ryu"}, :player_two=>{:entity_id=>3, :entity_name=>:player_strict, :created_at=>-1, :global_created_at_elapsed=>-1, :entity_strict=>true, :name=>"Ken"}}'
+  assert.equal! serialized_state, '{:entity_id=>1, :entity_keys_by_ref=>{}, :tick_count=>-1, :player_one=>{:entity_id=>1, :entity_name=>:player, :entity_keys_by_ref=>{}, :entity_type=>:player, :created_at=>-1, :global_created_at=>-1, :name=>"Ryu"}, :player_two=>{:entity_id=>3, :entity_name=>:player_strict, :entity_type=>:player_strict, :created_at=>-1, :global_created_at_elapsed=>-1, :entity_strict=>true, :entity_keys_by_ref=>{:entity_type=>:entity_name, :global_created_at_elapsed=>:created_at}, :name=>"Ken"}}'
 
+  GTK::Entity.__reset_id__!
   deserialize_state = args.gtk.deserialize_state serialized_state
 
   assert.equal! args.state.player_one.name, deserialize_state.player_one.name
@@ -55,8 +56,9 @@ def test_strict_entity_serialization_with_nil args, assert
   args.state.player_two = args.state.new_entity_strict(:player_strict, name: "Ken", blood_type: nil)
 
   serialized_state = args.gtk.serialize_state args.state
-  assert.equal! serialized_state, '{:entity_id=>3, :tick_count=>-1, :player_one=>{:entity_id=>1, :entity_name=>:player, :entity_type=>:player, :created_at=>-1, :global_created_at=>-1, :name=>"Ryu"}, :player_two=>{:entity_id=>3, :entity_name=>:player_strict, :created_at=>-1, :global_created_at_elapsed=>-1, :entity_strict=>true, :name=>"Ken", :blood_type=>nil}}'
+  assert.equal! serialized_state, '{:entity_id=>9, :entity_keys_by_ref=>{}, :tick_count=>-1, :player_one=>{:entity_id=>1, :entity_name=>:player, :entity_keys_by_ref=>{}, :entity_type=>:player, :created_at=>-1, :global_created_at=>-1, :name=>"Ryu"}, :player_two=>{:entity_id=>2, :entity_name=>:player_strict, :entity_type=>:player_strict, :created_at=>-1, :global_created_at_elapsed=>-1, :entity_strict=>true, :entity_keys_by_ref=>{:entity_type=>:entity_name, :global_created_at_elapsed=>:created_at}, :name=>"Ken", :blood_type=>nil}}'
 
+  GTK::Entity.__reset_id__!
   deserialized_state = args.gtk.deserialize_state serialized_state
 
   assert.equal! args.state.player_one.name, deserialized_state.player_one.name
@@ -77,10 +79,39 @@ def test_multiple_strict_entities args, assert
   args.state.enemy = args.state.new_entity_strict(:enemy, name: "Bison", other_property: 'extra mean')
 
   serialized_state = args.gtk.serialize_state args.state
+
+  GTK::Entity.__reset_id__!
   deserialized_state = args.gtk.deserialize_state serialized_state
 
   assert.equal! deserialized_state.player.name, "Ryu"
   assert.equal! deserialized_state.enemy.other_property, "extra mean"
 end
 
+def test_by_reference_state args, assert
+  GTK::Entity.__reset_id__!
+  args.state.a = { name: "Jane Doe" }
+  args.state.b = args.state.a
+  assert.equal! args.state.a.object_id, args.state.b.object_id
+  serialized_state = args.gtk.serialize_state args.state
+
+  GTK::Entity.__reset_id__!
+  deserialized_state = args.gtk.deserialize_state serialized_state
+  assert.equal! deserialized_state.a.object_id, deserialized_state.b.object_id
+end
+
+def test_by_reference_state_strict_entities args, assert
+  GTK::Entity.__reset_id__!
+  args.state.a = { name: "Jane Doe" }
+  args.state.strict_entity = args.state.new_entity_strict(:couple) do |e|
+    e.one = args.state.new_entity_strict(:person, name: "Jane")
+    e.two = e.one
+  end
+  assert.equal! args.state.strict_entity.one, args.state.strict_entity.two
+  serialized_state = args.gtk.serialize_state args.state
+
+  GTK::Entity.__reset_id__!
+  deserialized_state = args.gtk.deserialize_state serialized_state
+  assert.equal! deserialized_state.strict_entity.one, deserialized_state.strict_entity.two
+end
+
 $tests.start