cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-28 07:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Clean up ByondResponse

Browse Source
This commit is contained in:
Jordan Dominion
2023-10-15 01:50:39 -04:00
parent 1eeba3a4b2
commit a4a3b78645
6 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Api/Models/Response/ByondResponse.cs
+3 -3
View File
@@ -3,13 +3,13 @@
namespace Tgstation.Server.Api.Models.Response
{
/// <summary>
/// Represents an installed <see cref="EngineVersion"/>.
/// Represents an installed <see cref="Internal.EngineVersion"/>.
/// </summary>
public sealed class ByondResponse
{
/// <summary>
/// The represented <see cref="EngineVersion"/>.
/// The represented <see cref="Internal.EngineVersion"/>. If <see langword="null"/> that indicates none were found.
/// </summary>
public EngineVersion? Version { get; set; }
public EngineVersion? EngineVersion { get; set; }
}
}
src/Tgstation.Server.Host/Controllers/ByondController.cs
+3 -3
View File
@@ -98,7 +98,7 @@ namespace Tgstation.Server.Host.Controllers
Json(
new ByondResponse
{
Version = instance.EngineManager.ActiveVersion,
EngineVersion = instance.EngineManager.ActiveVersion,
})));
/// <summary>
@@ -122,10 +122,10 @@ namespace Tgstation.Server.Host.Controllers
.InstalledVersions
.Select(x => new ByondResponse
{
Version = x,
EngineVersion = x,
})
.AsQueryable()
.OrderBy(x => x.Version))),
.OrderBy(x => x.EngineVersion))),
null,
page,
pageSize,
tests/Tgstation.Server.Client.Tests/TestApiClient.cs
+5 -5
View File
@@ -26,7 +26,7 @@ namespace Tgstation.Server.Client.Tests
{
var sample = new ByondResponse
{
Version = new EngineVersion
EngineVersion = new EngineVersion
{
Engine = EngineType.Byond,
Version = new Version(511, 1385)
@@ -50,9 +50,9 @@ namespace Tgstation.Server.Client.Tests
var client = new ApiClient(httpClient.Object, new Uri("http://fake.com"), new ApiHeaders(new ProductHeaderValue("fake"), "fake"), null, false);
var result = await client.Read<ByondResponse>(Routes.Byond, default);
Assert.AreEqual(sample.Version, result.Version);
Assert.AreEqual(0, result.Version.Version.Build); // sucks but we can't do better really
Assert.IsFalse(result.Version.CustomIteration.HasValue);
Assert.AreEqual(sample.EngineVersion, result.EngineVersion);
Assert.AreEqual(0, result.EngineVersion.Version.Build); // sucks but we can't do better really
Assert.IsFalse(result.EngineVersion.CustomIteration.HasValue);
}
[TestMethod]
@@ -60,7 +60,7 @@ namespace Tgstation.Server.Client.Tests
{
var sample = new ByondResponse
{
Version = new EngineVersion
EngineVersion = new EngineVersion
{
Engine = EngineType.Byond,
Version = new Version(511, 1385)
tests/Tgstation.Server.Tests/Live/Instance/ByondTest.cs
+7 -7
View File
@@ -182,8 +182,8 @@ namespace Tgstation.Server.Tests.Live.Instance
var newVersions = await byondClient.InstalledVersions(null, cancellationToken);
Assert.IsNotNull(newVersions);
Assert.AreEqual(1, newVersions.Count);
Assert.AreEqual(testVersion.Version.Semver(), newVersions[0].Version.Version.Semver());
Assert.AreEqual(1, newVersions[0].Version.CustomIteration);
Assert.AreEqual(testVersion.Version.Semver(), newVersions[0].EngineVersion.Version.Semver());
Assert.AreEqual(1, newVersions[0].EngineVersion.CustomIteration);
}
async Task TestInstallFakeVersion(CancellationToken cancellationToken)
@@ -214,8 +214,8 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.IsNotNull(test.InstallJob);
await WaitForJob(test.InstallJob, 180, false, null, cancellationToken);
var currentShit = await byondClient.ActiveVersion(cancellationToken);
Assert.AreEqual(newModel, currentShit.Version);
Assert.IsFalse(currentShit.Version.CustomIteration.HasValue);
Assert.AreEqual(newModel, currentShit.EngineVersion);
Assert.IsFalse(currentShit.EngineVersion.CustomIteration.HasValue);
var dreamMaker = "DreamMaker";
if (new PlatformIdentifier().IsWindows)
@@ -235,7 +235,7 @@ namespace Tgstation.Server.Tests.Live.Instance
var allVersionsTask = byondClient.InstalledVersions(null, cancellationToken);
var currentShit = await byondClient.ActiveVersion(cancellationToken);
Assert.IsNotNull(currentShit);
Assert.IsNull(currentShit.Version);
Assert.IsNull(currentShit.EngineVersion);
var otherShit = await allVersionsTask;
Assert.IsNotNull(otherShit);
Assert.AreEqual(0, otherShit.Count);
@@ -299,8 +299,8 @@ namespace Tgstation.Server.Tests.Live.Instance
await WaitForJob(test2.InstallJob, 30, false, null, cancellationToken);
var newSettings = await byondClient.ActiveVersion(cancellationToken);
Assert.AreEqual(new Version(testVersion.Version.Major, testVersion.Version.Minor, 0), newSettings.Version.Version);
Assert.AreEqual(2, newSettings.Version.CustomIteration);
Assert.AreEqual(new Version(testVersion.Version.Major, testVersion.Version.Minor, 0), newSettings.EngineVersion.Version);
Assert.AreEqual(2, newSettings.EngineVersion.CustomIteration);
// test a few switches
var installResponse = await byondClient.SetActiveVersion(new ByondVersionRequest
tests/Tgstation.Server.Tests/Live/Instance/InstanceTest.cs
+2 -2
View File
@@ -206,8 +206,8 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.IsNotNull(compatVersion.SourceSHA);
Assert.AreNotEqual(Limits.MaximumCommitShaLength, compatVersion.SourceSHA.Length);
var activeVersion = await instanceClient.Byond.ActiveVersion(cancellationToken);
Assert.AreEqual(Limits.MaximumCommitShaLength, activeVersion.Version.SourceSHA.Length);
Assert.AreEqual(compatVersion, activeVersion.Version);
Assert.AreEqual(Limits.MaximumCommitShaLength, activeVersion.EngineVersion.SourceSHA.Length);
Assert.AreEqual(compatVersion, activeVersion.EngineVersion);
}
var configSetupTask = new ConfigurationTest(instanceClient.Configuration, instanceClient.Metadata).SetupDMApiTests(cancellationToken);
tests/Tgstation.Server.Tests/Live/Instance/WatchdogTest.cs
+8 -8
View File
@@ -94,17 +94,17 @@ namespace Tgstation.Server.Tests.Live.Instance
Assert.AreEqual(1, list.Count);
var byondVersion = list[0];
Assert.AreEqual(1, byondVersion.Version.CustomIteration);
Assert.AreEqual(testVersion.Engine, byondVersion.Version.Engine);
Assert.AreEqual(1, byondVersion.EngineVersion.CustomIteration);
Assert.AreEqual(testVersion.Engine, byondVersion.EngineVersion.Engine);
if (testVersion.Version != null)
{
Assert.AreEqual(testVersion.Version.Major, byondVersion.Version.Version.Major);
Assert.AreEqual(testVersion.Version.Minor, byondVersion.Version.Version.Minor);
Assert.AreEqual(testVersion.Version.Major, byondVersion.EngineVersion.Version.Major);
Assert.AreEqual(testVersion.Version.Minor, byondVersion.EngineVersion.Version.Minor);
}
else
{
Assert.IsNull(byondVersion.Version.Version);
Assert.AreEqual(testVersion.SourceSHA, byondVersion.Version.SourceSHA);
Assert.IsNull(byondVersion.EngineVersion.Version);
Assert.AreEqual(testVersion.SourceSHA, byondVersion.EngineVersion.SourceSHA);
}
}
@@ -244,7 +244,7 @@ namespace Tgstation.Server.Tests.Live.Instance
var testCustomRevision = 1;
var currentByond = await instanceClient.Byond.ActiveVersion(cancellationToken);
Assert.IsNotNull(currentByond);
Assert.AreEqual(testVersion, currentByond.Version);
Assert.AreEqual(testVersion, currentByond.EngineVersion);
// Change the active version and check we get delayed while deleting the old one because the watchdog is using it
var setActiveResponse = await instanceClient.Byond.SetActiveVersion(
@@ -976,7 +976,7 @@ namespace Tgstation.Server.Tests.Live.Instance
var versionToInstall = testVersion;
var currentByondVersion = await instanceClient.Byond.ActiveVersion(cancellationToken);
Assert.AreNotEqual(versionToInstall, currentByondVersion.Version);
Assert.AreNotEqual(versionToInstall, currentByondVersion.EngineVersion);
var initialStatus = await instanceClient.DreamDaemon.Read(cancellationToken);