← Back to team overview

nunit-core team mailing list archive

[Merge] lp:~charlie.poole/nunit-3.0/bug-fix-440109 into lp:nunit-3.0

 

Charlie Poole has proposed merging lp:~charlie.poole/nunit-3.0/bug-fix-440109 into lp:nunit-3.0.

    Requested reviews:
    NUnit Developers (nunit-dev)
Related bugs:
  #440109 Full Framework does not support "Contains"
  https://bugs.launchpad.net/bugs/440109


Adds Contains.Substring and Contains.Item too the syntax.
-- 
https://code.launchpad.net/~charlie.poole/nunit-3.0/bug-fix-440109/+merge/13182
Your team NUnit Developers is subscribed to branch lp:nunit-3.0.
=== modified file 'nunit.build'
--- nunit.build	2009-09-22 01:07:21 +0000
+++ nunit.build	2009-10-11 05:25:20 +0000
@@ -173,6 +173,7 @@
       <arg value="-syntax:SyntaxElements.txt"/>
       <arg value="Shared/Framework/Is.cs"/>
       <arg value="Shared/Framework/Has.cs"/>
+      <arg value="Shared/Framework/Contains.cs"/>
       <arg value="NUnit/Framework/Text.cs"/>
       <arg value="Shared/Framework/Throws.cs"/>
       <arg value="Shared/Framework/Constraints/ConstraintFactory.cs"/>

=== modified file 'solutions/vs2005/framework/nunit.framework.csproj'
--- solutions/vs2005/framework/nunit.framework.csproj	2009-09-22 01:07:21 +0000
+++ solutions/vs2005/framework/nunit.framework.csproj	2009-10-11 05:25:20 +0000
@@ -270,6 +270,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Constraints\XmlSerializableConstraint.cs">
       <Link>Shared\Framework\Constraints\XmlSerializableConstraint.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\framework\Shared\Framework\Contains.cs">
+      <Link>Shared\Framework\Contains.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\framework\Shared\Framework\DescriptionAttribute.cs">
       <Link>Shared\Framework\DescriptionAttribute.cs</Link>
     </Compile>
@@ -330,6 +333,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Throws.cs">
       <Link>Shared\Framework\Throws.cs</Link>
     </Compile>
+    <None Include="..\..\..\src\framework\Templates\Contains.template.cs">
+      <Link>Templates\Contains.template.cs</Link>
+    </None>
     <None Include="..\..\..\src\framework\Templates\Assert.template.cs">
       <Link>Templates\Assert.template.cs</Link>
     </None>

=== modified file 'solutions/vs2005/nunitlite/nunitlite.csproj'
--- solutions/vs2005/nunitlite/nunitlite.csproj	2009-09-21 07:59:17 +0000
+++ solutions/vs2005/nunitlite/nunitlite.csproj	2009-10-11 05:25:20 +0000
@@ -45,9 +45,6 @@
     <Compile Include="..\..\..\src\framework\Env.cs">
       <Link>Env.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\src\framework\NUnitLite\Framework\Contains.cs">
-      <Link>NUnitLite\Framework\Contains.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\src\framework\NUnitLite\ITest.cs">
       <Link>NUnitLite\ITest.cs</Link>
     </Compile>
@@ -222,6 +219,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Constraints\XmlSerializableConstraint.cs">
       <Link>Shared\Framework\Constraints\XmlSerializableConstraint.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\framework\Shared\Framework\Contains.cs">
+      <Link>Shared\Framework\Contains.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\framework\Shared\Framework\DescriptionAttribute.cs">
       <Link>Shared\Framework\DescriptionAttribute.cs</Link>
     </Compile>
@@ -282,6 +282,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Throws.cs">
       <Link>Shared\Framework\Throws.cs</Link>
     </Compile>
+    <None Include="..\..\..\src\framework\Templates\Contains.template.cs">
+      <Link>Templates\Contains.template.cs</Link>
+    </None>
     <None Include="..\..\..\src\framework\Templates\Assert.template.cs">
       <Link>Templates\Assert.template.cs</Link>
     </None>

=== modified file 'solutions/vs2005_CF/nunitlite/nunitlite.csproj'
--- solutions/vs2005_CF/nunitlite/nunitlite.csproj	2009-09-22 01:07:21 +0000
+++ solutions/vs2005_CF/nunitlite/nunitlite.csproj	2009-10-11 05:25:20 +0000
@@ -59,9 +59,6 @@
     <Compile Include="..\..\..\src\framework\Env.cs">
       <Link>Env.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\src\framework\NUnitLite\Framework\Contains.cs">
-      <Link>NUnitLite\Framework\Contains.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\src\framework\NUnitLite\ITest.cs">
       <Link>NUnitLite\ITest.cs</Link>
     </Compile>
@@ -236,6 +233,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Constraints\XmlSerializableConstraint.cs">
       <Link>Shared\Framework\Constraints\XmlSerializableConstraint.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\framework\Shared\Framework\Contains.cs">
+      <Link>Shared\Framework\Contains.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\framework\Shared\Framework\DescriptionAttribute.cs">
       <Link>Shared\Framework\DescriptionAttribute.cs</Link>
     </Compile>
@@ -296,6 +296,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Throws.cs">
       <Link>Shared\Framework\Throws.cs</Link>
     </Compile>
+    <None Include="..\..\..\src\framework\Templates\Contains.template.cs">
+      <Link>Templates\Contains.template.cs</Link>
+    </None>
     <None Include="..\..\..\src\framework\Templates\Assert.template.cs">
       <Link>Templates\Assert.template.cs</Link>
     </None>

=== modified file 'solutions/vs2008/framework/nunit.framework.csproj'
--- solutions/vs2008/framework/nunit.framework.csproj	2009-09-22 01:07:21 +0000
+++ solutions/vs2008/framework/nunit.framework.csproj	2009-10-11 05:25:20 +0000
@@ -99,6 +99,9 @@
     <Compile Include="..\..\..\src\framework\NUnit\Framework\InconclusiveException.cs">
       <Link>NUnit\Framework\InconclusiveException.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\framework\Shared\Framework\Contains.cs">
+      <Link>Shared\Framework\Contains.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\framework\Shared\Framework\ITestCaseData.cs">
       <Link>Shared\Framework\ITestCaseData.cs</Link>
     </Compile>
@@ -339,6 +342,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Throws.cs">
       <Link>Shared\Framework\Throws.cs</Link>
     </Compile>
+    <None Include="..\..\..\src\framework\Templates\Contains.template.cs">
+      <Link>Templates\Contains.template.cs</Link>
+    </None>
     <None Include="..\..\..\src\framework\Templates\Assert.template.cs">
       <Link>Templates\Assert.template.cs</Link>
     </None>
@@ -366,6 +372,7 @@
     <Reference Include="System.Core">
       <RequiredTargetFramework>3.5</RequiredTargetFramework>
     </Reference>
+    <Reference Include="System.Data" />
     <Reference Include="System.XML" />
   </ItemGroup>
   <ItemGroup>

=== modified file 'solutions/vs2008/nunitlite/nunitlite.csproj'
--- solutions/vs2008/nunitlite/nunitlite.csproj	2009-09-22 01:07:21 +0000
+++ solutions/vs2008/nunitlite/nunitlite.csproj	2009-10-11 05:25:20 +0000
@@ -49,9 +49,6 @@
     <Compile Include="..\..\..\src\framework\Env.cs">
       <Link>Env.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\src\framework\NUnitLite\Framework\Contains.cs">
-      <Link>NUnitLite\Framework\Contains.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\src\framework\NUnitLite\ITest.cs">
       <Link>NUnitLite\ITest.cs</Link>
     </Compile>
@@ -226,6 +223,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Constraints\XmlSerializableConstraint.cs">
       <Link>Shared\Framework\Constraints\XmlSerializableConstraint.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\framework\Shared\Framework\Contains.cs">
+      <Link>Shared\Contains.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\framework\Shared\Framework\DescriptionAttribute.cs">
       <Link>Shared\Framework\DescriptionAttribute.cs</Link>
     </Compile>
@@ -286,6 +286,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Throws.cs">
       <Link>Shared\Framework\Throws.cs</Link>
     </Compile>
+    <None Include="..\..\..\src\framework\Templates\Contains.template.cs">
+      <Link>Templates\Contains.template.cs</Link>
+    </None>
     <None Include="..\..\..\src\framework\Templates\Assert.template.cs">
       <Link>Templates\Assert.template.cs</Link>
     </None>

=== modified file 'solutions/vs2008_CF/nunitlite/nunitlite.csproj'
--- solutions/vs2008_CF/nunitlite/nunitlite.csproj	2009-09-22 01:07:21 +0000
+++ solutions/vs2008_CF/nunitlite/nunitlite.csproj	2009-10-11 05:25:20 +0000
@@ -62,9 +62,6 @@
     <Compile Include="..\..\..\src\framework\Env.cs">
       <Link>Env.cs</Link>
     </Compile>
-    <Compile Include="..\..\..\src\framework\NUnitLite\Framework\Contains.cs">
-      <Link>NUnitLite\Framework\Contains.cs</Link>
-    </Compile>
     <Compile Include="..\..\..\src\framework\NUnitLite\ITest.cs">
       <Link>NUnitLite\ITest.cs</Link>
     </Compile>
@@ -239,6 +236,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Constraints\XmlSerializableConstraint.cs">
       <Link>Shared\Framework\Constraints\XmlSerializableConstraint.cs</Link>
     </Compile>
+    <Compile Include="..\..\..\src\framework\Shared\Framework\Contains.cs">
+      <Link>Shared\Framework\Contains.cs</Link>
+    </Compile>
     <Compile Include="..\..\..\src\framework\Shared\Framework\DescriptionAttribute.cs">
       <Link>Shared\Framework\DescriptionAttribute.cs</Link>
     </Compile>
@@ -299,6 +299,9 @@
     <Compile Include="..\..\..\src\framework\Shared\Framework\Throws.cs">
       <Link>Shared\Framework\Throws.cs</Link>
     </Compile>
+    <None Include="..\..\..\src\framework\Templates\Contains.template.cs">
+      <Link>Templates\Contains.template.cs</Link>
+    </None>
     <None Include="..\..\..\src\framework\Templates\Assert.template.cs">
       <Link>Templates\Assert.template.cs</Link>
     </None>

=== modified file 'src/framework/NUnit/Framework/Text.cs'
--- src/framework/NUnit/Framework/Text.cs	2009-09-28 06:21:18 +0000
+++ src/framework/NUnit/Framework/Text.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== modified file 'src/framework/Shared/Framework/Assert.cs'
--- src/framework/Shared/Framework/Assert.cs	2009-09-28 06:21:18 +0000
+++ src/framework/Shared/Framework/Assert.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintExpression.cs'
--- src/framework/Shared/Framework/Constraints/ConstraintExpression.cs	2009-09-28 06:21:18 +0000
+++ src/framework/Shared/Framework/Constraints/ConstraintExpression.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== modified file 'src/framework/Shared/Framework/Constraints/ConstraintFactory.cs'
--- src/framework/Shared/Framework/Constraints/ConstraintFactory.cs	2009-09-28 06:21:18 +0000
+++ src/framework/Shared/Framework/Constraints/ConstraintFactory.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== renamed file 'src/framework/NUnitLite/Framework/Contains.cs' => 'src/framework/Shared/Framework/Contains.cs'
--- src/framework/NUnitLite/Framework/Contains.cs	2009-09-12 03:41:51 +0000
+++ src/framework/Shared/Framework/Contains.cs	2009-10-11 05:25:21 +0000
@@ -1,8 +1,33 @@
-// *****************************************************
-// Copyright 2009, Charlie Poole
-//
-// Licensed under the Open Software License version 3.0
-// *****************************************************
+// ***********************************************************************
+// Copyright (c) 2009 Charlie Poole
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+// ***********************************************************************
+
+// ****************************************************************
+//              Generated by the NUnit Syntax Generator
+//
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// 
+//                  DO NOT MODIFY THIS FILE DIRECTLY
+// ****************************************************************
 
 using System;
 using System.Collections;
@@ -11,28 +36,36 @@
 namespace NUnit.Framework
 {
     /// <summary>
-    /// Static helper class used in the constraint-based syntax
+    /// Helper class with properties and methods that supply
+    /// a number of constraints used in Asserts.
     /// </summary>
     public class Contains
     {
-        /// <summary>
-        /// Creates a new SubstringConstraint
-        /// </summary>
-        /// <param name="substring">The value of the substring</param>
-        /// <returns>A SubstringConstraint</returns>
-        public static Constraint Substring(string substring)
-        {
-            return new SubstringConstraint(substring);
-        }
-
-        /// <summary>
-        /// Creates a new CollectionContainsConstraint.
-        /// </summary>
-        /// <param name="item">The item that should be found.</param>
-        /// <returns>A new CollectionContainsConstraint</returns>
-        public static Constraint Item(object item)
-        {
-            return new CollectionContainsConstraint(item);
-        }
+        #region Item
+
+        /// <summary>
+        /// Returns a new CollectionContainsConstraint checking for the
+        /// presence of a particular object in the collection.
+        /// </summary>
+        public static CollectionContainsConstraint Item(object expected)
+        {
+            return new CollectionContainsConstraint(expected);
+        }
+
+        #endregion
+
+        #region Substring
+
+        /// <summary>
+        /// Returns a constraint that succeeds if the actual
+        /// value contains the substring supplied as an argument.
+        /// </summary>
+        public static SubstringConstraint Substring(string expected)
+        {
+            return new SubstringConstraint(expected);;
+        }
+
+        #endregion
+
     }
 }

=== modified file 'src/framework/Shared/Framework/Has.cs'
--- src/framework/Shared/Framework/Has.cs	2009-09-28 06:21:18 +0000
+++ src/framework/Shared/Framework/Has.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== modified file 'src/framework/Shared/Framework/Is.cs'
--- src/framework/Shared/Framework/Is.cs	2009-09-28 06:21:18 +0000
+++ src/framework/Shared/Framework/Is.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== modified file 'src/framework/Shared/Framework/Throws.cs'
--- src/framework/Shared/Framework/Throws.cs	2009-09-28 06:21:18 +0000
+++ src/framework/Shared/Framework/Throws.cs	2009-10-11 05:25:21 +0000
@@ -24,7 +24,7 @@
 // ****************************************************************
 //              Generated by the NUnit Syntax Generator
 //
-// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
+// Command Line: GenSyntax.exe -syntax:SyntaxElements.txt Shared/Framework/Is.cs Shared/Framework/Has.cs Shared/Framework/Contains.cs NUnit/Framework/Text.cs Shared/Framework/Throws.cs Shared/Framework/Constraints/ConstraintFactory.cs Shared/Framework/Constraints/ConstraintExpression.cs Shared/Framework/Assert.cs
 // 
 //                  DO NOT MODIFY THIS FILE DIRECTLY
 // ****************************************************************

=== modified file 'src/framework/SyntaxElements.txt'
--- src/framework/SyntaxElements.txt	2009-09-20 01:18:07 +0000
+++ src/framework/SyntaxElements.txt	2009-10-11 05:25:21 +0000
@@ -401,6 +401,7 @@
 /// presence of a particular object in the collection.
 /// </summary>
 Gen3: Has.Member(object expected)=>new CollectionContainsConstraint(expected)
+Gen: Contains.Item(object expected)=>new CollectionContainsConstraint(expected)
 Gen: ConstraintFactory.Contains(object expected)=>new CollectionContainsConstraint(expected)
 Gen: ConstraintExpression.Contains(object expected)=>(CollectionContainsConstraint)this.Append(new CollectionContainsConstraint(expected))
 %
@@ -423,6 +424,7 @@
 Type: SubstringConstraint
 Gen3: Is.StringContaining(string expected)=>new SubstringConstraint(expected)
 Gen: [Obsolete("Use Is.StringContaining")]Text.Contains(string expected)=>new SubstringConstraint(expected)
+Gen: Contains.Substring(string expected)=>new SubstringConstraint(expected);
 Gen: ConstraintFactory.ContainsSubstring(string expected)=>new SubstringConstraint(expected)
 Gen: ConstraintExpression.ContainsSubstring(string expected)=>(SubstringConstraint)this.Append(new SubstringConstraint(expected))
 %


Follow ups