Skip to content

Commit

Permalink
make sure assertEventsEqual() actually has events to test
Browse files Browse the repository at this point in the history
  • Loading branch information
Herringway committed Sep 18, 2023
1 parent a914d23 commit 349c2c5
Showing 1 changed file with 7 additions and 7 deletions.
14 changes: 7 additions & 7 deletions source/dyaml/test/emitter.d
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ module dyaml.test.emitter;

@safe unittest
{
import std.array : Appender;
import std.array : Appender, array;
import std.range : ElementType, isInputRange;

import dyaml : CollectionStyle, LineBreak, Loader, Mark, ScalarStyle;
Expand Down Expand Up @@ -40,14 +40,14 @@ module dyaml.test.emitter;
{
//Must exist due to Anchor, Tags reference counts.
auto loader = Loader.fromFile(dataFilename);
auto events = loader.parse();
auto events = loader.parse().array;
auto emitStream = Appender!string();
emitTestCommon(emitStream, events);

auto loader2 = Loader.fromString(emitStream.data);
loader2.name = "TEST";
auto newEvents = loader2.parse();
assertEventsEqual(events, newEvents);
assertEventsEqual(dataFilename, events, newEvents);
}
/**
Test emitter by getting events from parsing a canonical YAML file, emitting
Expand All @@ -60,7 +60,7 @@ module dyaml.test.emitter;
{
//Must exist due to Anchor, Tags reference counts.
auto loader = Loader.fromFile(canonicalFilename);
auto events = loader.parse();
auto events = loader.parse().array;
foreach (canonical; [false, true])
{
auto emitStream = Appender!string();
Expand All @@ -69,7 +69,7 @@ module dyaml.test.emitter;
auto loader2 = Loader.fromString(emitStream.data);
loader2.name = "TEST";
auto newEvents = loader2.parse();
assertEventsEqual(events, newEvents);
assertEventsEqual(canonicalFilename, events, newEvents);
}
}
/**
Expand All @@ -88,7 +88,7 @@ module dyaml.test.emitter;
{
//must exist due to Anchor, Tags reference counts
auto loader = Loader.fromFile(canonicalFilename);
auto events = loader.parse();
auto events = loader.parse().array;
foreach (flowStyle; [CollectionStyle.block, CollectionStyle.flow])
{
foreach (style; [ScalarStyle.literal, ScalarStyle.folded,
Expand Down Expand Up @@ -121,7 +121,7 @@ module dyaml.test.emitter;
auto loader2 = Loader.fromString(emitStream.data);
loader2.name = "TEST";
auto newEvents = loader2.parse();
assertEventsEqual(events, newEvents);
assertEventsEqual(filename, events, newEvents);
}
}
}
Expand Down

0 comments on commit 349c2c5

Please sign in to comment.