[WiX-commits] wix/test/src/Tools/Dark Extensions.ExtensionTests.cs, 1.3, 1.4 Help.HelpTests.cs, 1.2, 1.3

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/test/src/Tools/Dark
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3912/test/src/Tools/Dark

Modified Files:
	Extensions.ExtensionTests.cs Help.HelpTests.cs 
Log Message:
BobArnso: Fix SFBug:2792525 - Missing punctuation in WixUI_en-us.wxs

AaronSte: Remove VS WiX detection and blocking logic from WiX setup.

EricStJ: SFBUG:2792176 - Do not use ConvertToAbsolutePath.

BobArnso: Re-fix SFBug:2786736 - Conditionalize for MSBuild 2.0 gold in
          addition to 2.0 SPx and 3.5

EricStJ: SFBUG:2777114 - Replacing TargetPath and TargetPdbPath with tokens
         to enable delayed expansion of the properties.  Modifying votive to
         use the tokens.

Index: Help.HelpTests.cs
===================================================================
RCS file: /cvsroot/wix/wix/test/src/Tools/Dark/Help.HelpTests.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Help.HelpTests.cs	15 May 2009 11:27:22 -0000	1.2
--- Help.HelpTests.cs	22 May 2009 11:07:25 -0000	1.3
***************
*** 57,72 ****
              dark.ExpectedOutputStrings.Add("Environment variables:");
              dark.ExpectedOutputStrings.Add("WIX_TEMP   overrides the temporary directory used for cab extraction, binary extraction, ...");
-             dark.ExpectedOutputStrings.Add("Common extensions:");
-             dark.ExpectedOutputStrings.Add(".wxi    - Windows installer Xml Include file");
-             dark.ExpectedOutputStrings.Add(".wxl    - Windows installer Xml Localization file");
-             dark.ExpectedOutputStrings.Add(".wxs    - Windows installer Xml Source file");
-             dark.ExpectedOutputStrings.Add(".wixlib - Windows installer Xml Library file (in XML format)");
-             dark.ExpectedOutputStrings.Add(".wixobj - Windows installer Xml Object file (in XML format)");
-             dark.ExpectedOutputStrings.Add(".wixout - Windows installer Xml Output file (in XML format)");
-             dark.ExpectedOutputStrings.Add(".msi - Windows installer Product Database");
-             dark.ExpectedOutputStrings.Add(".msm - Windows installer Merge Module");
-             dark.ExpectedOutputStrings.Add(".msp - Windows installer Patch");
-             dark.ExpectedOutputStrings.Add(".mst - Windows installer Transform");
-             dark.ExpectedOutputStrings.Add(".pcp - Windows installer Patch Creation Package");
              dark.ExpectedOutputStrings.Add("For more information see: http://wix.sourceforge.net");
  
--- 57,60 ----

Index: Extensions.ExtensionTests.cs
===================================================================
RCS file: /cvsroot/wix/wix/test/src/Tools/Dark/Extensions.ExtensionTests.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Extensions.ExtensionTests.cs	15 May 2009 11:27:22 -0000	1.3
--- Extensions.ExtensionTests.cs	22 May 2009 11:07:25 -0000	1.4
***************
*** 34,39 ****
              Dark dark = new Dark();
              dark.InputFile = Path.Combine(WixTests.SharedBaselinesDirectory, @"MSIs\BasicProduct.msi");
!             dark.OtherArguments = " -ext";
!             dark.ExpectedWixMessages.Add(new WixMessage(113,"The parameter '-ext' must be followed by the extension's type specification.  The type specification should be a fully qualified class and assembly identity, for example: \"MyNamespace.MyClass,myextension.dll\".",WixMessage.MessageTypeEnum.Error));
              dark.ExpectedExitCode = 113;
              dark.Run();
--- 34,39 ----
              Dark dark = new Dark();
              dark.InputFile = Path.Combine(WixTests.SharedBaselinesDirectory, @"MSIs\BasicProduct.msi");
!             dark.Extensions.Add(string.Empty);
!             dark.ExpectedWixMessages.Add(new WixMessage(113, "The parameter '-ext' must be followed by the extension's type specification.  The type specification should be a fully qualified class and assembly identity, for example: \"MyNamespace.MyClass,myextension.dll\".", WixMessage.MessageTypeEnum.Error));
              dark.ExpectedExitCode = 113;
              dark.Run();
***************
*** 48,52 ****
              dark.InputFile = Path.Combine(WixTests.SharedBaselinesDirectory, @"MSIs\BasicProduct.msi");
              dark.Extensions.Add(WixTests.BasicProductWxs);
!             dark.ExpectedWixMessages.Add(new WixMessage(144, string.Format("The extension '{0}' could not be loaded.", WixTests.BasicProductWxs), WixMessage.MessageTypeEnum.Error));
              dark.ExpectedExitCode = 144;
              dark.Run();
--- 48,52 ----
              dark.InputFile = Path.Combine(WixTests.SharedBaselinesDirectory, @"MSIs\BasicProduct.msi");
              dark.Extensions.Add(WixTests.BasicProductWxs);
!             dark.ExpectedWixMessages.Add(new WixMessage(144, string.Format("The extension '{0}' could not be loaded because of the following reason: Could not load file or assembly 'file:///{1}\\test\\data\\SharedData\\Authoring\\BasicProduct.wxs' or one of its dependencies. The module was expected to contain an assembly manifest.", WixTests.BasicProductWxs,Environment .GetEnvironmentVariable("WIX_ROOT")), WixMessage.MessageTypeEnum.Error));
              dark.ExpectedExitCode = 144;
              dark.Run();