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

Dynamic data display name #373

Merged
merged 8 commits into from
Apr 12, 2018
Merged

Dynamic data display name #373

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7efb25
Corrected documentation
Feb 21, 2018
09c30cf
Added dynamic display name to DynamicDataAttribute
Feb 21, 2018
0b428fd
Merge branch 'master' into dynamic-display-name
Feb 21, 2018
11011dc
Merge branch 'master' into requested-changes
Apr 6, 2018
b2bb90e
Changes requested from PR
Apr 6, 2018
13c83c5
Updated the exception message and added a test for public accessibility
bstoney Apr 9, 2018
d0af564
Merge branch 'master' into dynamic-display-name
jayaranigarg Apr 11, 2018
80192b8
Merge branch 'master' into dynamic-display-name
jayaranigarg Apr 11, 2018
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
Next Next commit
Updated the exception message and added a test for public accessibility
  • Loading branch information
@bstoney
bstoney committed Apr 9, 2018
commit 13c83c52fb5a93398fa24de175e33a8c0077c003
5 changes: 3 additions & 2 deletions src/TestFramework/MSTest.Core/Attributes/DynamicDataAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,8 @@ public string GetDisplayName(MethodInfo methodInfo, object[] data)
parameters[0].ParameterType != typeof(MethodInfo) ||
parameters[1].ParameterType != typeof(object[]) ||
method.ReturnType != typeof(string) ||
!method.IsStatic)
!method.IsStatic ||
!method.IsPublic)
{
throw new ArgumentNullException(
string.Format(
Expand All @@ -176,4 +177,4 @@ public string GetDisplayName(MethodInfo methodInfo, object[] data)
return null;
}
}
}
}
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/FrameworkMessages.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/FrameworkMessages.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,6 @@ Stack Trace: {4}</value>
<value>Value returned by property or method {0} shouldn't be null.</value>
</data>
<data name="DynamicDataDisplayName" xml:space="preserve">
Copy link
Member

@jayaranigarg jayaranigarg Mar 29, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also please run "build.cmd -uxlf" so the string addition is localizable. You would have to commit the xlf files changes post running the script.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I ran this and have committed the xlf files. I'm assuming someone or some magic will do the translation?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes please. We just needed modified xlf files. We will take care of the translation 😄

<value>Method {0} must match the expected signature: {1} {0}({2}).</value>
<value>Method {0} must match the expected signature: public static {1} {0}({2}).</value>
</data>
</root>
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.cs.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Trasování zásobníku: {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.de.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stapelüberwachung: {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Seguimiento de la pila: {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.fr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Trace de la pile : {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.it.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Analisi dello stack: {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.ja.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stack Trace: {4}</source>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.ko.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stack Trace: {4}</source>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.pl.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Komunikat o wyjątku: {3}
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.pt-BR.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Rastreamento de Pilha: {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.ru.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stack Trace: {4}</source>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.tr.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Yığın İzleme: {4}</target>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stack Trace: {4}</target>
<note></note>
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.zh-Hans.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stack Trace: {4}</source>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
2 changes: 1 addition & 1 deletion src/TestFramework/MSTest.Core/Resources/xlf/FrameworkMessages.zh-Hant.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ Stack Trace: {4}</source>
<note />
</trans-unit>
<trans-unit id="DynamicDataDisplayName">
<source>Method {0} must match the expected signature: {1} {0}({2}).</source>
<source>Method {0} must match the expected signature: public static {1} {0}({2}).</source>
<target state="new">Method {0} must match the expected signature: {1} {0}({2}).</target>
<note></note>
</trans-unit>
Expand Down
31 changes: 31 additions & 0 deletions test/UnitTests/MSTest.Core.Unit.Tests/Attributes/DynamicDataAttributeTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,20 @@ public void GetDisplayNameShouldThrowExceptionWithDynamicDataDisplayNameMethodNo
ActionUtility.ActionShouldThrowExceptionOfType(action, typeof(ArgumentNullException));
}

[TestFrameworkV1.TestMethod]
public void GetDisplayNameShouldThrowExceptionWithDynamicDataDisplayNameMethodPrivate()
{
Action action = () =>
{
var data = new object[] { 1, 2, 3 };

this.dynamicDataAttribute.DynamicDataDisplayName = "GetDynamicDataDisplayNamePrivate";
var displayName = this.dynamicDataAttribute.GetDisplayName(this.testMethodInfo, data);
};

ActionUtility.ActionShouldThrowExceptionOfType(action, typeof(ArgumentNullException));
}

[TestFrameworkV1.TestMethod]
public void GetDisplayNameShouldThrowExceptionWithMissingDynamicDataDisplayNameMethod()
{
Expand Down Expand Up @@ -433,6 +447,23 @@ public void TestMethod4()
public void DataRowTestMethod()
{
}

/// <summary>
/// Custom display name method that is private.
/// </summary>
/// <param name="methodInfo">
/// The method info of test method.
/// </param>
/// <param name="data">
/// The test data which is passed to test method.
/// </param>
/// <returns>
/// The <see cref="string"/>.
/// </returns>
private static string GetDynamicDataDisplayNamePrivate(MethodInfo methodInfo, object[] data)
{
throw new InvalidOperationException();
}
}

public class DummyTestClass2
Expand Down