chore: Adjust tests

unoplatform · Apr 19, 2023 · 284f2a4 · 284f2a4
1 parent 62d9747
commit 284f2a4
Show file tree

Hide file tree

Showing 48 changed files with 22 additions and 3 deletions.
diff --git a/...fiedInCodeBehind/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...fiedInCodeBehind/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...fiedInCodeBehind/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...fiedInCodeBehind/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs b/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs
diff --git a/...trol1_81d855d5b3bba02f594dcda3b149beb2.cs → ...trol1_81d855d5b3bba02f594dcda3b149beb2.cs b/...trol1_81d855d5b3bba02f594dcda3b149beb2.cs → ...trol1_81d855d5b3bba02f594dcda3b149beb2.cs
diff --git a/...plate_66bf0a54f1801c397a6fa4930a237eca.cs → ...plate_66bf0a54f1801c397a6fa4930a237eca.cs b/...plate_66bf0a54f1801c397a6fa4930a237eca.cs → ...plate_66bf0a54f1801c397a6fa4930a237eca.cs
diff --git a/...Name_In_Template/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...Name_In_Template/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...Name_In_Template/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...Name_In_Template/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...es_Both_Syntaxes/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...es_Both_Syntaxes/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...taxes_794c1760299b374d12fe38ba3b633206.cs → ...taxes_794c1760299b374d12fe38ba3b633206.cs b/...taxes_794c1760299b374d12fe38ba3b633206.cs → ...taxes_794c1760299b374d12fe38ba3b633206.cs
diff --git a/...es_Both_Syntaxes/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...es_Both_Syntaxes/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...es_Common_Syntax/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...es_Common_Syntax/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...yntax_8659265dc2cabf0b5a684f0f4b26f8b7.cs → ...yntax_8659265dc2cabf0b5a684f0f4b26f8b7.cs b/...yntax_8659265dc2cabf0b5a684f0f4b26f8b7.cs → ...yntax_8659265dc2cabf0b5a684f0f4b26f8b7.cs
diff --git a/...es_Common_Syntax/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...es_Common_Syntax/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...tProperty_Syntax/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...tProperty_Syntax/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...yntax_9f853e56098ff21d39f15479035509ef.cs → ...yntax_9f853e56098ff21d39f15479035509ef.cs b/...yntax_9f853e56098ff21d39f15479035509ef.cs → ...yntax_9f853e56098ff21d39f15479035509ef.cs
diff --git a/...tProperty_Syntax/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...tProperty_Syntax/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/..._Succinct_Syntax/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/..._Succinct_Syntax/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...yntax_cc38332c9fd4c0da9c1fa0270bbd3609.cs → ...yntax_cc38332c9fd4c0da9c1fa0270bbd3609.cs b/...yntax_cc38332c9fd4c0da9c1fa0270bbd3609.cs → ...yntax_cc38332c9fd4c0da9c1fa0270bbd3609.cs
diff --git a/..._Succinct_Syntax/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/..._Succinct_Syntax/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...Element_Property/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...Element_Property/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...uteDoesNotExists/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...uteDoesNotExists/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...uteDoesNotExists/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...uteDoesNotExists/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs b/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs
diff --git a/...teExists__name/TestRepro.MyViewModel.g.cs → ...pertyGenerator_TestRepro.MyViewModel.g.cs b/...teExists__name/TestRepro.MyViewModel.g.cs → ...pertyGenerator_TestRepro.MyViewModel.g.cs
diff --git a/...me/__KnownINotifyPropertyChangedArgs.g.cs → ...or___KnownINotifyPropertyChangedArgs.g.cs b/...me/__KnownINotifyPropertyChangedArgs.g.cs → ...or___KnownINotifyPropertyChangedArgs.g.cs
diff --git a/...e/__KnownINotifyPropertyChangingArgs.g.cs → ...r___KnownINotifyPropertyChangingArgs.g.cs b/...e/__KnownINotifyPropertyChangingArgs.g.cs → ...r___KnownINotifyPropertyChangingArgs.g.cs
diff --git a/...buteExists__name/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...buteExists__name/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...buteExists__name/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...buteExists__name/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs b/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs
diff --git a/...eExists_m_name/TestRepro.MyViewModel.g.cs → ...pertyGenerator_TestRepro.MyViewModel.g.cs b/...eExists_m_name/TestRepro.MyViewModel.g.cs → ...pertyGenerator_TestRepro.MyViewModel.g.cs
diff --git a/...me/__KnownINotifyPropertyChangedArgs.g.cs → ...or___KnownINotifyPropertyChangedArgs.g.cs b/...me/__KnownINotifyPropertyChangedArgs.g.cs → ...or___KnownINotifyPropertyChangedArgs.g.cs
diff --git a/...e/__KnownINotifyPropertyChangingArgs.g.cs → ...r___KnownINotifyPropertyChangingArgs.g.cs b/...e/__KnownINotifyPropertyChangingArgs.g.cs → ...r___KnownINotifyPropertyChangingArgs.g.cs
diff --git a/...uteExists_m_name/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...uteExists_m_name/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...uteExists_m_name/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...uteExists_m_name/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs b/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs
diff --git a/...uteExists_name/TestRepro.MyViewModel.g.cs → ...pertyGenerator_TestRepro.MyViewModel.g.cs b/...uteExists_name/TestRepro.MyViewModel.g.cs → ...pertyGenerator_TestRepro.MyViewModel.g.cs
diff --git a/...me/__KnownINotifyPropertyChangedArgs.g.cs → ...or___KnownINotifyPropertyChangedArgs.g.cs b/...me/__KnownINotifyPropertyChangedArgs.g.cs → ...or___KnownINotifyPropertyChangedArgs.g.cs
diff --git a/...e/__KnownINotifyPropertyChangingArgs.g.cs → ...r___KnownINotifyPropertyChangingArgs.g.cs b/...e/__KnownINotifyPropertyChangingArgs.g.cs → ...r___KnownINotifyPropertyChangingArgs.g.cs
diff --git a/...ibuteExists_name/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...ibuteExists_name/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...ibuteExists_name/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...ibuteExists_name/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs b/...nPage_d6cd66944958ced0c513e0a04797b51d.cs → ...nPage_d6cd66944958ced0c513e0a04797b51d.cs
diff --git a/...rties_4891310bc693a433ba9a8e9f5113f94f.cs → ...rties_4891310bc693a433ba9a8e9f5113f94f.cs b/...rties_4891310bc693a433ba9a8e9f5113f94f.cs → ...rties_4891310bc693a433ba9a8e9f5113f94f.cs
diff --git a/...ommon_Properties/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...ommon_Properties/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...ommon_Properties/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...ommon_Properties/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...rties_5147419e44d1bc3e3f86860ad528476f.cs → ...rties_5147419e44d1bc3e3f86860ad528476f.cs b/...rties_5147419e44d1bc3e3f86860ad528476f.cs → ...rties_5147419e44d1bc3e3f86860ad528476f.cs
diff --git a/...bject_Properties/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs b/...bject_Properties/GlobalStaticResources.cs → ...amlCodeGenerator_GlobalStaticResources.cs
diff --git a/...bject_Properties/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs b/...bject_Properties/LocalizationResources.cs → ...amlCodeGenerator_LocalizationResources.cs
diff --git a/...ors/Uno.UI.SourceGenerators.netcore.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs b/...ors/Uno.UI.SourceGenerators.netcore.Tests/XamlCodeGeneratorTests/Verifiers/CSGenerator.cs
@@ -6,6 +6,7 @@
 using System.Diagnostics;
 using System.Runtime.CompilerServices;
 using System.Text;
+using CommunityToolkit.Mvvm.SourceGenerators;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.Testing;
@@ -117,7 +118,7 @@ protected override Project ApplyCompilationOptions(Project project)
 				foreach (var tree in compilation.SyntaxTrees.Skip(project.DocumentIds.Count))
 				{
 					WriteTreeToDiskIfNecessary(tree, resourceDirectory);
-					expectedNames.Add(Path.GetFileName(tree.FilePath));
+					expectedNames.Add(GetFileNameFromTree(tree));
 				}
 
 				var currentTestPrefix = $"Uno.UI.SourceGenerators.netcore.Tests.XamlCodeGeneratorTests.{TestOutputFolderName}.{_testMethodName}.";
@@ -155,12 +156,29 @@ public Test AddGeneratedSources()
 
 					using var reader = new StreamReader(resourceStream, Encoding.UTF8, detectEncodingFromByteOrderMarks: true, bufferSize: 4096, leaveOpen: true);
 					var name = resourceName.Substring(expectedPrefix.Length);
-					TestState.GeneratedSources.Add((typeof(XamlCodeGenerator), name, reader.ReadToEnd()));
+					var underscoreIndex = name.IndexOf('_');
+					var generatorName = name.Substring(0, underscoreIndex);
+					name = name.Substring(underscoreIndex + 1);
+
+					var type = generatorName switch
+					{
+						"XamlCodeGenerator" => typeof(XamlCodeGenerator),
+						"ObservablePropertyGenerator" => typeof(ObservablePropertyGenerator),
+						_ => throw new Exception("Unexpected generator name"),
+					};
+					TestState.GeneratedSources.Add((type, name, reader.ReadToEnd()));
 				}
 
 				return this;
 			}
 
+			private static string GetFileNameFromTree(SyntaxTree tree)
+			{
+				var generatorName = new DirectoryInfo(tree.FilePath).Parent!.Name;
+				generatorName = generatorName.Substring(generatorName.LastIndexOf('.') + 1);
+				return $"{generatorName}_{Path.GetFileName(tree.FilePath)}";
+			}
+
 			[Conditional("WRITE_EXPECTED")]
 			private static void WriteTreeToDiskIfNecessary(SyntaxTree tree, string resourceDirectory)
 			{
@@ -169,7 +187,8 @@ private static void WriteTreeToDiskIfNecessary(SyntaxTree tree, string resourceD
 					throw new ArgumentException("Syntax tree encoding was not specified");
 				}
 
-				var name = Path.GetFileName(tree.FilePath);
+				var name = GetFileNameFromTree(tree);
+
 				var filePath = Path.Combine(resourceDirectory, name);
 				Directory.CreateDirectory(resourceDirectory);
 				File.WriteAllText(filePath, tree.GetText().ToString(), tree.Encoding);