From 2f77b24df254fd1c6777f014d27a627996a471d1 Mon Sep 17 00:00:00 2001 From: Sung-Shik Jongmans Date: Wed, 25 Sep 2024 14:20:04 +0200 Subject: [PATCH] Add names to tests --- .../src/main/rascal/lang/textmate/ConversionTests.rsc | 6 +++--- .../src/main/rascal/lang/textmate/conversiontests/Emoji.rsc | 2 +- .../src/main/rascal/lang/textmate/conversiontests/Pico.rsc | 2 +- .../lang/textmate/conversiontests/PicoWithCategories.rsc | 2 +- .../main/rascal/lang/textmate/conversiontests/Rascal.rsc | 2 +- .../rascal/lang/textmate/conversiontests/RascalClass.rsc | 2 +- .../rascal/lang/textmate/conversiontests/RascalComment.rsc | 2 +- .../rascal/lang/textmate/conversiontests/RascalConcrete.rsc | 2 +- .../lang/textmate/conversiontests/RascalStringConstant.rsc | 2 +- .../lang/textmate/conversiontests/RascalStringLiteral.rsc | 2 +- .../main/rascal/lang/textmate/conversiontests/RascalTag.rsc | 2 +- .../rascal/lang/textmate/conversiontests/Walkthrough.rsc | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/ConversionTests.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/ConversionTests.rsc index fb42733..f43b451 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/ConversionTests.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/ConversionTests.rsc @@ -18,8 +18,8 @@ import lang::textmate::ConversionConstants; import lang::textmate::ConversionUnit; import lang::textmate::Grammar; -bool doAnalyzeTest(RscGrammar rsc, list[ConversionUnit] expect, bool printActual = false) { - list[ConversionUnit] actual = analyze(rsc); +bool doAnalyzeTest(RscGrammar rsc, list[ConversionUnit] expect, str name = "", bool printActual = false) { + list[ConversionUnit] actual = analyze(rsc, name); if (printActual) { str syntheticProductionNameVars(str s) @@ -61,7 +61,7 @@ bool doAnalyzeTest(RscGrammar rsc, list[ConversionUnit] expect, bool printActual } bool doTransformTest(list[ConversionUnit] units, RepositoryStats expect, str name = "") { - TmGrammar tm = transform(units)[scopeName = ""]; + TmGrammar tm = transform(units, name); loc lProject = |project://rascal-textmate-core|; loc lGrammar = lProject + "/target/generated-test-grammars/.tmLanguage.json"; diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Emoji.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Emoji.rsc index 9798e4a..cb8fc28 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Emoji.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Emoji.rsc @@ -24,5 +24,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex("Unit"),[lit("🌊")],{\tag("category"("constant.language"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "Emoji"); test bool transformTest() = doTransformTest(units, <3, 0, 0>, name = "Emoji"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Pico.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Pico.rsc index 63742c7..3c8d076 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Pico.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Pico.rsc @@ -19,5 +19,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("do"),lit("declare"),lit("fi"),lit("else"),lit("end"),lit("od"),lit("nil-type"),lit("begin"),lit("natural"),lit("then"),lit("if"),lit("while"),lit("string")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "Pico"); test bool transformTest() = doTransformTest(units, <4, 1, 0>, name = "Pico"); \ No newline at end of file diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/PicoWithCategories.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/PicoWithCategories.rsc index e8a21d0..181d348 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/PicoWithCategories.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/PicoWithCategories.rsc @@ -86,5 +86,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("do"),lit("declare"),lit("fi"),lit("else"),lit("end"),lit("od"),lit("nil-type"),lit("begin"),lit("natural"),lit("then"),lit("if"),lit("while"),lit("string")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "PicoWithCategories"); test bool transformTest() = doTransformTest(units, <10, 3, 0>, name = "PicoWithCategories"); \ No newline at end of file diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Rascal.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Rascal.rsc index d88ad2b..8f06b8a 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Rascal.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Rascal.rsc @@ -38,5 +38,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("lexical"),lit("loc"),lit("test"),lit("lrel"),lit("throws"),lit("clear"),lit("top-down-break"),lit("module"),lit("any"),lit("int"),lit("quit"),lit("bottom-up-break"),lit("o"),lit("anno"),lit("true"),lit("public"),lit("keyword"),lit("for"),lit("tuple"),lit("bracket"),lit("bag"),lit("it"),lit("visit"),lit("do"),lit("data"),lit("layout"),lit("bool"),lit("edit"),lit("join"),lit("is"),lit("import"),lit("view"),lit("in"),lit("rat"),lit("modules"),lit("continue"),lit("left"),lit("num"),lit("assert"),lit("throw"),lit("one"),lit("help"),lit("default"),lit("all"),lit("global"),lit("syntax"),lit("false"),lit("finally"),lit("private"),lit("mod"),lit("java"),lit("node"),lit("start"),lit("set"),lit("if"),lit("bottom-up"),lit("right"),lit("variable"),lit("map"),lit("10"),lit("on"),lit("break"),lit("dynamic"),lit("solve"),lit("fail"),lit("unimport"),lit("outermost"),lit("real"),lit("list"),lit("insert"),lit("innermost"),lit("declarations"),lit("else"),lit("rel"),lit("function"),lit("notin"),lit("filter"),lit("datetime"),lit("catch"),lit("try"),lit("renaming"),lit("tag"),lit("has"),lit("top-down"),lit("Z"),lit("when"),lit("type"),lit("append"),lit("extend"),lit("non-assoc"),lit("assoc"),lit("switch"),lit("void"),lit("history"),lit("T"),lit("while"),lit("str"),lit("value"),lit("undeclare"),lit("case"),lit("alias"),lit("return"),lit("0")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "Rascal"); test bool transformTest() = doTransformTest(units, <20, 4, 0>, name = "Rascal"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalClass.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalClass.rsc index 4044568..0ac24c4 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalClass.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalClass.rsc @@ -47,5 +47,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("10"),lit("0")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "RascalClass"); test bool transformTest() = doTransformTest(units, <5, 1, 0>, name = "RascalClass"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalComment.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalComment.rsc index 703b9f1..a6a3dc3 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalComment.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalComment.rsc @@ -22,5 +22,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex("Comment"),[lit("/*"),\iter-star(alt({\char-class([range(1,41),range(43,1114111)]),conditional(lit("*"),{\not-follow(lit("/"))})})),lit("*/")],{\tag("category"("Comment"))}), false, true, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "RascalComment"); test bool transformTest() = doTransformTest(units, <2, 1, 0>, name = "RascalComment"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalConcrete.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalConcrete.rsc index 696333d..133a1fd 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalConcrete.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalConcrete.rsc @@ -39,5 +39,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(label("text",lex("ConcretePart")),[conditional(iter(\char-class([range(1,9),range(11,59),range(61,61),range(63,91),range(93,95),range(97,1114111)])),{\not-follow(\char-class([range(1,9),range(11,59),range(61,61),range(63,91),range(93,95),range(97,1114111)]))})],{\tag("category"("MetaSkipped"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "RascalConcrete"); test bool transformTest() = doTransformTest(units, <7, 1, 0>, name = "RascalConcrete"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringConstant.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringConstant.rsc index d6af0fc..c8cf144 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringConstant.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringConstant.rsc @@ -35,5 +35,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("10"),lit("0")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "RascalStringConstant"); test bool transformTest() = doTransformTest(units, <3, 1, 0>, name = "RascalStringConstant"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringLiteral.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringLiteral.rsc index 618cef5..89999bd 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringLiteral.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalStringLiteral.rsc @@ -77,5 +77,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("for"),lit("do"),lit("if"),lit("10"),lit("else"),lit("while"),lit("0")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "RascalStringLiteral"); test bool transformTest() = doTransformTest(units, <6, 0, 0>, name = "RascalStringLiteral"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalTag.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalTag.rsc index 5658888..c80dcda 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalTag.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/RascalTag.rsc @@ -45,5 +45,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(label("expression",sort("Tag")),[lit("@"),layouts("LAYOUTLIST"),label("name",lex("Name")),layouts("LAYOUTLIST"),lit("="),layouts("LAYOUTLIST"),conditional(label("expression",sort("Expression")),{\not-follow(lit("@"))})],{\tag("Folded"()),\tag("category"("Comment"))}), false, true, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "RascalTag"); test bool transformTest() = doTransformTest(units, <2, 1, 0>, name = "RascalTag"); diff --git a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Walkthrough.rsc b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Walkthrough.rsc index d776cb4..90d1a7f 100644 --- a/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Walkthrough.rsc +++ b/rascal-textmate-core/src/main/rascal/lang/textmate/conversiontests/Walkthrough.rsc @@ -297,5 +297,5 @@ list[ConversionUnit] units = [ unit(rsc, prod(lex(KEYWORDS_PRODUCTION_NAME),[alt({lit("true"),lit("false")})],{\tag("category"("keyword.control"))}), false, false, , ) ]; -test bool analyzeTest() = doAnalyzeTest(rsc, units); +test bool analyzeTest() = doAnalyzeTest(rsc, units, name = "Walkthrough"); test bool transformTest() = doTransformTest(units, <7, 2, 0>, name = "Walkthrough"); \ No newline at end of file