Skip to content

Moved call to TryLoadGenericMetaTypeNullability #71851

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

Merged
buyaa-n merged 3 commits into from
Jul 12, 2022
Merged

Moved call to TryLoadGenericMetaTypeNullability #71851

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a42ec6d
Moved call to TryLoadGenericMetaTypeNullability
ropufu Jul 8, 2022
ae1279c
Added nullability state checks.
ropufu Jul 11, 2022
da9d9d4
Apply suggestions from code review
buyaa-n Jul 11, 2022
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
Prev Previous commit
Apply suggestions from code review
  • Loading branch information
@buyaa-n
buyaa-n authored Jul 11, 2022
commit da9d9d41166195f0bde1b2ca8777a67a116d25d2
20 changes: 10 additions & 10 deletions src/libraries/System.Runtime/tests/System/Reflection/NullabilityInfoContextTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,32 +1123,32 @@ public void TestNullabilityInfoCreationOnPropertiesWithNestedGenericTypeArgument
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[1].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[0].GenericTypeArguments[0].ReadState);

//public Tuple<int, Tuple<T>>? Deep3 { get; set; }
//public Tuple<int?, Tuple<T>>? Deep3 { get; set; }
info = deep3Info;
Assert.Equal(2, info.GenericTypeArguments.Length);
Assert.Equal(1, info.GenericTypeArguments[1].GenericTypeArguments.Length);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[0].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[0].ReadState);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[1].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[1].GenericTypeArguments[0].ReadState);

//public Tuple<int, int, Tuple<T>>? Deep4 { get; set; }
//public Tuple<int, int?, Tuple<T>>? Deep4 { get; set; }
info = deep4Info;
Assert.Equal(3, info.GenericTypeArguments.Length);
Assert.Equal(1, info.GenericTypeArguments[2].GenericTypeArguments.Length);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[0].ReadState);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[1].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[1].ReadState);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[2].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[2].GenericTypeArguments[0].ReadState);

//public Tuple<int, int, Tuple<T, T>>? Deep5 { get; set; }
//public Tuple<int, int, Tuple<T, int>?>? Deep5 { get; set; }
info = deep5Info;
Assert.Equal(3, info.GenericTypeArguments.Length);
Assert.Equal(2, info.GenericTypeArguments[2].GenericTypeArguments.Length);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[0].ReadState);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[1].ReadState);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[2].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[2].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[2].GenericTypeArguments[0].ReadState);
Assert.Equal(NullabilityState.Nullable, info.GenericTypeArguments[2].GenericTypeArguments[1].ReadState);
Assert.Equal(NullabilityState.NotNull, info.GenericTypeArguments[2].GenericTypeArguments[1].ReadState);
}
}

Expand Down Expand Up @@ -1415,8 +1415,8 @@ public class TypeWithPropertiesNestingItsGenericTypeArgument<T>
public Tuple<T>? Shallow1 { get; set; }
public Tuple<Tuple<T>>? Deep1 { get; set; }
public Tuple<Tuple<T>, int>? Deep2 { get; set; }
public Tuple<int, Tuple<T>>? Deep3 { get; set; }
public Tuple<int, int, Tuple<T>>? Deep4 { get; set; }
public Tuple<int, int, Tuple<T, T>>? Deep5 { get; set; }
public Tuple<int?, Tuple<T>>? Deep3 { get; set; }
public Tuple<int, int?, Tuple<T?>>? Deep4 { get; set; }
public Tuple<int, int, Tuple<T, int>?>? Deep5 { get; set; }
}
}