Fixed Diagnostic Tests for .NET 7

ChilliCream · Jul 14, 2022 · 49746f5 · 49746f5
1 parent e651c88
commit 49746f5
Show file tree

Hide file tree

Showing 29 changed files with 3,877 additions and 1 deletion.
diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/QueryInstrumentationTests.cs b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/QueryInstrumentationTests.cs
@@ -3,6 +3,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using ChilliCream.Testing;
 using HotChocolate.Execution;
+using Snapshooter;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Diagnostics.ActivityTestHelper;
@@ -25,7 +26,11 @@ public async Task Track_events_of_a_simple_query_default()
                 .ExecuteRequestAsync("{ sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -42,7 +47,11 @@ public async Task Track_data_loader_events()
                 .ExecuteRequestAsync("{ dataLoader(key: \"abc\") }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -59,7 +68,11 @@ public async Task Track_data_loader_events_with_keys()
                 .ExecuteRequestAsync("{ dataLoader(key: \"abc\") }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -143,7 +156,11 @@ public async Task Create_operation_display_name_with_1_field()
                 .ExecuteRequestAsync("{ a: sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -164,7 +181,11 @@ public async Task Create_operation_display_name_with_1_field_and_op()
                 .ExecuteRequestAsync("query GetA { a: sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -185,7 +206,11 @@ public async Task Create_operation_display_name_with_3_field()
                 .ExecuteRequestAsync("{ a: sayHello b: sayHello c: sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -206,7 +231,11 @@ public async Task Create_operation_display_name_with_4_field()
                 .ExecuteRequestAsync("{ a: sayHello b: sayHello c: sayHello d: sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -223,7 +252,11 @@ public async Task Track_events_of_a_simple_query_detailed()
                 .ExecuteRequestAsync("{ sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -240,7 +273,11 @@ public async Task Ensure_operation_name_is_used_as_request_name()
                 .ExecuteRequestAsync("query SayHelloOperation { sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -261,7 +298,11 @@ public async Task Allow_document_to_be_captured()
                 .ExecuteRequestAsync("query SayHelloOperation { sayHello }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -282,7 +323,11 @@ public async Task Ensure_that_the_validation_activity_has_an_error_status()
                 .ExecuteRequestAsync("query SayHelloOperation { sayHello_ }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -303,7 +348,11 @@ public async Task Cause_a_resolver_error_that_deletes_the_whole_result()
                 .ExecuteRequestAsync("query SayHelloOperation { causeFatalError }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -347,7 +396,11 @@ public async Task MaxComplexity_Not_Reached()
                     }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -391,7 +444,11 @@ public async Task MaxComplexity_Reached()
                     }");
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -404,5 +461,4 @@ public class SimpleQuery
         public Task<string> DataLoader(CustomDataLoader dataLoader, string key)
             => dataLoader.LoadAsync(key);
     }
-
 }
diff --git a/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ServerInstrumentationTests.cs b/src/HotChocolate/Diagnostics/test/Diagnostics.Tests/ServerInstrumentationTests.cs
@@ -5,6 +5,7 @@
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using HotChocolate.AspNetCore.Tests.Utilities;
+using Snapshooter;
 using Snapshooter.Xunit;
 using Xunit;
 using static HotChocolate.Diagnostics.ActivityTestHelper;
@@ -39,7 +40,11 @@ public async Task Http_Post_SingleRequest_GetHeroName_Default()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -64,7 +69,11 @@ public async Task Http_Post_SingleRequest_GetHeroName()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -89,7 +98,11 @@ public async Task Http_Get_SingleRequest_GetHeroName()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -115,7 +128,11 @@ public async Task Http_Post_variables_are_not_automatically_added_to_activities(
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -145,7 +162,11 @@ public async Task Http_Post_add_variables_to_http_activity()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -175,7 +196,11 @@ public async Task Http_Post_add_query_to_http_activity()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -202,7 +227,11 @@ public async Task Http_Post_with_extensions_map()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -223,7 +252,11 @@ public async Task Http_Get_SDL_download()
             await response.Content.ReadAsStringAsync();
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -252,7 +285,11 @@ public async Task Http_Post_capture_deferred_response()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -287,7 +324,11 @@ public async Task Http_Post_ensure_list_path_is_correctly_built()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -322,7 +363,11 @@ public async Task Http_Post_parser_error()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -349,7 +394,11 @@ public async Task Parsing_error_when_rename_root_is_activated()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }
 
@@ -376,7 +425,11 @@ public async Task Validation_error_when_rename_root_is_activated()
             });
 
             // assert
+#if NET7_0_OR_GREATER
+            activities.MatchSnapshot(new SnapshotNameExtension("_NET7"));
+#else
             activities.MatchSnapshot();
+#endif
         }
     }