Skip to content

Commit 20f7a78

Browse files
authored
Merge pull request #3 from quabug/fix-sample-without-test
fix sample without imported tests
2 parents 842d3b6 + 67060f7 commit 20f7a78

File tree

7 files changed

+75
-31
lines changed

7 files changed

+75
-31
lines changed
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
using GenericSerializeReference.Tests;
2-
3-
public class IntIntObject : MultipleGeneric.IInterface<int, int> {}
4-
public class IntObject : SingleGeneric.IInterface<int> {}
1+
public class IntObject : IMyInterface<int> {}

Assets/Sample/CannotDisplayIfNotRef/Invisible.asmdef

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "Invisible",
33
"rootNamespace": "",
44
"references": [
5-
"GUID:7db2c3edd9cbf4a0c84e314cca3ddf42"
5+
"GUID:f4e0bad0409094416a9502287ae04b5c"
66
],
77
"includePlatforms": [],
88
"excludePlatforms": [],

Assets/Sample/Test.unity

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -170,39 +170,39 @@ MonoBehaviour:
170170
references:
171171
version: 1
172172
00000000:
173-
type: {class: TestMonoBehavior/<IntFloat>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
173+
type: {class: TestMonoBehavior/<IntFloat>__generic_serialize_reference/Object, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
174174
data:
175-
ValueT: 0
176-
ValueU: 0
177-
SubValueT:
178-
SubValueU: []
175+
V: 0
179176
00000001:
180-
type: {class: TestMonoBehavior/<FloatInt>__generic_serialize_reference/NonGeneric, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
177+
type: {class: TestMonoBehavior/<FloatInt>__generic_serialize_reference/NonGeneric, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
181178
data:
182179
ValueT: 0
183180
ValueU: 0
184181
ValueDouble: 0
185182
00000002:
186-
type: {class: TestMonoBehavior/<IntInt>__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
183+
type: {class: TestMonoBehavior/<IntInt>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
187184
data:
188185
ValueT: 0
189186
ValueU: 0
190-
ValueDouble: 0
187+
SubValueT:
188+
SubValueU:
191189
00000003:
192-
type: {class: TestMonoBehavior/<Int>__generic_serialize_reference/Object, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
190+
type: {class: TestMonoBehavior/<Int>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
193191
data:
194192
Value: 0
193+
SubValue:
195194
00000004:
196-
type: {class: TestMonoBehavior/<Double>__generic_serialize_reference/DoubleObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
195+
type: {class: TestMonoBehavior/<Double>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
197196
data:
198197
Value: 0
198+
SubValue: []
199199
00000005:
200-
type: {class: TestMonoBehavior/<IntObject>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
200+
type: {class: TestMonoBehavior/<IntObject>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
201201
data:
202202
Value: 0
203203
SubValue:
204204
00000006:
205-
type: {class: TestMonoBehavior/<IntIntObject>__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
205+
type: {class: TestMonoBehavior/<IntIntObject>__generic_serialize_reference/PartialObject, ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
206206
data:
207207
ValueT: 0
208208
ValueU: 0
@@ -238,4 +238,4 @@ MonoBehaviour:
238238
references:
239239
version: 1
240240
00000000:
241-
type: {class: , ns: , asm: }
241+
type: {class: MyMonoBehavior/<Value>__generic_serialize_reference/MyIntObject, ns: , asm: GenericSerializeReference.Sample}

Assets/Sample/TestMonoBehavior.cs

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
using System;
22
using GenericSerializeReference;
33
using UnityEngine;
4+
using UnityEngine.Scripting;
45

56
[assembly: GenericSerializeReferenceLogger(LogLevel.Debug)]
67

7-
namespace GenericSerializeReference.Tests
8+
namespace GenericSerializeReference.Sample
89
{
910
public class TestMonoBehavior : MonoBehaviour
1011
{
@@ -45,4 +46,60 @@ private void Awake()
4546
Debug.Log($"{IntFloat.GetType()}: \n {JsonUtility.ToJson(IntFloat)}");
4647
}
4748
}
49+
50+
51+
public static class SingleGeneric
52+
{
53+
public interface IInterface<T> {}
54+
55+
[Serializable]
56+
public class Object<T> : IInterface<T>
57+
{
58+
public T Value;
59+
}
60+
61+
[Serializable]
62+
public class SubObject<T> : Object<T>
63+
{
64+
public T[] SubValue;
65+
}
66+
67+
[Serializable]
68+
public class DoubleObject : IInterface<double>
69+
{
70+
public double Value;
71+
}
72+
}
73+
74+
public static class MultipleGeneric
75+
{
76+
[Preserve]
77+
public interface IInterface<T, U> {}
78+
79+
[Serializable]
80+
public class Object<T, U> : IInterface<T, U>
81+
{
82+
public T ValueT;
83+
public U ValueU;
84+
}
85+
86+
[Serializable]
87+
public class SubObject<U, T> : Object<T, U>
88+
{
89+
public T[] SubValueT;
90+
public U[] SubValueU;
91+
}
92+
93+
[Serializable]
94+
public class PartialObject<T> : Object<T, int>
95+
{
96+
public double ValueDouble;
97+
}
98+
99+
[Serializable]
100+
public class NonGeneric : Object<float, int>, IInterface<int, float>
101+
{
102+
public double ValueDouble;
103+
}
104+
}
48105
}

Assets/Sample/TestSO.asset

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,7 @@ MonoBehaviour:
1717
references:
1818
version: 1
1919
00000000:
20-
type: {class: TestSO/<IntFloat>__generic_serialize_reference/SubObject, ns: GenericSerializeReference.Tests, asm: GenericSerializeReference.Sample}
20+
type: {class: TestSO/<IntFloat>__generic_serialize_reference/MultipleGeneric.Object`2., ns: GenericSerializeReference.Sample, asm: GenericSerializeReference.Sample}
2121
data:
2222
ValueT: 0
2323
ValueU: 0
24-
SubValueT:
25-
SubValueU: []

Assets/Sample/TestSO.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using UnityEngine;
22

3-
namespace GenericSerializeReference.Tests
3+
namespace GenericSerializeReference.Sample
44
{
55
[CreateAssetMenu(fileName = "TestSO", menuName = "TestSO", order = 0)]
66
public class TestSO : ScriptableObject

Packages/generic-serialize-reference/Tests.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)