Index: test/Common/DelftTools.Utils.Tests/RegularExpressions/RegularExpressionTest.cs
===================================================================
diff -u -r8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9 -r5fc71a385897af92ccb092f2f969b5709afab85a
--- test/Common/DelftTools.Utils.Tests/RegularExpressions/RegularExpressionTest.cs (.../RegularExpressionTest.cs) (revision 8f6ae890fed8e8eae3a32f9c0498a10f82e0ddf9)
+++ test/Common/DelftTools.Utils.Tests/RegularExpressions/RegularExpressionTest.cs (.../RegularExpressionTest.cs) (revision 5fc71a385897af92ccb092f2f969b5709afab85a)
@@ -14,26 +14,26 @@
+ RegularExpression.GetFloat("b")
+ RegularExpression.GetFloat("c");
var match = RegularExpression.GetFirstMatch(pattern, source);
- Assert.AreEqual("1.8",match.Groups["a"].Value);
+ Assert.AreEqual("1.8", match.Groups["a"].Value);
Assert.AreEqual("2.2", match.Groups["b"].Value);
Assert.AreEqual("4.5", match.Groups["c"].Value);
}
-
+
[Test]
public void GetFloatOptionalIsReadWhenFound()
{
string pattern = RegularExpression.GetFloat("a")
+ RegularExpression.GetFloatOptional("b")
+ RegularExpression.GetFloat("c");
-
+
string source = "a 1.8 b 2.2 c 4.5";
-
+
var match = RegularExpression.GetFirstMatch(pattern, source);
Assert.AreEqual("1.8", match.Groups["a"].Value);
Assert.AreEqual("2.2", match.Groups["b"].Value);
Assert.AreEqual("4.5", match.Groups["c"].Value);
-
}
+
[Test]
public void GetFloatOptionalIsOptional()
{
@@ -49,7 +49,7 @@
[Test]
public void GetScientific()
{
- var p = RegularExpression.GetScientific("a");
+ var p = RegularExpression.GetScientific("a");
Assert.AreEqual("1.8", RegularExpression.GetFirstMatch(p, "a 1.8").Groups["a"].Value.Trim());
Assert.AreEqual("2.9e02", RegularExpression.GetFirstMatch(p, "a 2.9e02").Groups["a"].Value.Trim());
@@ -67,7 +67,7 @@
public void GetFloatPattern()
{
string pattern = RegularExpression.GetFloat("a");
- Assert.AreEqual(@"a\s+(?[0-9\.-]+)+\s?",pattern);
+ Assert.AreEqual(@"a\s+(?[0-9\.-]+)+\s?", pattern);
}
}
}
\ No newline at end of file