mirror/FileFlowsPlugins
1
0
Fork 0
mirror of https://github.com/revenz/FileFlowsPlugins.git synced 2026-05-20 07:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity

FF-1737: Fixed bug in matches

Browse Source
This commit is contained in:
John Andrews
2024-08-20 10:10:33 +12:00
parent 555f3d9044
commit 16cfe5313e
4 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BasicNodes/Functions/Matches.cs
+1 -1
View File
@@ -78,7 +78,7 @@ public class Matches : Node
return output;
}
if (args.StringHelper.Matches(match.Value, match.Value))
if (args.StringHelper.Matches(strValue, match.Value))
return output;
if (args.MathHelper.IsMathOperation(match.Value))
BasicNodes/Tests/MatchesTests.cs
+29 -22
View File
@@ -25,6 +25,26 @@ public class MatchesTests : TestBase
var result = ele.Execute(args);
Assert.AreEqual(2, result);
}
[TestMethod]
public void Matches_MathFailString()
{
Matches ele = new ();
ele.MatchConditions = new()
{
new("{file.Size}", "<=100KB"),
new("{file.Size}", ">100KB"),
new("{file.Size}", ">10MB"),
};
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Size"] = "Some String"; // 120KB
var result = ele.Execute(args);
Assert.AreEqual(4, result);
}
[TestMethod]
public void Matches_EqualsOne()
{
@@ -53,26 +73,24 @@ public class MatchesTests : TestBase
[TestMethod]
public void Matches_String()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
new("{file.Name}", "triggerthis"),
new("{file.Name}", "nopetriggerthis"),
new("{file.Name}", "DontTriggerThis"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Name"] = "TriggerThis";
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(3, result);
}
[TestMethod]
public void Matches_NoMatch()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
@@ -80,19 +98,17 @@ public class MatchesTests : TestBase
new("{file.Name}", "DontTriggerThis"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Name"] = "Nothing";
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(4, result);
}
[TestMethod]
public void Matches_Regex()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
@@ -100,19 +116,17 @@ public class MatchesTests : TestBase
new("{file.Name}", ".*batman.*"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Name"] = "Superman vs Batman (2017)";
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(2, result);
}
[TestMethod]
public void Matches_True()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
@@ -120,12 +134,11 @@ public class MatchesTests : TestBase
new("{file.Deleted}", "true"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Deleted"] = true;
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(2, result);
}
@@ -133,7 +146,6 @@ public class MatchesTests : TestBase
[TestMethod]
public void Matches_True_1()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
@@ -141,19 +153,17 @@ public class MatchesTests : TestBase
new("{file.Deleted}", "true"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Deleted"] = 1;
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(2, result);
}
[TestMethod]
public void Matches_False()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
@@ -161,12 +171,11 @@ public class MatchesTests : TestBase
new("{file.Deleted}", "false"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Deleted"] = false;
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(2, result);
}
@@ -174,7 +183,6 @@ public class MatchesTests : TestBase
[TestMethod]
public void Matches_False_0()
{
var logger = new TestLogger();
Matches ele = new ();
ele.MatchConditions = new()
{
@@ -182,12 +190,11 @@ public class MatchesTests : TestBase
new("{file.Deleted}", "false"),
new("{file.Name}", "TriggerThis"),
};
var args = new FileFlows.Plugin.NodeParameters(null, logger,
var args = new FileFlows.Plugin.NodeParameters(null, Logger,
false, string.Empty, new LocalFileService());
args.Variables["file.Deleted"] = 0;
var result = ele.Execute(args);
var log = logger.ToString();
Assert.AreEqual(2, result);
}
}
FileFlows.Plugin.dll
BIN
View File
Binary file not shown.
FileFlows.Plugin.pdb
BIN
View File
Binary file not shown.