-
Notifications
You must be signed in to change notification settings - Fork 461
feat(serialization): Bringing over the DataStream class from UTP #398
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Large diffs are not rendered by default.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,189 @@ | ||
| using System; | ||
| using NUnit.Framework; | ||
| using Unity.Collections; | ||
| using MLAPI.Serialization; | ||
|
|
||
| namespace MLAPI.Serialization.Tests | ||
| { | ||
| public class DataStreamTests | ||
| { | ||
| [Test] | ||
| public void CreateStreamWithPartOfSourceByteArray() | ||
| { | ||
| byte[] byteArray = | ||
| { | ||
| (byte) 's', (byte) 'o', (byte) 'm', (byte) 'e', | ||
| (byte) ' ', (byte) 'd', (byte) 'a', (byte) 't', (byte) 'a' | ||
| }; | ||
|
|
||
| DataStreamWriter dataStream; | ||
| dataStream = new DataStreamWriter(4, Allocator.Temp); | ||
| dataStream.WriteBytes(new NativeArray<byte>(byteArray, Allocator.Temp).GetSubArray(0, 4)); | ||
| Assert.AreEqual(dataStream.Length, 4); | ||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| for (int i = 0; i < dataStream.Length; ++i) | ||
| { | ||
| Assert.AreEqual(byteArray[i], reader.ReadByte()); | ||
| } | ||
|
|
||
| Assert.Throws<ArgumentOutOfRangeException>(() => { reader.ReadByte(); }); | ||
| } | ||
|
|
||
| [Test] | ||
| public void CreateStreamWithSourceByteArray() | ||
| { | ||
| byte[] byteArray = new byte[100]; | ||
| byteArray[0] = (byte) 'a'; | ||
| byteArray[1] = (byte) 'b'; | ||
| byteArray[2] = (byte) 'c'; | ||
|
|
||
| DataStreamWriter dataStream; | ||
| dataStream = new DataStreamWriter(byteArray.Length, Allocator.Temp); | ||
| dataStream.WriteBytes(new NativeArray<byte>(byteArray, Allocator.Temp)); | ||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| for (int i = 0; i < byteArray.Length; ++i) | ||
| { | ||
| Assert.AreEqual(byteArray[i], reader.ReadByte()); | ||
| } | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadIntoExistingByteArray() | ||
| { | ||
| var byteArray = new NativeArray<byte>(100, Allocator.Temp); | ||
|
|
||
| DataStreamWriter dataStream; | ||
| dataStream = new DataStreamWriter(3, Allocator.Temp); | ||
| { | ||
| dataStream.WriteByte((byte) 'a'); | ||
| dataStream.WriteByte((byte) 'b'); | ||
| dataStream.WriteByte((byte) 'c'); | ||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| reader.ReadBytes(byteArray.GetSubArray(0, dataStream.Length)); | ||
| reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| for (int i = 0; i < reader.Length; ++i) | ||
| { | ||
| Assert.AreEqual(byteArray[i], reader.ReadByte()); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadingDataFromStreamWithSliceOffset() | ||
| { | ||
| var dataStream = new DataStreamWriter(100, Allocator.Temp); | ||
| dataStream.WriteByte((byte) 'a'); | ||
| dataStream.WriteByte((byte) 'b'); | ||
| dataStream.WriteByte((byte) 'c'); | ||
| dataStream.WriteByte((byte) 'd'); | ||
| dataStream.WriteByte((byte) 'e'); | ||
| dataStream.WriteByte((byte) 'f'); | ||
| var reader = new DataStreamReader(dataStream.AsNativeArray().GetSubArray(3, 3)); | ||
| Assert.AreEqual('d', reader.ReadByte()); | ||
| Assert.AreEqual('e', reader.ReadByte()); | ||
| Assert.AreEqual('f', reader.ReadByte()); | ||
| } | ||
|
|
||
| [Test] | ||
| public void WriteOutOfBounds() | ||
| { | ||
| var dataStream = new DataStreamWriter(9, Allocator.Temp); | ||
| Assert.IsTrue(dataStream.WriteInt(42)); | ||
| Assert.AreEqual(4, dataStream.Length); | ||
| Assert.IsTrue(dataStream.WriteInt(42)); | ||
| Assert.AreEqual(8, dataStream.Length); | ||
| Assert.IsFalse(dataStream.HasFailedWrites); | ||
| Assert.IsFalse(dataStream.WriteInt(42)); | ||
| Assert.AreEqual(8, dataStream.Length); | ||
| Assert.IsTrue(dataStream.HasFailedWrites); | ||
|
|
||
| Assert.IsFalse(dataStream.WriteShort(42)); | ||
| Assert.AreEqual(8, dataStream.Length); | ||
| Assert.IsTrue(dataStream.HasFailedWrites); | ||
|
|
||
| Assert.IsTrue(dataStream.WriteByte(42)); | ||
| Assert.AreEqual(9, dataStream.Length); | ||
| Assert.IsTrue(dataStream.HasFailedWrites); | ||
|
|
||
| Assert.IsFalse(dataStream.WriteByte(42)); | ||
| Assert.AreEqual(9, dataStream.Length); | ||
| Assert.IsTrue(dataStream.HasFailedWrites); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadWriteFixedString32() | ||
| { | ||
| var dataStream = new DataStreamWriter(300 * 4, Allocator.Temp); | ||
|
|
||
| var src = new FixedString32("This is a string"); | ||
| dataStream.WriteFixedString32(src); | ||
|
|
||
| //Assert.AreEqual(src.LengthInBytes+2, dataStream.Length); | ||
|
|
||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| var dst = reader.ReadFixedString32(); | ||
| Assert.AreEqual(src, dst); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadWriteFixedString64() | ||
| { | ||
| var dataStream = new DataStreamWriter(300 * 4, Allocator.Temp); | ||
|
|
||
| var src = new FixedString64("This is a string"); | ||
| dataStream.WriteFixedString64(src); | ||
|
|
||
| //Assert.AreEqual(src.LengthInBytes+2, dataStream.Length); | ||
|
|
||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| var dst = reader.ReadFixedString64(); | ||
| Assert.AreEqual(src, dst); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadWriteFixedString128() | ||
| { | ||
| var dataStream = new DataStreamWriter(300 * 4, Allocator.Temp); | ||
|
|
||
| var src = new FixedString128("This is a string"); | ||
| dataStream.WriteFixedString128(src); | ||
|
|
||
| //Assert.AreEqual(src.LengthInBytes+2, dataStream.Length); | ||
|
|
||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| var dst = reader.ReadFixedString128(); | ||
| Assert.AreEqual(src, dst); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadWriteFixedString512() | ||
| { | ||
| var dataStream = new DataStreamWriter(300 * 4, Allocator.Temp); | ||
|
|
||
| var src = new FixedString512("This is a string"); | ||
| dataStream.WriteFixedString512(src); | ||
|
|
||
| //Assert.AreEqual(src.LengthInBytes+2, dataStream.Length); | ||
|
|
||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| var dst = reader.ReadFixedString512(); | ||
| Assert.AreEqual(src, dst); | ||
| } | ||
|
|
||
| [Test] | ||
| public void ReadWriteFixedString4096() | ||
| { | ||
| var dataStream = new DataStreamWriter(300 * 4, Allocator.Temp); | ||
|
|
||
| var src = new FixedString4096("This is a string"); | ||
| dataStream.WriteFixedString4096(src); | ||
|
|
||
| //Assert.AreEqual(src.LengthInBytes+2, dataStream.Length); | ||
|
|
||
| var reader = new DataStreamReader(dataStream.AsNativeArray()); | ||
| var dst = reader.ReadFixedString4096(); | ||
| Assert.AreEqual(src, dst); | ||
| } | ||
|
|
||
| } | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "name": "Unity.Multiplayer.MLAPI.EditorTests", | ||
| "references": [ | ||
| "Unity.Collections", | ||
| "Unity.Mathematics", | ||
| "Unity.Multiplayer.MLAPI.Runtime" | ||
| ], | ||
| "optionalUnityReferences": [ | ||
| "TestAssemblies" | ||
| ], | ||
| "includePlatforms": [ | ||
| "Editor" | ||
| ], | ||
| "excludePlatforms": [], | ||
| "allowUnsafeCode": true | ||
| } |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,5 +9,8 @@ | |
| "unity" | ||
| ], | ||
| "type": "library", | ||
| "hideInEditor": false | ||
| } | ||
| "hideInEditor": false, | ||
| "dependencies": { | ||
| "com.unity.collections": "0.14.0-preview.16" | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. is there a non-preview one we could use?
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Not yet, this package is expected to go out of preview in Q1 of 2021. So we shall update it when it comes out of preview (We will need for UTP as well) |
||
| } | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is this change necessary? (unsafe is necessary but this one?)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This change was made by the editor when I changed things via the UI.