Skip to content

Commit

Permalink
Update for common library changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@mpewsey
mpewsey committed Nov 5, 2023
1 parent 14bd2a5 commit f0cc0d0
Show file tree
Hide file tree
Showing 31 changed files with 175 additions and 190 deletions.
2 changes: 1 addition & 1 deletion src/ManiaMap.Tests/Drawing/TestLayoutMap.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class TestLayoutMap
[TestMethod]
public void TestSaveManiaMapImages()
{
var layout = Samples.ManiaMapSample.ManiaMapLayout();
var layout = Samples.ManiaMapSample.ManiaMapLayout(Console.WriteLine);

Assert.IsNotNull(layout);

Expand Down
5 changes: 3 additions & 2 deletions src/ManiaMap.Tests/Generators/TestCollectableGenerator.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MPewsey.Common.Random;
using MPewsey.ManiaMap.Exceptions;
using System;
using System.Collections.Generic;

namespace MPewsey.ManiaMap.Generators.Tests
Expand All @@ -24,7 +25,7 @@ public void TestGenerateLayoutForBigLayout()
Assert.IsNotNull(layout);

var collectableGenerator = new CollectableGenerator();
collectableGenerator.Generate(layout, collectableGroups, random);
collectableGenerator.Generate(layout, collectableGroups, random, Console.WriteLine);
var result = new List<int>();

foreach (var room in layout.Rooms.Values)
Expand All @@ -51,7 +52,7 @@ public void TestCollectableSpotNotFound()
Assert.IsNotNull(layout);

var collectableGenerator = new CollectableGenerator();
Assert.ThrowsException<CollectableSpotNotFoundException>(() => collectableGenerator.Generate(layout, collectableGroups, random));
Assert.ThrowsException<CollectableSpotNotFoundException>(() => collectableGenerator.Generate(layout, collectableGroups, random, Console.WriteLine));
}

[TestMethod]
Expand Down
76 changes: 24 additions & 52 deletions src/ManiaMap.Tests/Generators/TestLayoutGenerator.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MPewsey.Common.Logging;
using MPewsey.Common.Random;
using MPewsey.ManiaMap.Exceptions;
using MPewsey.ManiaMap.Samples;
Expand All @@ -18,18 +17,14 @@ public class TestLayoutGenerator
public void TestCancellationToken()
{
var log = new List<string>();
Logger.RemoveAllListeners();
Logger.AddListener(log.Add);
Logger.AddListener(Console.WriteLine);

var token = new CancellationTokenSource(20).Token;
var random = new RandomSeed(12345);
var graph = Samples.GraphLibrary.BigGraph();
var templateGroups = Samples.BigLayoutSample.BigLayoutTemplateGroups();
var generator = new LayoutGenerator();
var layout = generator.Generate(1, graph, templateGroups, random, token);
var layout = generator.Generate(1, graph, templateGroups, random, log.Add, token);

Logger.RemoveAllListeners();
Assert.IsTrue(log.Count > 0);
Assert.IsTrue(log[log.Count - 1].Contains("Process cancelled"));
Assert.IsNull(layout);
Expand All @@ -38,17 +33,14 @@ public void TestCancellationToken()
[TestMethod]
public void TestHyperSquareCrossLayout()
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var graph = Samples.GraphLibrary.CrossGraph();
var graph = GraphLibrary.CrossGraph();

var templateGroups = new TemplateGroups();
templateGroups.Add("Default", Samples.TemplateLibrary.Miscellaneous.HyperSquareTemplate());
templateGroups.Add("Default", TemplateLibrary.Miscellaneous.HyperSquareTemplate());

var generator = new LayoutGenerator();
var random = new RandomSeed(12345);
var layout = generator.Generate(1, graph, templateGroups, random);
var layout = generator.Generate(1, graph, templateGroups, random, Console.WriteLine);

Assert.IsNotNull(layout);

Expand All @@ -65,17 +57,14 @@ public void TestHyperSquareCrossLayout()
[TestMethod]
public void TestHyperSquareStackedLoopLayout()
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var graph = Samples.GraphLibrary.StackedLoopGraph();
var graph = GraphLibrary.StackedLoopGraph();

var templateGroups = new TemplateGroups();
templateGroups.Add("Default", Samples.TemplateLibrary.Miscellaneous.HyperSquareTemplate());
templateGroups.Add("Default", TemplateLibrary.Miscellaneous.HyperSquareTemplate());

var generator = new LayoutGenerator();
var random = new RandomSeed(12345);
var layout = generator.Generate(1, graph, templateGroups, random);
var layout = generator.Generate(1, graph, templateGroups, random, Console.WriteLine);

Assert.IsNotNull(layout);

Expand All @@ -92,18 +81,15 @@ public void TestHyperSquareStackedLoopLayout()
[TestMethod]
public void TestLLoopLayout()
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var graph = Samples.GraphLibrary.LoopGraph();
var graph = GraphLibrary.LoopGraph();

var templateGroups = new TemplateGroups();
var template = Samples.TemplateLibrary.Miscellaneous.LTemplate();
var template = TemplateLibrary.Miscellaneous.LTemplate();
templateGroups.Add("Default", template.UniqueVariations());

var generator = new LayoutGenerator();
var random = new RandomSeed(12345);
var layout = generator.Generate(1, graph, templateGroups, random);
var layout = generator.Generate(1, graph, templateGroups, random, Console.WriteLine);

Assert.IsNotNull(layout);

Expand All @@ -121,17 +107,14 @@ public void TestLLoopLayout()
[TestMethod]
public void TestHyperSquareGeekLayout()
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var graph = Samples.GraphLibrary.GeekGraph();
var graph = GraphLibrary.GeekGraph();

var templateGroups = new TemplateGroups();
templateGroups.Add("Default", Samples.TemplateLibrary.Miscellaneous.HyperSquareTemplate());
templateGroups.Add("Default", TemplateLibrary.Miscellaneous.HyperSquareTemplate());

var generator = new LayoutGenerator();
var random = new RandomSeed(123456);
var layout = generator.Generate(1, graph, templateGroups, random);
var layout = generator.Generate(1, graph, templateGroups, random, Console.WriteLine);

Assert.IsNotNull(layout);

Expand All @@ -148,11 +131,11 @@ public void TestHyperSquareGeekLayout()
[TestMethod]
public void TestGraphIsNotFullyConnected()
{
var graph = Samples.GraphLibrary.GeekGraph();
var graph = GraphLibrary.GeekGraph();
graph.AddNode(100000);

var templateGroups = new TemplateGroups();
templateGroups.Add("Default", Samples.TemplateLibrary.Miscellaneous.HyperSquareTemplate());
templateGroups.Add("Default", TemplateLibrary.Miscellaneous.HyperSquareTemplate());

var generator = new LayoutGenerator();
var random = new RandomSeed(123456);
Expand All @@ -162,10 +145,7 @@ public void TestGraphIsNotFullyConnected()
[TestMethod]
public void TestManiaMapLayout()
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var layout = Samples.ManiaMapSample.ManiaMapLayout();
var layout = ManiaMapSample.ManiaMapLayout(Console.WriteLine);

Assert.IsNotNull(layout);

Expand Down Expand Up @@ -196,14 +176,11 @@ public void TestToString()
[DataRow(123456789)]
public void TestBigLayout(int seed)
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var random = new RandomSeed(seed);
var graph = Samples.GraphLibrary.BigGraph();
var templateGroups = Samples.BigLayoutSample.BigLayoutTemplateGroups();
var graph = GraphLibrary.BigGraph();
var templateGroups = BigLayoutSample.BigLayoutTemplateGroups();
var generator = new LayoutGenerator();
var layout = generator.Generate(1, graph, templateGroups, random);
var layout = generator.Generate(1, graph, templateGroups, random, Console.WriteLine);
Assert.IsNotNull(layout);
}

Expand All @@ -216,28 +193,23 @@ public void TestBigLayout(int seed)
[DataRow(123456789)]
public async Task TestBigLayoutAsync(int seed)
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);
var results = await BigLayoutSample.GenerateAsync(seed);
var results = await BigLayoutSample.GenerateAsync(seed, Console.WriteLine);
var layout = results.GetOutput<Layout>("Layout");
Assert.IsNotNull(layout);
}

[TestMethod]
public void TestDirectedRingLayout()
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var graph = Samples.GraphLibrary.DirectedRingGraph();
var graph = GraphLibrary.DirectedRingGraph();

var templateGroups = new TemplateGroups();
templateGroups.Add("Nodes", Samples.TemplateLibrary.Miscellaneous.HyperSquareTemplate());
templateGroups.Add("Edges", Samples.TemplateLibrary.Squares.Square1x1NorthExitTemplate().AllVariations());
templateGroups.Add("Nodes", TemplateLibrary.Miscellaneous.HyperSquareTemplate());
templateGroups.Add("Edges", TemplateLibrary.Squares.Square1x1NorthExitTemplate().AllVariations());

var generator = new LayoutGenerator();
var random = new RandomSeed(12345);
var layout = generator.Generate(1, graph, templateGroups, random);
var layout = generator.Generate(1, graph, templateGroups, random, Console.WriteLine);

Assert.IsNotNull(layout);

Expand Down
5 changes: 3 additions & 2 deletions src/ManiaMap.Tests/Generators/TestLayoutGraphRandomizer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MPewsey.Common.Pipelines;
using MPewsey.Common.Random;
using System;
using System.Collections.Generic;
using System.Threading;

Expand All @@ -24,7 +25,7 @@ public void TestApplyStep()

var randomizer = new LayoutGraphRandomizer();
var results = new PipelineResults(input);
Assert.IsTrue(randomizer.ApplyStep(results, CancellationToken.None));
Assert.IsTrue(randomizer.ApplyStep(results, Console.WriteLine, CancellationToken.None));
Assert.IsTrue(results.Outputs.ContainsKey("LayoutGraph"));
}

Expand All @@ -35,7 +36,7 @@ public void TestRandomizeLayout()
graph.AddNodeVariations("Group1", new int[] { 0, 1 });
var seed = new RandomSeed(12345);
var randomizer = new LayoutGraphRandomizer();
var result = randomizer.RandomizeGraph(graph, seed);
var result = randomizer.RandomizeGraph(graph, seed, Console.WriteLine);
Assert.AreNotEqual(graph, result);
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/ManiaMap.Tests/Generators/TestLayoutGraphSelector.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void TestListSelector()

var selector = new LayoutGraphSelector();
var results = new PipelineResults(input);
Assert.IsTrue(selector.ApplyStep(results, CancellationToken.None));
Assert.IsTrue(selector.ApplyStep(results, Console.WriteLine, CancellationToken.None));
Assert.AreEqual(1, results.Outputs.Count);
Assert.IsTrue(results.Outputs.ContainsKey("LayoutGraph"));
}
Expand All @@ -56,7 +56,7 @@ public void TestFunctionSelector()

var selector = new LayoutGraphSelector();
var results = new PipelineResults(input);
Assert.IsTrue(selector.ApplyStep(results, CancellationToken.None));
Assert.IsTrue(selector.ApplyStep(results, Console.WriteLine, CancellationToken.None));
Assert.AreEqual(1, results.Outputs.Count);
Assert.IsTrue(results.Outputs.ContainsKey("LayoutGraph"));
}
Expand Down
14 changes: 5 additions & 9 deletions src/ManiaMap.Tests/Generators/TestPipelineBuilder.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MPewsey.Common.Logging;
using MPewsey.Common.Serialization;
using System;

Expand All @@ -17,18 +16,15 @@ public class TestPipelineBuilder
[DataRow(123456789)]
public void TestDefaultPipelineGeneration(int seed)
{
Logger.RemoveAllListeners();
Logger.AddListener(Console.WriteLine);

var results = Samples.BigLayoutSample.Generate(seed);
var results = Samples.BigLayoutSample.Generate(seed, Console.WriteLine);
Assert.IsTrue(results.Success);
Assert.IsTrue(results.Outputs.ContainsKey("Layout"));
}

[TestMethod]
public void TestLoadXmlString()
{
var results = Samples.BigLayoutSample.Generate(12345);
var results = Samples.BigLayoutSample.Generate(12345, Console.WriteLine);
Assert.IsTrue(results.Success);
Assert.IsTrue(results.Outputs.ContainsKey("Layout"));
var layout = results.GetOutput<Layout>("Layout");
Expand All @@ -41,7 +37,7 @@ public void TestLoadXmlString()
[TestMethod]
public void TestSaveAndLoadXml()
{
var results = Samples.BigLayoutSample.Generate(12345);
var results = Samples.BigLayoutSample.Generate(12345, Console.WriteLine);
Assert.IsTrue(results.Success);
Assert.IsTrue(results.Outputs.ContainsKey("Layout"));
var layout = results.GetOutput<Layout>("Layout");
Expand All @@ -54,7 +50,7 @@ public void TestSaveAndLoadXml()
[TestMethod]
public void TestSaveAndLoadJson()
{
var results = Samples.BigLayoutSample.Generate(12345);
var results = Samples.BigLayoutSample.Generate(12345, Console.WriteLine);
Assert.IsTrue(results.Success);
Assert.IsTrue(results.Outputs.ContainsKey("Layout"));
var layout = results.GetOutput<Layout>("Layout");
Expand All @@ -67,7 +63,7 @@ public void TestSaveAndLoadJson()
[TestMethod]
public void TestSaveAndLoadEncryptedXml()
{
var results = Samples.BigLayoutSample.Generate(12345);
var results = Samples.BigLayoutSample.Generate(12345, Console.WriteLine);
Assert.IsTrue(results.Success);
Assert.IsTrue(results.Outputs.ContainsKey("Layout"));
var layout = results.GetOutput<Layout>("Layout");
Expand Down
5 changes: 3 additions & 2 deletions src/ManiaMap.Tests/TestDoorConnection.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;

namespace MPewsey.ManiaMap.Tests
{
Expand All @@ -8,7 +9,7 @@ public class TestDoorConnection
[TestMethod]
public void TestEdgeDirection()
{
var results = Samples.BigLayoutSample.Generate(12345);
var results = Samples.BigLayoutSample.Generate(12345, Console.WriteLine);
Assert.IsTrue(results.Success);
var layout = results.GetOutput<Layout>("Layout");

Expand All @@ -21,7 +22,7 @@ public void TestEdgeDirection()
[TestMethod]
public void TestGetDoorPosition()
{
var results = Samples.BigLayoutSample.Generate(12345);
var results = Samples.BigLayoutSample.Generate(12345, Console.WriteLine);
Assert.IsTrue(results.Success);
var layout = results.GetOutput<Layout>("Layout");

Expand Down
Loading

0 comments on commit f0cc0d0

Please sign in to comment.