-
Notifications
You must be signed in to change notification settings - Fork 93
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.
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
Update SarifVersionOneToCurrentVisitor for run.files array #1221
Merged
michaelcfanning
merged 24 commits into
files-array
from
users/lgolding/files-array-v1-to-v2-transform
Jan 18, 2019
Merged
Changes from 21 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
019ca91
Uncomment v1 -> v2 tests; 3/14 fail.
f848f8e
Move test data to locations expected by FileDiffingTests.
a774c8f
Fix up some IDE C#7 code cleanups.
91cd0d2
Use FileDiffingTests helper.
da6e9ee
Fix bug in FileDiffingTests that caused a test failure.
bd5f3e1
Remove default-valued argument from a call to RunTest.
2fa702e
Create basic files array
baad98a
Revert incorrect change in FileDiffingTests.
4645900
Merge branch 'files-array' into users/lgolding/files-array-v1-to-v2-t…
10548c3
Fix one unit test with spot fix to "expected" file.
c9e375b
Fix up some C#7 IDE warnings
2138f8f
Force update in FileDiffing tests to avoid deserialization errors fro…
56bf415
Merge branch 'files-array' into users/lgolding/files-array-v1-to-v2-t…
3e97d66
Fix missing "modified" flag sets in PreRelCompatTransformer.
9c1990d
Merge branch 'files-array' into users/lgolding/files-array-v1-to-v2-t…
e60bc52
Merge branch 'files-array' into users/lgolding/files-array-v1-to-v2-t…
458e068
Populate fileIndex in run.files array.
6765bfc
Fix unit test by fixing fileLocation creation.
0c32164
Restore response file handling.
9f488ca
Populate fileIndex on fileLocations as appropriate.
d94dbca
Fix last test failure by reworking response file handling.
69e03e3
Feedback: Introduce transformer helper PopulatePropertyIfAbsent.
9fe211b
Feedback: Tighten platform-independent string compare.
928e336
Feedbakc: Revert FileDiffingTest change; downgrade affected test file…
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -68,34 +68,34 @@ | |
<None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\RestoreFromPropertyBag.sarif" /> | ||
<None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\ResultLocations.sarif" /> | ||
<None Remove="TestData\SarifCurrentToVersionOneVisitor\Inputs\TwoResultsWithFixes.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\BasicResult.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\CodeFlows.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\Minimum.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\MinimumWithPropertiesAndTags.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\MinimumWithTwoRuns.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\NotificationExceptionWithStack.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithBasicInvocation.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithFiles.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithInvocationAndNotifications.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithLogicalLocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithRules.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\RestoreFromPropertyBag.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v1\TwoResultsWithFixes.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\BasicResult.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\CodeFlows.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\Minimum.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\MinimumWithPropertiesAndTags.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\MinimumWithTwoRuns.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\NotificationExceptionWithStack.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithBasicInvocation.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithFiles.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithInvocationAndNotifications.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithLogicalLocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithRules.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\RestoreFromPropertyBag.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\v2\TwoResultsWithFixes.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\BasicResult.sarif" /> | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Migrate to |
||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\CodeFlows.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\Minimum.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\MinimumWithPropertiesAndTags.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\MinimumWithTwoRuns.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\NotificationExceptionWithStack.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithBasicInvocation.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithFiles.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithInvocationAndNotifications.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithLogicalLocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithRules.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\RestoreFromPropertyBag.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\Inputs\TwoResultsWithFixes.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\BasicResult.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\CodeFlows.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\Minimum.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\MinimumWithPropertiesAndTags.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\MinimumWithTwoRuns.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\NotificationExceptionWithStack.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithBasicInvocation.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithFiles.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithInvocationAndNotifications.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithLogicalLocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithRules.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\RestoreFromPropertyBag.sarif" /> | ||
<None Remove="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\TwoResultsWithFixes.sarif" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
|
@@ -136,34 +136,34 @@ | |
<EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\RestoreFromPropertyBag.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\ResultLocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifCurrentToVersionOneVisitor\Inputs\TwoResultsWithFixes.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\BasicResult.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\CodeFlows.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\Minimum.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\MinimumWithPropertiesAndTags.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\MinimumWithTwoRuns.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\NotificationExceptionWithStack.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithBasicInvocation.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithFiles.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithInvocationAndNotifications.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithLogicalLocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\OneRunWithRules.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\RestoreFromPropertyBag.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v1\TwoResultsWithFixes.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\BasicResult.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\CodeFlows.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\Minimum.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\MinimumWithPropertiesAndTags.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\MinimumWithTwoRuns.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\NotificationExceptionWithStack.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithBasicInvocation.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithFiles.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithInvocationAndNotifications.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithLogicalLocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\OneRunWithRules.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\RestoreFromPropertyBag.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\v2\TwoResultsWithFixes.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\BasicResult.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\CodeFlows.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\Minimum.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\MinimumWithPropertiesAndTags.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\MinimumWithTwoRuns.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\NotificationExceptionWithStack.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithBasicInvocation.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithFiles.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithInvocationAndNotifications.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithLogicalLocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\OneRunWithRules.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\RestoreFromPropertyBag.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\Inputs\TwoResultsWithFixes.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\BasicResult.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\CodeFlows.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\Minimum.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\MinimumWithPropertiesAndTags.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\MinimumWithTwoRuns.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\NotificationExceptionWithStack.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithBasicInvocation.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithFiles.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithInvocationAndNotifications.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithLogicalLocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithNotificationsButNoInvocations.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\OneRunWithRules.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\RestoreFromPropertyBag.sarif" /> | ||
<EmbeddedResource Include="TestData\SarifVersionOneToCurrentVisitor\ExpectedOutputs\TwoResultsWithFixes.sarif" /> | ||
</ItemGroup> | ||
|
||
<ItemGroup> | ||
|
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Some tests were failing with deserialization errors because without this, the core transformations didn't happen. #Resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
hm. this could indicate we have input files that improperly describe their version. alternately, you could have found those inputs and reset their version to "2.0.0". this is speculative, i don't know what you actually encountered of course.
In reply to: 248876087 [](ancestors = 248876087)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok. suggest resetting this value to false. there are three inputs that are failing. go update their version to 10-10, which will provoke the transform. i think this is better than having test files that profess to be 11-28 but which clearly aren't
In reply to: 248880334 [](ancestors = 248880334,248876087)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good idea. Two of the files actually were already 10-10 and needed to be downgraded to 09-26 to provoke the core transform, but all tests now pass with
forceUpdate: false
.In reply to: 248887247 [](ancestors = 248887247,248880334,248876087)