Skip to content

Commit 0179067

Browse files
author
Christine Zhou
committed
Added test for generated logs
1 parent db51c8e commit 0179067

File tree

9 files changed

+263
-10
lines changed

9 files changed

+263
-10
lines changed

‎Src/PChecker/CheckerCore/SystematicTesting/TestingEngine.cs

+1-4
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,7 @@ public override void Write(Utf8JsonWriter writer, Encoding value, JsonSerializer
165165
/// A guard for printing info.
166166
/// </summary>
167167
private int PrintGuard;
168-
169-
private StreamWriter TimelineFileStream;
170-
168+
171169

172170
/// <summary>
173171
/// Creates a new systematic testing engine.
@@ -272,7 +270,6 @@ private TestingEngine(CheckerConfiguration checkerConfiguration, TestMethodInfo
272270

273271
CancellationTokenSource = new CancellationTokenSource();
274272
PrintGuard = 1;
275-
TimelineFileStream = new StreamWriter(checkerConfiguration.OutputDirectory + "timeline.txt");
276273
// Initialize a new instance of JsonVerboseLogs if running in verbose mode.
277274
if (checkerConfiguration.IsVerbose)
278275
{

‎Src/PCompiler/PCommandLine/Options/PCheckerOptions.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace Plang.Options
1313
{
14-
internal sealed class PCheckerOptions
14+
public sealed class PCheckerOptions
1515
{
1616
/// <summary>
1717
/// The command line parser to use.
@@ -21,7 +21,7 @@ internal sealed class PCheckerOptions
2121
/// <summary>
2222
/// Initializes a new instance of the <see cref="PCheckerOptions"/> class.
2323
/// </summary>
24-
internal PCheckerOptions()
24+
public PCheckerOptions()
2525
{
2626
Parser = new CommandLineArgumentParser("p check",
2727
"The P checker enables systematic exploration of a specified P test case, it generates " +
@@ -87,7 +87,7 @@ internal PCheckerOptions()
8787
/// Parses the command line options and returns a checkerConfiguration.
8888
/// </summary>
8989
/// <returns>The CheckerConfiguration object populated with the parsed command line options.</returns>
90-
internal CheckerConfiguration Parse(string[] args)
90+
public CheckerConfiguration Parse(string[] args)
9191
{
9292
var configuration = CheckerConfiguration.Create();
9393
try

‎Tst/CorrectLogs/bugs2/Main.coverage.txt

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
Total event coverage: 100.0%
2+
============================
3+
StateMachine: Main
4+
==================
5+
Event coverage: 100.0%
6+
7+
State: S
8+
State event coverage: 100.0%
9+
Events received: x
10+
Events sent: a, x
11+

‎Tst/CorrectLogs/bugs2/trace_0_0.trace.json

+103
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
[
2+
{
3+
"type": "CreateStateMachine",
4+
"details": {
5+
"log": "Main(1) was created by task \u00272\u0027.",
6+
"id": "Main(1)",
7+
"payload": "null",
8+
"clock": {
9+
"Main(1)": 1
10+
}
11+
}
12+
},
13+
{
14+
"type": "StateTransition",
15+
"details": {
16+
"log": "Main(1) enters state \u0027S\u0027.",
17+
"id": "Main(1)",
18+
"state": "S",
19+
"payload": "null",
20+
"isEntry": true,
21+
"clock": {
22+
"Main(1)": 2
23+
}
24+
}
25+
},
26+
{
27+
"type": "RaiseEvent",
28+
"details": {
29+
"log": "\u0027Main(1)\u0027 raised event \u0027x with payload (\u003Ca,3,\u003E)\u0027 in state \u0027S\u0027.",
30+
"id": "Main(1)",
31+
"event": "x",
32+
"state": "S",
33+
"payload": {
34+
"0": {},
35+
"1": {}
36+
},
37+
"clock": {
38+
"Main(1)": 3
39+
}
40+
}
41+
},
42+
{
43+
"type": "RaiseEvent",
44+
"details": {
45+
"log": "\u0027Main(1)\u0027 raised event \u0027a with payload (3)\u0027 in state \u0027S\u0027.",
46+
"id": "Main(1)",
47+
"event": "a",
48+
"state": "S",
49+
"payload": 3,
50+
"clock": {
51+
"Main(1)": 4
52+
}
53+
}
54+
},
55+
{
56+
"type": "StateTransition",
57+
"details": {
58+
"log": "Main(1) exits state \u0027S\u0027.",
59+
"id": "Main(1)",
60+
"state": "S",
61+
"payload": "null",
62+
"isEntry": false,
63+
"clock": {
64+
"Main(1)": 5
65+
}
66+
}
67+
},
68+
{
69+
"type": "PopStateUnhandledEvent",
70+
"details": {
71+
"log": "Main(1) popped state S due to unhandled event \u0027a\u0027.",
72+
"id": "Main(1)",
73+
"event": "a",
74+
"state": "S",
75+
"payload": "null",
76+
"clock": {
77+
"Main(1)": 6
78+
}
79+
}
80+
},
81+
{
82+
"type": "ExceptionThrown",
83+
"details": {
84+
"log": "Main(1) running action \u0027\u0027 in state \u0027S\u0027 threw exception \u0027UnhandledEventException\u0027.",
85+
"id": "Main(1)",
86+
"state": "S",
87+
"payload": "null",
88+
"action": "",
89+
"exception": "UnhandledEventException",
90+
"clock": {
91+
"Main(1)": 7
92+
}
93+
}
94+
},
95+
{
96+
"type": "AssertionFailure",
97+
"details": {
98+
"log": "Main(1) received event \u0027PImplementation.a\u0027 that cannot be handled.",
99+
"error": "Main(1) received event \u0027PImplementation.a\u0027 that cannot be handled.",
100+
"payload": "null"
101+
}
102+
}
103+
]

‎Tst/CorrectLogs/bugs2/trace_0_0.txt

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<TestLog> Running test 'DefaultImpl'.
2+
<CreateLog> Main(1) was created by task '2'.
3+
<StateLog> Main(1) enters state 'S'.
4+
<RaiseLog> 'Main(1)' raised event 'x with payload (<a,3,>)' in state 'S'.
5+
<RaiseLog> 'Main(1)' raised event 'a with payload (3)' in state 'S'.
6+
<StateLog> Main(1) exits state 'S'.
7+
<PopLog> Main(1) popped state S due to unhandled event 'a'.
8+
<ExceptionLog> Main(1) running action '' in state 'S' threw exception 'UnhandledEventException'.
9+
<ErrorLog> Main(1) received event 'PImplementation.a' that cannot be handled.
10+
<StrategyLog> Found bug using 'random' strategy.
11+
<StrategyLog> Checking statistics:
12+
<StrategyLog> Found 1 bug.
13+
<StrategyLog> Scheduling statistics:
14+
<StrategyLog> Explored 1 schedule
15+
<StrategyLog> Explored 1 timeline
16+
<StrategyLog> Found 100.00% buggy schedules.
17+
<StrategyLog> Number of scheduling points in terminating schedules: 2 (min), 2 (avg), 2 (max).

‎Tst/UnitTests/PCheckerLogGeneratorTests.cs

+124
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,124 @@
1+
using System;
2+
using System.IO;
3+
using System.Linq;
4+
using Newtonsoft.Json.Linq;
5+
using NUnit.Framework;
6+
using PChecker;
7+
using UnitTests.Core;
8+
using UnitTests.Runners;
9+
using Plang.Options;
10+
namespace UnitTests;
11+
12+
[TestFixture]
13+
[Parallelizable(ParallelScope.Children)]
14+
public class PCheckerLogGeneratorTests
15+
{
16+
[Test]
17+
public void TestLogGenerator()
18+
{
19+
var tempDir = Directory.CreateDirectory(Path.Combine(Constants.ScratchParentDirectory, "TestLogGenerator"));
20+
var srcPath = new FileInfo(Path.Combine(Constants.SolutionDirectory, "Tst", "RegressionTests",
21+
"Feature1SMLevelDecls", "DynamicError", "bug2", "bug2.p"));
22+
var dllPath = Path.Combine(Constants.ScratchParentDirectory, "TestLogGenerator", "CSharp", "net8.0", "Main.dll");
23+
var expectedPath = Path.Combine(Constants.SolutionDirectory, "Tst", "CorrectLogs", "bugs2");
24+
25+
var runner = new PCheckerRunner([srcPath]);
26+
runner.DoCompile(tempDir);
27+
28+
var configuration = new PCheckerOptions().Parse([dllPath, "-o", tempDir.ToString()]);
29+
Checker.Run(configuration);
30+
31+
AssertLog(tempDir+"/BugFinding", expectedPath);
32+
TestAssertions.SafeDeleteDirectory(tempDir);
33+
}
34+
35+
private void AssertLog(string generatedDir, string expectedDir)
36+
{
37+
if (!Directory.Exists(generatedDir) || !Directory.Exists(expectedDir))
38+
{
39+
Assert.Fail("One or both directories do not exist.");
40+
}
41+
42+
var generatedFiles = Directory.GetFiles(generatedDir).Select(Path.GetFileName).ToHashSet();
43+
var expectedFiles = Directory.GetFiles(expectedDir).Select(Path.GetFileName).ToHashSet();
44+
45+
foreach (var fileName in expectedFiles.Intersect(generatedFiles))
46+
{
47+
string generatedFilePath = Path.Combine(generatedDir, fileName);
48+
string expectedFilePath = Path.Combine(expectedDir, fileName);
49+
50+
if (fileName == "trace_0_0.trace.json")
51+
{
52+
// Perform "Is JSON Included" check for this specific file
53+
if (!IsJsonContentIncluded(generatedFilePath, expectedFilePath))
54+
{
55+
Assert.Fail($"Test Failed \nContent of {expectedFilePath} is not fully included in {generatedFilePath}");
56+
}
57+
}
58+
else
59+
{
60+
// Perform exact match for other files
61+
if (!File.ReadAllBytes(generatedFilePath).SequenceEqual(File.ReadAllBytes(expectedFilePath)))
62+
{
63+
Assert.Fail($"Test Failed \nFiles differ: {fileName}\nGenerated File: {generatedFilePath}\nExpected File: {expectedFilePath}");
64+
}
65+
}
66+
}
67+
68+
// Check for missing files in generatedDir
69+
foreach (var file in expectedFiles.Except(generatedFiles))
70+
{
71+
Assert.Fail($"Test Failed \nMissing expected file in {generatedDir}: {file}");
72+
}
73+
}
74+
75+
private static bool IsJsonContentIncluded(string generatedFilePath, string expectedFilePath)
76+
{
77+
var generatedJson = JToken.Parse(File.ReadAllText(generatedFilePath));
78+
var expectedJson = JToken.Parse(File.ReadAllText(expectedFilePath));
79+
80+
return IsSubset(expectedJson, generatedJson);
81+
}
82+
83+
private static bool IsSubset(JToken subset, JToken superset)
84+
{
85+
if (JToken.DeepEquals(subset, superset))
86+
{
87+
return true;
88+
}
89+
90+
if (subset.Type == JTokenType.Object && superset.Type == JTokenType.Object)
91+
{
92+
var subsetObj = (JObject)subset;
93+
var supersetObj = (JObject)superset;
94+
95+
foreach (var property in subsetObj.Properties())
96+
{
97+
if (!supersetObj.TryGetValue(property.Name, out var supersetValue) || !IsSubset(property.Value, supersetValue))
98+
{
99+
return false;
100+
}
101+
}
102+
103+
return true;
104+
}
105+
106+
if (subset.Type == JTokenType.Array && superset.Type == JTokenType.Array)
107+
{
108+
var subsetArray = (JArray)subset;
109+
var supersetArray = (JArray)superset;
110+
111+
foreach (var subsetItem in subsetArray)
112+
{
113+
if (!supersetArray.Any(supersetItem => IsSubset(subsetItem, supersetItem)))
114+
{
115+
return false;
116+
}
117+
}
118+
119+
return true;
120+
}
121+
122+
return false;
123+
}
124+
}

‎Tst/UnitTests/Runners/PCheckerRunner.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ private int RunPChecker(string directory, string dllPath, out string stdout, out
155155
return ProcessHelper.RunWithOutput(directory, out stdout, out stderr, "dotnet", dllPath);
156156
}
157157

158-
private int DoCompile(DirectoryInfo scratchDirectory)
158+
public int DoCompile(DirectoryInfo scratchDirectory)
159159
{
160160
var compiler = new Compiler();
161161
var outputStream = new TestExecutionStream(scratchDirectory);

‎Tst/UnitTests/TestAssertions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ public static void AssertTestCase(CompilerTestCase testCase)
2222
// Delete ONLY if inside the solution directory
2323
SafeDeleteDirectory(testCase.ScratchDirectory);
2424
}
25-
26-
private static void SafeDeleteDirectory(DirectoryInfo toDelete)
25+
26+
public static void SafeDeleteDirectory(DirectoryInfo toDelete)
2727
{
2828
var safeBase = new DirectoryInfo(Constants.SolutionDirectory);
2929
for (var scratch = toDelete; scratch.Parent != null; scratch = scratch.Parent)

‎Tst/UnitTests/UnitTests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,6 @@
1616
<ItemGroup>
1717
<ProjectReference Include="..\..\Src\PChecker\CheckerCore\CheckerCore.csproj" />
1818
<ProjectReference Include="..\..\Src\PCompiler\CompilerCore\CompilerCore.csproj" />
19+
<ProjectReference Include="..\..\Src\PCompiler\PCommandLine\PCommandLine.csproj" />
1920
</ItemGroup>
2021
</Project>

0 commit comments

Comments
 (0)