Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/BenchmarkDotNet/Characteristics/CharacteristicObject.cs
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,12 @@ protected CharacteristicObject UnfreezeCopyCore()
var newRoot = (CharacteristicObject)Activator.CreateInstance(GetType());
newRoot.ApplyCore(this);

// Preserve the IdCharacteristic of the original object
if (this.HasValue(IdCharacteristic))
{
newRoot.SetValue(IdCharacteristic, this.GetValue(IdCharacteristic));
}

return newRoot;
}
#endregion
Expand Down
2 changes: 1 addition & 1 deletion tests/BenchmarkDotNet.Tests/ConfigParserTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@ public void UserCanSpecifyMultipleCoreRunPaths()
Assert.Equal(2, jobs.Length);
Assert.Single(jobs.Where(job => job.GetToolchain() is CoreRunToolchain toolchain && toolchain.SourceCoreRun.FullName == fakeCoreRunPath_1));
Assert.Single(jobs.Where(job => job.GetToolchain() is CoreRunToolchain toolchain && toolchain.SourceCoreRun.FullName == fakeCoreRunPath_2));
Assert.Equal(2, jobs.Select(job => job.Id).Distinct().Count()); // each job must have a unique ID

}

[Fact]
Expand Down
44 changes: 29 additions & 15 deletions tests/BenchmarkDotNet.Tests/Configs/JobTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,11 @@ public static void Test01Create()
Assert.False(j.Environment.Gc.AllowVeryLargeObjects);
Assert.Equal(Platform.AnyCpu, j.Environment.Platform);
Assert.Equal(RunStrategy.Throughput, j.Run.RunStrategy); // set by default
Assert.Equal("Default", j.Id); // id reset
Assert.True(j.DisplayInfo == "DefaultJob", "DisplayInfo = " + j.DisplayInfo);
Assert.True(j.ResolvedId == "DefaultJob", "ResolvedId = " + j.ResolvedId);
Assert.Equal("CustomId", j.Id); // id remains after unfreeze
Assert.Equal("CustomId", j.DisplayInfo);
Assert.Equal("CustomId", j.ResolvedId);
Assert.Equal(j.ResolvedId, j.FolderInfo);
Assert.Equal("Default", j.Environment.Id);
Assert.Equal("CustomId", j.Environment.Id); // id remains after unfreeze

// new job
j = new Job(j.Freeze());
Expand Down Expand Up @@ -160,7 +160,7 @@ public static void Test02Modify()
// 4. Freeze-unfreeze:
j = j.Freeze().UnfreezeCopy();

Assert.Equal("Platform=X86, LaunchCount=1", j.Id);
Assert.Equal("SomeId", j.Id); // id not lost
Assert.Equal(Platform.X86, j.Environment.Platform);
Assert.Equal(1, j.Run.LaunchCount);

Expand Down Expand Up @@ -204,15 +204,15 @@ public static void Test03IdDoesNotFlow()
Assert.False(j.HasValue(CharacteristicObject.IdCharacteristic));
Assert.False(j.Environment.HasValue(CharacteristicObject.IdCharacteristic));

Job.EnvironmentCharacteristic[j] = EnvironmentMode.LegacyJitX86.UnfreezeCopy(); // id will not flow
Assert.False(j.HasValue(CharacteristicObject.IdCharacteristic));
Assert.False(j.Environment.HasValue(CharacteristicObject.IdCharacteristic));
Job.EnvironmentCharacteristic[j] = EnvironmentMode.LegacyJitX86.UnfreezeCopy(); // id will flow
Assert.True(j.HasValue(CharacteristicObject.IdCharacteristic));
Assert.True(j.Environment.HasValue(CharacteristicObject.IdCharacteristic));

var c = new CharacteristicSet(EnvironmentMode.LegacyJitX64, RunMode.Long); // id will not flow, new CharacteristicSet
Assert.False(c.HasValue(CharacteristicObject.IdCharacteristic));

Job.EnvironmentCharacteristic[c] = EnvironmentMode.LegacyJitX86.UnfreezeCopy(); // id will not flow
Assert.False(c.HasValue(CharacteristicObject.IdCharacteristic));
Job.EnvironmentCharacteristic[c] = EnvironmentMode.LegacyJitX86.UnfreezeCopy(); // id will flow
Assert.True(c.HasValue(CharacteristicObject.IdCharacteristic));

CharacteristicObject.IdCharacteristic[c] = "MyId"; // id set explicitly
Assert.Equal("MyId", c.Id);
Expand All @@ -221,12 +221,12 @@ public static void Test03IdDoesNotFlow()
Assert.Equal("MyId", j.Id);
Assert.Equal("MyId", j.Environment.Id);

Job.EnvironmentCharacteristic[j] = EnvironmentMode.LegacyJitX86.UnfreezeCopy(); // id will not flow
Assert.Equal("MyId", j.Id);
Assert.Equal("MyId", j.Environment.Id);
Job.EnvironmentCharacteristic[j] = EnvironmentMode.LegacyJitX86.UnfreezeCopy();
Assert.Equal("LegacyJitX86", j.Id);
Assert.Equal("LegacyJitX86", j.Environment.Id);

j = j.WithJit(Jit.RyuJit); // custom id will flow
Assert.Equal("MyId", j.Id);
j = j.WithJit(Jit.RyuJit);
Assert.Equal("LegacyJitX86", j.Id);
}

[Fact]
Expand Down Expand Up @@ -474,6 +474,20 @@ public static void WithNuGet()
Assert.Equal(expected, j.Infrastructure.NuGetReferences); // ensure that the list's equality operator returns true when the contents are the same
}

[Fact]
public static void UnfreezeCopy_PreservesIdCharacteristic()
{
// Arrange
var original = new Job();
original.SetValue(Job.IdCharacteristic, "TestID");

// Act
var copy = original.UnfreezeCopy();

// Assert
Assert.Equal("TestID", copy.GetValue(Job.IdCharacteristic));
}

private static bool IsSubclassOfobModeOfItself(Type type)
{
Type jobModeOfT;
Expand Down