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

Jump to bottom

Reenabled some common dialog tests #126

Merged
merged 1 commit into from
Apr 26, 2023
Merged

Reenabled some common dialog tests #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 14 additions & 0 deletions Microsoft.DotNet.Wpf.Test.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XTCs", "src\Test\AppModel\F
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DialogTests", "src\Test\AppModel\FeatureTests\CommonDialogs\DialogTests\DialogTests.csproj", "{4BE5CA7A-06BA-46E6-ADC7-F3BD853E3DBC}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DialogTestsPart1", "src\Test\AppModel\FeatureTests\CommonDialogs\Part1\DialogTests\DialogTestsPart1.csproj", "{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DialogResultConverter", "src\Test\AppModel\FeatureTests\CommonDialogs\DialogResultConverter\DialogResultConverter.csproj", "{0396E9D1-C030-41DC-B0D2-5856853449B4}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Security", "src\Test\AppModel\FeatureTests\Security\ClrUnmanagedCodeCheck\Security.csproj", "{B421E9B9-F04D-4583-A0E9-C27C88ABDFD7}"
Expand Down Expand Up @@ -4245,6 +4247,18 @@ Global
{4BE5CA7A-06BA-46E6-ADC7-F3BD853E3DBC}.Release|x64.Build.0 = Release|x64
{4BE5CA7A-06BA-46E6-ADC7-F3BD853E3DBC}.Release|x86.ActiveCfg = Release|Any CPU
{4BE5CA7A-06BA-46E6-ADC7-F3BD853E3DBC}.Release|x86.Build.0 = Release|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Debug|x64.ActiveCfg = Debug|x64
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Debug|x64.Build.0 = Debug|x64
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Debug|x86.ActiveCfg = Debug|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Debug|x86.Build.0 = Debug|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Release|Any CPU.Build.0 = Release|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Release|x64.ActiveCfg = Release|x64
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Release|x64.Build.0 = Release|x64
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Release|x86.ActiveCfg = Release|Any CPU
{0BF61BA9-AB8A-41EB-B3C5-F864BA0036D9}.Release|x86.Build.0 = Release|Any CPU
{A529095D-FC33-4B49-9E19-91A90B694C06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A529095D-FC33-4B49-9E19-91A90B694C06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A529095D-FC33-4B49-9E19-91A90B694C06}.Debug|x64.ActiveCfg = Debug|x64
Expand Down
4 changes: 2 additions & 2 deletions ...logs/Part1/DialogTests/DialogTests.csproj → ...Part1/DialogTests/DialogTestsPart1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

<PropertyGroup>
<RootNamespace>Microsoft.Test.WPF.AppModel.CommonDialogs</RootNamespace>
<AssemblyName>DialogTests</AssemblyName>
<PublishDir>$(PublishDir)\DialogTests</PublishDir>
<AssemblyName>DialogTestsPart1</AssemblyName>
<PublishDir>$(PublishDir)\DialogTestsPart1</PublishDir>
<OutputType>winexe</OutputType>
<Configuration>Release</Configuration>
</PropertyGroup>
Expand Down
56 changes: 28 additions & 28 deletions src/Test/AppModel/FeatureTests/XTCs/CommonDialogs.xtc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@
</Versions>
</TEST>

<!--<TEST Name="CommonDialog_CustomPlaceCases"
<TEST Name="CommonDialog_CustomPlaceCases"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -536,17 +536,17 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:customplacecases" />
MethodParams="DialogTestsPart1.exe /test:customplacecases" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

<!--<TEST Name="CommonDialog_FileDialogCustomPlaceCases"
<TEST Name="CommonDialog_FileDialogCustomPlaceCases"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -557,17 +557,17 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:filedialogcustomplacecases" />
MethodParams="DialogTestsPart1.exe /test:filedialogcustomplacecases" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

<!--<TEST Name="CommonDialog_OpenFileBeforeShow"
<TEST Name="CommonDialog_OpenFileBeforeShow"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -578,17 +578,17 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:openfilebeforeshow" />
MethodParams="DialogTestsPart1.exe /test:openfilebeforeshow" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

<!--<TEST Name="CommonDialog_OpenFileIsThreadModal"
<TEST Name="CommonDialog_OpenFileIsThreadModal"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -599,17 +599,17 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:openfileisthreadmodal" />
MethodParams="DialogTestsPart1.exe /test:openfileisthreadmodal" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

<!--<TEST Name="CommonDialog_SaveFileIsThreadModal"
<TEST Name="CommonDialog_SaveFileIsThreadModal"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -620,17 +620,17 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:savefileisthreadmodal" />
MethodParams="DialogTestsPart1.exe /test:savefileisthreadmodal" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

<!--<TEST Name="CommonDialog_OpenFileOnSecondThread"
<TEST Name="CommonDialog_OpenFileOnSecondThread"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -642,17 +642,17 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:openfileonsecondthread" />
MethodParams="DialogTestsPart1.exe /test:openfileonsecondthread" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

<!--<TEST Name="CommonDialog_SaveFileOnSecondThread"
<TEST Name="CommonDialog_SaveFileOnSecondThread"
Priority="1"
Type="Functional"
Area="AppModel"
Expand All @@ -664,15 +664,15 @@
Assembly="TestRuntime"
Method="RunApplication"
SecurityLevel="FullTrust"
MethodParams="DialogTests.exe /test:savefileonsecondthread" />
MethodParams="DialogTestsPart1.exe /test:savefileonsecondthread" />
<SupportFiles>
<SupportFile Source="FeatureTests\AppModel\DialogTests\*" />
<SupportFile Source="FeatureTests\AppModel\DialogTestsPart1\*" />
</SupportFiles>
<Versions>
<Version>4.0+</Version>
<Version>4.0Client+</Version>
</Versions>
</TEST>-->
</TEST>

</XTC>