Fix ROM Content Test to use IMemoryOwner instead of MemoryManager (#28947)

ahsonkhan · web-flow · commit 79797279e2e2 · 2018-04-10T13:21:11.000-07:00
diff --git a/src/System.Net.Http/tests/FunctionalTests/ReadOnlyMemoryContentTest.cs b/src/System.Net.Http/tests/FunctionalTests/ReadOnlyMemoryContentTest.cs
@@ -35,7 +35,7 @@ public static IEnumerable<object[]> TrueFalse()
         public void ContentLength_LengthMatchesArrayLength(int contentLength, bool useArray)
         {
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 Assert.Equal(contentLength, content.Headers.ContentLength);
             }
@@ -48,7 +48,7 @@ public async Task ReadAsStreamAsync_TrivialMembersHaveExpectedValuesAndBehavior(
             const int ContentLength = 42;
             Memory<byte> memory;
 
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 using (Stream stream = await content.ReadAsStreamAsync())
                 {
@@ -82,7 +82,7 @@ public async Task ReadAsStreamAsync_Seek(bool useArray)
             const int ContentLength = 42;
             Memory<byte> memory;
 
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 using (Stream s = await content.ReadAsStreamAsync())
                 {
@@ -144,7 +144,7 @@ public async Task ReadAsStreamAsync_ReadByte_MatchesInput(int contentLength, boo
         {
             Memory<byte> memory;
 
-            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 using (Stream stream = await content.ReadAsStreamAsync())
                 {
@@ -166,7 +166,7 @@ public async Task ReadAsStreamAsync_Read_InvalidArguments(bool useArray)
             const int ContentLength = 42;
             Memory<byte> memory;
 
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 using (Stream stream = await content.ReadAsStreamAsync())
                 {
@@ -203,7 +203,7 @@ public async Task ReadAsStreamAsync_ReadMultipleBytes_MatchesInput(int mode, boo
             const int ContentLength = 1024;
 
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 var buffer = new byte[3];
 
@@ -244,7 +244,7 @@ public async Task ReadAsStreamAsync_ReadWithCancelableToken_MatchesInput(bool us
             const int ContentLength = 100;
 
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 var buffer = new byte[1];
                 var cts = new CancellationTokenSource();
@@ -278,7 +278,7 @@ public async Task ReadAsStreamAsync_ReadWithCanceledToken_MatchesInput(bool useA
 
             Memory<byte> memory;
 
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 using (Stream stream = await content.ReadAsStreamAsync())
                 {
@@ -294,7 +294,7 @@ public async Task ReadAsStreamAsync_ReadWithCanceledToken_MatchesInput(bool useA
         public async Task CopyToAsync_AllContentCopied(int contentLength, bool useArray)
         {
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
 
                 var destination = new MemoryStream();
@@ -309,7 +309,7 @@ public async Task CopyToAsync_AllContentCopied(int contentLength, bool useArray)
         public async Task ReadAsStreamAsync_CopyTo_AllContentCopied(int contentLength, bool useArray)
         {
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
 
                 var destination = new MemoryStream();
@@ -328,7 +328,7 @@ public async Task ReadAsStreamAsync_CopyTo_InvalidArguments(bool useArray)
         {
             const int ContentLength = 42;
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
                 using (Stream s = await content.ReadAsStreamAsync())
                 {
@@ -354,7 +354,7 @@ public async Task ReadAsStreamAsync_CopyTo_InvalidArguments(bool useArray)
         public async Task ReadAsStreamAsync_CopyToAsync_AllContentCopied(int contentLength, bool useArray)
         {
             Memory<byte> memory;
-            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))
+            using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))
             {
 
                 var destination = new MemoryStream();
@@ -367,17 +367,17 @@ public async Task ReadAsStreamAsync_CopyToAsync_AllContentCopied(int contentLeng
             }
         }
 
-        private static ReadOnlyMemoryContent CreateContent(int contentLength, bool useArray, out Memory<byte> memory, out MemoryManager<byte> ownedMemory)
+        private static ReadOnlyMemoryContent CreateContent(int contentLength, bool useArray, out Memory<byte> memory, out IMemoryOwner<byte> memoryOwner)
         {
             if (useArray)
             {
                 memory = new byte[contentLength];
-                ownedMemory = null;
+                memoryOwner = null;
             }
             else
             {
-                ownedMemory = new NativeMemoryManager(contentLength);
-                memory = ownedMemory.Memory;
+                memoryOwner = new NativeMemoryManager(contentLength);
+                memory = memoryOwner.Memory;
             }
 
             new Random(contentLength).NextBytes(memory.Span);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static IEnumerable<object[]> TrueFalse()`
`35`	`35`	`public void ContentLength_LengthMatchesArrayLength(int contentLength, bool useArray)`
`36`	`36`	`{`
`37`	`37`	`Memory<byte> memory;`
`38`		`- using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`38`	`+ using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`39`	`39`	`{`
`40`	`40`	`Assert.Equal(contentLength, content.Headers.ContentLength);`
`41`	`41`	`}`
`@@ -48,7 +48,7 @@ public async Task ReadAsStreamAsync_TrivialMembersHaveExpectedValuesAndBehavior(`
`48`	`48`	`const int ContentLength = 42;`
`49`	`49`	`Memory<byte> memory;`
`50`	`50`
`51`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`51`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`52`	`52`	`{`
`53`	`53`	`using (Stream stream = await content.ReadAsStreamAsync())`
`54`	`54`	`{`
`@@ -82,7 +82,7 @@ public async Task ReadAsStreamAsync_Seek(bool useArray)`
`82`	`82`	`const int ContentLength = 42;`
`83`	`83`	`Memory<byte> memory;`
`84`	`84`
`85`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`85`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`86`	`86`	`{`
`87`	`87`	`using (Stream s = await content.ReadAsStreamAsync())`
`88`	`88`	`{`
`@@ -144,7 +144,7 @@ public async Task ReadAsStreamAsync_ReadByte_MatchesInput(int contentLength, boo`
`144`	`144`	`{`
`145`	`145`	`Memory<byte> memory;`
`146`	`146`
`147`		`- using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`147`	`+ using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`148`	`148`	`{`
`149`	`149`	`using (Stream stream = await content.ReadAsStreamAsync())`
`150`	`150`	`{`
`@@ -166,7 +166,7 @@ public async Task ReadAsStreamAsync_Read_InvalidArguments(bool useArray)`
`166`	`166`	`const int ContentLength = 42;`
`167`	`167`	`Memory<byte> memory;`
`168`	`168`
`169`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`169`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`170`	`170`	`{`
`171`	`171`	`using (Stream stream = await content.ReadAsStreamAsync())`
`172`	`172`	`{`
`@@ -203,7 +203,7 @@ public async Task ReadAsStreamAsync_ReadMultipleBytes_MatchesInput(int mode, boo`
`203`	`203`	`const int ContentLength = 1024;`
`204`	`204`
`205`	`205`	`Memory<byte> memory;`
`206`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`206`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`207`	`207`	`{`
`208`	`208`	`var buffer = new byte[3];`
`209`	`209`
`@@ -244,7 +244,7 @@ public async Task ReadAsStreamAsync_ReadWithCancelableToken_MatchesInput(bool us`
`244`	`244`	`const int ContentLength = 100;`
`245`	`245`
`246`	`246`	`Memory<byte> memory;`
`247`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`247`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`248`	`248`	`{`
`249`	`249`	`var buffer = new byte[1];`
`250`	`250`	`var cts = new CancellationTokenSource();`
`@@ -278,7 +278,7 @@ public async Task ReadAsStreamAsync_ReadWithCanceledToken_MatchesInput(bool useA`
`278`	`278`
`279`	`279`	`Memory<byte> memory;`
`280`	`280`
`281`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`281`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`282`	`282`	`{`
`283`	`283`	`using (Stream stream = await content.ReadAsStreamAsync())`
`284`	`284`	`{`
`@@ -294,7 +294,7 @@ public async Task ReadAsStreamAsync_ReadWithCanceledToken_MatchesInput(bool useA`
`294`	`294`	`public async Task CopyToAsync_AllContentCopied(int contentLength, bool useArray)`
`295`	`295`	`{`
`296`	`296`	`Memory<byte> memory;`
`297`		`- using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`297`	`+ using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`298`	`298`	`{`
`299`	`299`
`300`	`300`	`var destination = new MemoryStream();`
`@@ -309,7 +309,7 @@ public async Task CopyToAsync_AllContentCopied(int contentLength, bool useArray)`
`309`	`309`	`public async Task ReadAsStreamAsync_CopyTo_AllContentCopied(int contentLength, bool useArray)`
`310`	`310`	`{`
`311`	`311`	`Memory<byte> memory;`
`312`		`- using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`312`	`+ using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`313`	`313`	`{`
`314`	`314`
`315`	`315`	`var destination = new MemoryStream();`
`@@ -328,7 +328,7 @@ public async Task ReadAsStreamAsync_CopyTo_InvalidArguments(bool useArray)`
`328`	`328`	`{`
`329`	`329`	`const int ContentLength = 42;`
`330`	`330`	`Memory<byte> memory;`
`331`		`- using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`331`	`+ using (ReadOnlyMemoryContent content = CreateContent(ContentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`332`	`332`	`{`
`333`	`333`	`using (Stream s = await content.ReadAsStreamAsync())`
`334`	`334`	`{`
`@@ -354,7 +354,7 @@ public async Task ReadAsStreamAsync_CopyTo_InvalidArguments(bool useArray)`
`354`	`354`	`public async Task ReadAsStreamAsync_CopyToAsync_AllContentCopied(int contentLength, bool useArray)`
`355`	`355`	`{`
`356`	`356`	`Memory<byte> memory;`
`357`		`- using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out MemoryManager<byte> ownedMemory))`
	`357`	`+ using (ReadOnlyMemoryContent content = CreateContent(contentLength, useArray, out memory, out IMemoryOwner<byte> memoryOwner))`
`358`	`358`	`{`
`359`	`359`
`360`	`360`	`var destination = new MemoryStream();`
`@@ -367,17 +367,17 @@ public async Task ReadAsStreamAsync_CopyToAsync_AllContentCopied(int contentLeng`
`367`	`367`	`}`
`368`	`368`	`}`
`369`	`369`
`370`		`- private static ReadOnlyMemoryContent CreateContent(int contentLength, bool useArray, out Memory<byte> memory, out MemoryManager<byte> ownedMemory)`
	`370`	`+ private static ReadOnlyMemoryContent CreateContent(int contentLength, bool useArray, out Memory<byte> memory, out IMemoryOwner<byte> memoryOwner)`
`371`	`371`	`{`
`372`	`372`	`if (useArray)`
`373`	`373`	`{`
`374`	`374`	`memory = new byte[contentLength];`
`375`		`- ownedMemory = null;`
	`375`	`+ memoryOwner = null;`
`376`	`376`	`}`
`377`	`377`	`else`
`378`	`378`	`{`
`379`		`- ownedMemory = new NativeMemoryManager(contentLength);`
`380`		`- memory = ownedMemory.Memory;`
	`379`	`+ memoryOwner = new NativeMemoryManager(contentLength);`
	`380`	`+ memory = memoryOwner.Memory;`
`381`	`381`	`}`
`382`	`382`
`383`	`383`	`new Random(contentLength).NextBytes(memory.Span);`