From 7949339947b3ade61a1d9d718a8ee1e4e2d22078 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Tr=C3=A1vn=C3=AD=C4=8Dek?= <jan.travnicek@fit.cvut.cz> Date: Mon, 13 Dec 2021 20:03:06 +0100 Subject: [PATCH] tests: improve readability of declaration types --- tests/cppaql/arbologyTest.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/cppaql/arbologyTest.cpp b/tests/cppaql/arbologyTest.cpp index d84943853d..07774381ef 100644 --- a/tests/cppaql/arbologyTest.cpp +++ b/tests/cppaql/arbologyTest.cpp @@ -165,7 +165,7 @@ TEST_CASE ( "Arbology tests | nonlinear pattern", "[integration]" ) { std::make_tuple ( "Exact Reversed Boyer Moore Horspool (NonlinearPattern PrefixRanked)", "arbology::exact::ReversedBoyerMooreHorspool (PrefixRankedTree)$subject (PrefixRankedNonlinearPattern) <(tree::GeneralAlphabet::add $pattern <(tree::GeneralAlphabet::get $subject))", 1000 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern"; auto pattern = EGenerateType::NONLINEAR_PATTERN; @@ -192,7 +192,7 @@ TEST_CASE ( "Arbology tests | nonlinear pattern ends", "[integration]" ) { "arbology::exact::ExactNonlinearTreePatternAutomaton (PrefixRankedTree)$subject <(tree::SubtreeWildcard::get $pattern) <(tree::NonlinearAlphabet::get $pattern) | automaton::determinize::Determinize - |" "(SetOfObjectPairs)automaton::run::Result - (LinearString)(PrefixRankedNonlinearPattern) $pattern (DefaultStateType) { :Object } | dataAccess::PairSetSecond -", 80 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern | arbology::transform::BeginToEndIndex (PrefixRankedTree) $subject -"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern | arbology::transform::BeginToEndIndex (PrefixRankedTree) $subject -"; auto pattern = EGenerateType::NONLINEAR_PATTERN_SINGLE_VAR; SECTION ( "Test files" ) { @@ -245,7 +245,7 @@ TEST_CASE ( "Arbology tests | pattern", "[integration]" ) { std::make_tuple ( "Exact Pattern Matching Automaton (PrefixRankedBar)", "arbology::exact::ExactPatternMatchingAutomaton (PrefixRankedBarPattern) <(tree::GeneralAlphabet::add $pattern <(tree::GeneralAlphabet::get $subject)) | automaton::determinize::Determinize - | automaton::run::Occurrences - (LinearString)(PrefixRankedBarTree)$subject", 1000 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern"; auto pattern = EGenerateType::PATTERN; SECTION ( "Test files" ) { @@ -270,7 +270,7 @@ TEST_CASE ( "Arbology tests | unordered pattern", "[integration]" ) { std::make_tuple ( "Exact Pattern Matching Automaton (Pattern Tree)", "automaton::run::Occurrences <(arbology::exact::ExactPatternMatchingAutomaton <(tree::GeneralAlphabet::add $pattern <(tree::GeneralAlphabet::get $subject)) | automaton::determinize::Determinize - ) $subject", 1000 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern"; auto pattern = EGenerateType::UNORDERED_PATTERN; /* SECTION ( "Test files" ) { @@ -297,7 +297,7 @@ TEST_CASE ( "Arbology tests | unranked pattern", "[integration]" ) { std::make_tuple ( "Exact Pattern Matching Automaton (As DPDA) (Pattern Tree)", "automaton::run::Occurrences <(arbology::exact::ExactPatternMatchingAutomaton <(tree::GeneralAlphabet::add $pattern <(tree::GeneralAlphabet::get $subject)) | automaton::simplify::ToArcFactored - | automaton::determinize::Determinize - | automaton::convert::ToPrefixPushdownAutomaton -) (PrefixBarTree) $subject", 1000 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern"; auto pattern = EGenerateType::UNRANKED_PATTERN; SECTION ( "Random tests" ) { @@ -315,7 +315,7 @@ TEST_CASE ( "Arbology tests | unranked extended pattern", "[integration]" ) { std::make_tuple ( "Exact Pattern Matching Automaton (Pattern Tree)", "automaton::run::Occurrences <(arbology::exact::ExactPatternMatchingAutomaton <(tree::GeneralAlphabet::add $pattern <(tree::GeneralAlphabet::get $subject)) | automaton::simplify::ToArcFactored - | automaton::determinize::Determinize - ) $subject", 1000 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern"; auto pattern = EGenerateType::UNRANKED_EXTENDED_PATTERN; SECTION ( "Random tests" ) { @@ -333,7 +333,7 @@ TEST_CASE ( "Arbology tests | ranked extended pattern", "[integration]" ) { std::make_tuple ( "Exact Knuth Morris Pratt (Pattern PrefixRankedExtended)", "arbology::exact::KnuthMorrisPratt (PrefixRankedTree)$subject (PrefixRankedExtendedPattern)$pattern", 1000 ) ); - auto exact = "arbology::exact::ExactPatternMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactPatternMatch $subject $pattern"; auto pattern = EGenerateType::EXTENDED_PATTERN; SECTION ( "Random tests" ) { @@ -358,7 +358,7 @@ TEST_CASE ( "Arbology tests | pattern ends ", "[integration]" ) { std::make_tuple ( "Exact Tree Pattern Automaton (PrefixRanked)", "arbology::exact::ExactTreePatternAutomaton (PrefixRankedTree)$subject <(tree::SubtreeWildcard::get $pattern) | automaton::determinize::Determinize - | (SetOfObjects) automaton::run::Result - (LinearString)(PrefixRankedPattern)$pattern (DefaultStateType) { :Object }", 120 ) ); - auto exact = "arbology::exact::ExactPatternMatch (PrefixRankedTree)$subject (PrefixRankedPattern)$pattern | arbology::transform::BeginToEndIndex (PrefixRankedTree)$subject -"; + const char * exact = "arbology::exact::ExactPatternMatch (PrefixRankedTree)$subject (PrefixRankedPattern)$pattern | arbology::transform::BeginToEndIndex (PrefixRankedTree)$subject -"; auto pattern = EGenerateType::PATTERN; SECTION ( "Test files" ) { @@ -388,7 +388,7 @@ TEST_CASE ( "Arbology tests | subtree", "[integration]" ) { "arbology::exact::BoyerMooreHorspool (PrefixRankedBarTree)$subject (PrefixRankedBarTree) <(tree::GeneralAlphabet::add $pattern <(tree::GeneralAlphabet::get $subject))", 1000 ) ); - auto exact = "arbology::exact::ExactSubtreeMatch $subject $pattern"; + const char * exact = "arbology::exact::ExactSubtreeMatch $subject $pattern"; auto pattern = EGenerateType::SUBTREE; SECTION ( "Test files" ) { -- GitLab