Fix keypath bug and overload resolution oddity.

- Ensure a component with directory keypath is accurately reflected in
`ComponentTuple.KeyPathType`.
- To ensure callers don't have to reference wix.dll, have separate
static methods for converting a file or a live WiX v3 `Output` object.

1 files changed, 2 insertions, 3 deletions

diff --git a/src/test/WixToolsetTest.Converters.Tupleizer/ConvertTuplesFixture.cs b/src/test/WixToolsetTest.Converters.Tupleizer/ConvertTuplesFixture.cs
index a180e20d..5df577f6 100644
--- a/src/test/WixToolsetTest.Converters.Tupleizer/ConvertTuplesFixture.cs
+++ b/src/test/WixToolsetTest.Converters.Tupleizer/ConvertTuplesFixture.cs
@@ -27,10 +27,8 @@ namespace WixToolsetTest.Converters.Tupleizer
                 var intermediateFolder = fs.GetFolder();
 
                 var path = Path.Combine(dataFolder, "test.wixout");
-                var output = Wix3.Output.Load(path, suppressVersionCheck: true, suppressSchema: true);
 
-                var command = new ConvertTuplesCommand();
-                var intermediate = command.Execute(output);
+                var intermediate = ConvertTuples.ConvertFile(path);
 
                 Assert.NotNull(intermediate);
                 Assert.Single(intermediate.Sections);
@@ -43,6 +41,7 @@ namespace WixToolsetTest.Converters.Tupleizer
 
                 intermediate = Intermediate.Load(wixiplFile);
 
+                var output = Wix3.Output.Load(path, suppressVersionCheck: true, suppressSchema: true);
                 var wixMediaByDiskId = IndexWixMediaTableByDiskId(output);
 
                 // Dump to text for easy diffing, with some massaging to keep v3 and v4 diffable.