Skip to content
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.

Sign up for GitHub

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

Disallow counter collections #2350

Merged
merged 3 commits into from
Apr 26, 2021
+27 −468
Merged

Disallow counter collections #2350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abba009
Added weaving error when using collection of counter
papafe Apr 23, 2021
55b0068
Fixed weaver tests
papafe Apr 23, 2021
3f0e0c3
Corrections according to PR comments
papafe Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions Realm/Realm.Weaver/RealmWeaver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,10 +390,18 @@ private WeavePropertyResult WeaveProperty(PropertyDefinition prop, TypeDefinitio
{
var genericArguments = ((GenericInstanceType)prop.PropertyType).GenericArguments;
var elementType = genericArguments.Last();
if (!elementType.Resolve().IsValidRealmObjectBaseInheritor(_references) &&
!_realmValueTypes.Contains(elementType.FullName))

if (!elementType.Resolve().IsValidRealmObjectBaseInheritor(_references))
{
return WeavePropertyResult.Error($"{type.Name}.{prop.Name} is an {collectionType} but its generic type is {elementType.Name} which is not supported by Realm.");
if (elementType.IsRealmInteger(out _, out _))
{
return WeavePropertyResult.Error($"{type.Name}.{prop.Name} is an {collectionType}<RealmInteger> which is not supported.");
}

if (!_realmValueTypes.Contains(elementType.FullName))
{
return WeavePropertyResult.Error($"{type.Name}.{prop.Name} is an {collectionType} but its generic type is {elementType.Name} which is not supported by Realm.");
}
}

if (prop.SetMethod != null)
Expand Down
96 changes: 0 additions & 96 deletions Tests/Realm.Tests/Database/ListOfPrimitivesTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,12 +403,6 @@ public void Test_ManagedBooleanList(bool[] values)
RunManagedTests(obj => obj.BooleanList, values);
}

[TestCaseSource(nameof(ByteTestValues))]
public void Test_ManagedByteCounterList(byte[] values)
{
RunManagedTests(obj => obj.ByteCounterList, values.ToInteger());
}

[TestCaseSource(nameof(ByteTestValues))]
public void Test_ManagedByteList(byte[] values)
{
Expand All @@ -427,36 +421,18 @@ public void Test_ManagedDoubleList(double[] values)
RunManagedTests(obj => obj.DoubleList, values);
}

[TestCaseSource(nameof(Int16TestValues))]
public void Test_ManagedInt16CounterList(short[] values)
{
RunManagedTests(obj => obj.Int16CounterList, values.ToInteger());
}

[TestCaseSource(nameof(Int16TestValues))]
public void Test_ManagedInt16List(short[] values)
{
RunManagedTests(obj => obj.Int16List, values);
}

[TestCaseSource(nameof(Int32TestValues))]
public void Test_ManagedInt32CounterList(int[] values)
{
RunManagedTests(obj => obj.Int32CounterList, values.ToInteger());
}

[TestCaseSource(nameof(Int32TestValues))]
public void Test_ManagedInt32List(int[] values)
{
RunManagedTests(obj => obj.Int32List, values);
}

[TestCaseSource(nameof(Int64TestValues))]
public void Test_ManagedInt64CounterList(long[] values)
{
RunManagedTests(obj => obj.Int64CounterList, values.ToInteger());
}

[TestCaseSource(nameof(Int64TestValues))]
public void Test_ManagedInt64List(long[] values)
{
Expand Down Expand Up @@ -499,12 +475,6 @@ public void Test_ManagedNullableBooleanList(bool?[] values)
RunManagedTests(obj => obj.NullableBooleanList, values);
}

[TestCaseSource(nameof(NullableByteTestValues))]
public void Test_ManagedNullableByteCounterList(byte?[] values)
{
RunManagedTests(obj => obj.NullableByteCounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableByteTestValues))]
public void Test_ManagedNullableByteList(byte?[] values)
{
Expand All @@ -523,36 +493,18 @@ public void Test_ManagedNullableDoubleList(double?[] values)
RunManagedTests(obj => obj.NullableDoubleList, values);
}

[TestCaseSource(nameof(NullableInt16TestValues))]
public void Test_ManagedNullableInt16CounterList(short?[] values)
{
RunManagedTests(obj => obj.NullableInt16CounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableInt16TestValues))]
public void Test_ManagedNullableInt16List(short?[] values)
{
RunManagedTests(obj => obj.NullableInt16List, values);
}

[TestCaseSource(nameof(NullableInt32TestValues))]
public void Test_ManagedNullableInt32CounterList(int?[] values)
{
RunManagedTests(obj => obj.NullableInt32CounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableInt32TestValues))]
public void Test_ManagedNullableInt32List(int?[] values)
{
RunManagedTests(obj => obj.NullableInt32List, values);
}

[TestCaseSource(nameof(NullableInt64TestValues))]
public void Test_ManagedNullableInt64CounterList(long?[] values)
{
RunManagedTests(obj => obj.NullableInt64CounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableInt64TestValues))]
public void Test_ManagedNullableInt64List(long?[] values)
{
Expand Down Expand Up @@ -662,12 +614,6 @@ public void Test_UnmanagedBooleanList(bool[] values)
RunUnmanagedTests(o => o.BooleanList, values);
}

[TestCaseSource(nameof(ByteTestValues))]
public void Test_UnmanagedByteCounterList(byte[] values)
{
RunUnmanagedTests(o => o.ByteCounterList, values.ToInteger());
}

[TestCaseSource(nameof(ByteTestValues))]
public void Test_UnmanagedByteList(byte[] values)
{
Expand All @@ -686,36 +632,18 @@ public void Test_UnmanagedDoubleList(double[] values)
RunUnmanagedTests(o => o.DoubleList, values);
}

[TestCaseSource(nameof(Int16TestValues))]
public void Test_UnmanagedInt16CounterList(short[] values)
{
RunUnmanagedTests(o => o.Int16CounterList, values.ToInteger());
}

[TestCaseSource(nameof(Int16TestValues))]
public void Test_UnmanagedInt16List(short[] values)
{
RunUnmanagedTests(o => o.Int16List, values);
}

[TestCaseSource(nameof(Int32TestValues))]
public void Test_UnmanagedInt32CounterList(int[] values)
{
RunUnmanagedTests(o => o.Int32CounterList, values.ToInteger());
}

[TestCaseSource(nameof(Int32TestValues))]
public void Test_UnmanagedInt32List(int[] values)
{
RunUnmanagedTests(o => o.Int32List, values);
}

[TestCaseSource(nameof(Int64TestValues))]
public void Test_UnmanagedInt64CounterList(long[] values)
{
RunUnmanagedTests(o => o.Int64CounterList, values.ToInteger());
}

[TestCaseSource(nameof(Int64TestValues))]
public void Test_UnmanagedInt64List(long[] values)
{
Expand Down Expand Up @@ -758,12 +686,6 @@ public void Test_UnmanagedNullableBooleanList(bool?[] values)
RunUnmanagedTests(o => o.NullableBooleanList, values);
}

[TestCaseSource(nameof(NullableByteTestValues))]
public void Test_UnmanagedNullableByteCounterList(byte?[] values)
{
RunUnmanagedTests(o => o.NullableByteCounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableByteTestValues))]
public void Test_UnmanagedNullableByteList(byte?[] values)
{
Expand All @@ -782,36 +704,18 @@ public void Test_UnmanagedNullableDoubleList(double?[] values)
RunUnmanagedTests(o => o.NullableDoubleList, values);
}

[TestCaseSource(nameof(NullableInt16TestValues))]
public void Test_UnmanagedNullableInt16CounterList(short?[] values)
{
RunUnmanagedTests(o => o.NullableInt16CounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableInt16TestValues))]
public void Test_UnmanagedNullableInt16List(short?[] values)
{
RunUnmanagedTests(o => o.NullableInt16List, values);
}

[TestCaseSource(nameof(NullableInt32TestValues))]
public void Test_UnmanagedNullableInt32CounterList(int?[] values)
{
RunUnmanagedTests(o => o.NullableInt32CounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableInt32TestValues))]
public void Test_UnmanagedNullableInt32List(int?[] values)
{
RunUnmanagedTests(o => o.NullableInt32List, values);
}

[TestCaseSource(nameof(NullableInt64TestValues))]
public void Test_UnmanagedNullableInt64CounterList(long?[] values)
{
RunUnmanagedTests(o => o.NullableInt64CounterList, values.ToInteger());
}

[TestCaseSource(nameof(NullableInt64TestValues))]
public void Test_UnmanagedNullableInt64List(long?[] values)
{
Expand Down
Loading