diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-04-12 17:39:01 +0200 | 
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2016-04-25 22:24:16 +0200 | 
| commit | 1c8e98853fc65023534cc19c5afdc20901b255f7 (patch) | |
| tree | 5a5e15d1b8b9dde77438c2cb366a85f220fbcbc5 | |
| parent | 2416462060ef54cb737688f648d150313b82e5f4 (diff) | |
Autoformat
| -rw-r--r-- | test/core/parser/stack/StackTest.cpp | 173 | 
1 files changed, 86 insertions, 87 deletions
| diff --git a/test/core/parser/stack/StackTest.cpp b/test/core/parser/stack/StackTest.cpp index 3ed18d0..ff13713 100644 --- a/test/core/parser/stack/StackTest.cpp +++ b/test/core/parser/stack/StackTest.cpp @@ -749,105 +749,104 @@ TEST(Stack, errorMultipleFieldEnds)  TEST(Stack, errorOpenField)  { -    tracker.reset(); -    logger.reset(); - -    { -        Stack s{parser, env.context, States::AnyHandlers}; -        s.commandStart("a", {}); -        tracker.expect(1, 0, 0, 0, 0); // scc, ec, fsc, fec, dc, sac, stc, etc - -        s.fieldStart(false); -        ASSERT_FALSE(logger.hasError()); -    } -    ASSERT_TRUE(logger.hasError()); -    tracker.expect(1, 1, 1, 1, 0); // scc, ec, fsc, fec, dc, sac, stc, etc +	tracker.reset(); +	logger.reset(); + +	{ +		Stack s{parser, env.context, States::AnyHandlers}; +		s.commandStart("a", {}); +		tracker.expect(1, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc + +		s.fieldStart(false); +		ASSERT_FALSE(logger.hasError()); +	} +	ASSERT_TRUE(logger.hasError()); +	tracker.expect(1, 1, 1, 1, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc  }  TEST(Stack, fieldEndWhenImplicitDefaultFieldOpen)  { -    tracker.reset(); -    logger.reset(); - -    { -        Stack s{parser, env.context, States::AnyHandlers}; -        s.commandStart("a", {}); -        s.fieldStart(true); -        s.commandStart("b", {}); -        s.data("test"); -        s.fieldEnd(); -        tracker.expect(2, 1, 2, 2, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc -    } -    tracker.expect(2, 2, 2, 2, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc -    ASSERT_FALSE(logger.hasError()); +	tracker.reset(); +	logger.reset(); + +	{ +		Stack s{parser, env.context, States::AnyHandlers}; +		s.commandStart("a", {}); +		s.fieldStart(true); +		s.commandStart("b", {}); +		s.data("test"); +		s.fieldEnd(); +		tracker.expect(2, 1, 2, 2, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc +	} +	tracker.expect(2, 2, 2, 2, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc +	ASSERT_FALSE(logger.hasError());  }  TEST(Stack, fieldAfterDefaultField)  { -    tracker.reset(); -    logger.reset(); - -    { -        Stack s{parser, env.context, States::AnyHandlers}; -        s.commandStart("a", {}); -        tracker.expect(1, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.fieldStart(true); -        tracker.expect(1, 0, 1, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc - -        s.commandStart("b", {}); -        tracker.expect(2, 0, 1, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc - -        s.fieldStart(false); -        tracker.expect(2, 0, 2, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.data("f1"); -        tracker.expect(2, 0, 2, 0, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.fieldEnd(); -        tracker.expect(2, 0, 2, 1, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc -        tracker.fieldStartSetIsDefault = true; - -        s.fieldStart(false); -        tracker.fieldStartSetIsDefault = false; -        tracker.expect(2, 0, 3, 1, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.data("f2"); -        tracker.expect(2, 0, 3, 1, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.fieldEnd(); -        tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc - -        ASSERT_FALSE(logger.hasError()); -        s.fieldStart(false); -        ASSERT_TRUE(logger.hasError()); -        logger.reset(); -        tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.data("f3"); -        tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.fieldEnd(); -        tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc - -        s.fieldEnd(); -        tracker.expect(2, 1, 3, 3, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc -    } -    tracker.expect(2, 2, 3, 3, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc -    ASSERT_FALSE(logger.hasError()); +	tracker.reset(); +	logger.reset(); + +	{ +		Stack s{parser, env.context, States::AnyHandlers}; +		s.commandStart("a", {}); +		tracker.expect(1, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.fieldStart(true); +		tracker.expect(1, 0, 1, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc + +		s.commandStart("b", {}); +		tracker.expect(2, 0, 1, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc + +		s.fieldStart(false); +		tracker.expect(2, 0, 2, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.data("f1"); +		tracker.expect(2, 0, 2, 0, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.fieldEnd(); +		tracker.expect(2, 0, 2, 1, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc +		tracker.fieldStartSetIsDefault = true; + +		s.fieldStart(false); +		tracker.fieldStartSetIsDefault = false; +		tracker.expect(2, 0, 3, 1, 1);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.data("f2"); +		tracker.expect(2, 0, 3, 1, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.fieldEnd(); +		tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc + +		ASSERT_FALSE(logger.hasError()); +		s.fieldStart(false); +		ASSERT_TRUE(logger.hasError()); +		logger.reset(); +		tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.data("f3"); +		tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.fieldEnd(); +		tracker.expect(2, 0, 3, 2, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc + +		s.fieldEnd(); +		tracker.expect(2, 1, 3, 3, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc +	} +	tracker.expect(2, 2, 3, 3, 2);  // scc, ec, fsc, fec, dc, sac, stc, etc +	ASSERT_FALSE(logger.hasError());  }  TEST(Stack, rangeCommandUnranged)  { -    tracker.reset(); -    logger.reset(); - -    { -        Stack s{parser, env.context, States::AnyHandlers}; -        tracker.expect(0, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.commandStart("a", {}, true); -        tracker.expect(1, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.commandStart("b", {}); -        tracker.expect(2, 0, 1, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -        s.rangeEnd(); -        tracker.expect(2, 2, 1, 1, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -    } -    tracker.expect(2, 2, 1, 1, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc -    ASSERT_FALSE(logger.hasError()); -} +	tracker.reset(); +	logger.reset(); +	{ +		Stack s{parser, env.context, States::AnyHandlers}; +		tracker.expect(0, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.commandStart("a", {}, true); +		tracker.expect(1, 0, 0, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.commandStart("b", {}); +		tracker.expect(2, 0, 1, 0, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +		s.rangeEnd(); +		tracker.expect(2, 2, 1, 1, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +	} +	tracker.expect(2, 2, 1, 1, 0);  // scc, ec, fsc, fec, dc, sac, stc, etc +	ASSERT_FALSE(logger.hasError()); +}  }  } | 
