diff options
| author | Bob Arnson <bob@firegiant.com> | 2020-08-25 14:58:01 -0400 |
|---|---|---|
| committer | Bob Arnson <bob@firegiant.com> | 2020-08-25 15:01:08 -0400 |
| commit | c2d23a0d9c4d7b7205a288b1aa912b7f8d68702d (patch) | |
| tree | 6261ea801f5575b2f142595b8e5791c90c5ee381 /src/test | |
| parent | 732158ca8f82721c5e0ed772c4eb6bab39ac36ce (diff) | |
| download | wix-c2d23a0d9c4d7b7205a288b1aa912b7f8d68702d.tar.gz wix-c2d23a0d9c4d7b7205a288b1aa912b7f8d68702d.tar.bz2 wix-c2d23a0d9c4d7b7205a288b1aa912b7f8d68702d.zip | |
Fix custom table & custom action decompilation.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/WixToolsetTest.Converters/CustomActionFixture.cs | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.Converters/CustomTableFixture.cs | 22 |
2 files changed, 16 insertions, 8 deletions
diff --git a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs index e19de6e3..4ad7dcfd 100644 --- a/src/test/WixToolsetTest.Converters/CustomActionFixture.cs +++ b/src/test/WixToolsetTest.Converters/CustomActionFixture.cs | |||
| @@ -60,7 +60,7 @@ namespace WixToolsetTest.Converters | |||
| 60 | 60 | ||
| 61 | var expected = String.Join(Environment.NewLine, | 61 | var expected = String.Join(Environment.NewLine, |
| 62 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", | 62 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", |
| 63 | " <CustomAction Id=\"Foo\" Script=\"jscript\" ScriptFile=\"Foo.js\" />", | 63 | " <CustomAction Id=\"Foo\" Script=\"jscript\" ScriptSourceFile=\"Foo.js\" />", |
| 64 | "</Wix>"); | 64 | "</Wix>"); |
| 65 | 65 | ||
| 66 | var expectedScript = String.Join("\n", | 66 | var expectedScript = String.Join("\n", |
diff --git a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs b/src/test/WixToolsetTest.Converters/CustomTableFixture.cs index 10ee2748..4470a2ff 100644 --- a/src/test/WixToolsetTest.Converters/CustomTableFixture.cs +++ b/src/test/WixToolsetTest.Converters/CustomTableFixture.cs | |||
| @@ -54,8 +54,10 @@ namespace WixToolsetTest.Converters | |||
| 54 | "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", | 54 | "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", |
| 55 | " <Fragment>", | 55 | " <Fragment>", |
| 56 | " <CustomTable Id='Custom1'>", | 56 | " <CustomTable Id='Custom1'>", |
| 57 | " <Row Id='Column1'>", | 57 | " <Row>", |
| 58 | " <Data Id='Column1'>", | ||
| 58 | " Some value", | 59 | " Some value", |
| 60 | " </Data>", | ||
| 59 | " </Row>", | 61 | " </Row>", |
| 60 | " </CustomTable>", | 62 | " </CustomTable>", |
| 61 | " </Fragment>", | 63 | " </Fragment>", |
| @@ -66,7 +68,9 @@ namespace WixToolsetTest.Converters | |||
| 66 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", | 68 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", |
| 67 | " <Fragment>", | 69 | " <Fragment>", |
| 68 | " <CustomTable Id=\"Custom1\">", | 70 | " <CustomTable Id=\"Custom1\">", |
| 69 | " <Row Id=\"Column1\" Value=\"Some value\" />", | 71 | " <Row>", |
| 72 | " <Data Id=\"Column1\" Value=\"Some value\" />", | ||
| 73 | " </Row>", | ||
| 70 | " </CustomTable>", | 74 | " </CustomTable>", |
| 71 | " </Fragment>", | 75 | " </Fragment>", |
| 72 | "</Wix>" | 76 | "</Wix>" |
| @@ -91,10 +95,12 @@ namespace WixToolsetTest.Converters | |||
| 91 | "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", | 95 | "<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>", |
| 92 | " <Fragment>", | 96 | " <Fragment>", |
| 93 | " <CustomTable Id='Custom1'>", | 97 | " <CustomTable Id='Custom1'>", |
| 94 | " <Row Id='Column1'>", | 98 | " <Row>", |
| 95 | " <![CDATA[", | 99 | " <Data Id='Column1'>", |
| 96 | " Some value", | 100 | " <![CDATA[", |
| 97 | " ]]>", | 101 | " Some value", |
| 102 | " ]]>", | ||
| 103 | " </Data>", | ||
| 98 | " </Row>", | 104 | " </Row>", |
| 99 | " </CustomTable>", | 105 | " </CustomTable>", |
| 100 | " </Fragment>", | 106 | " </Fragment>", |
| @@ -105,7 +111,9 @@ namespace WixToolsetTest.Converters | |||
| 105 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", | 111 | "<Wix xmlns=\"http://wixtoolset.org/schemas/v4/wxs\">", |
| 106 | " <Fragment>", | 112 | " <Fragment>", |
| 107 | " <CustomTable Id=\"Custom1\">", | 113 | " <CustomTable Id=\"Custom1\">", |
| 108 | " <Row Id=\"Column1\" Value=\"Some value\" />", | 114 | " <Row>", |
| 115 | " <Data Id=\"Column1\" Value=\"Some value\" />", | ||
| 116 | " </Row>", | ||
| 109 | " </CustomTable>", | 117 | " </CustomTable>", |
| 110 | " </Fragment>", | 118 | " </Fragment>", |
| 111 | "</Wix>" | 119 | "</Wix>" |