From e4ecaa0d977661954a7c686e3fe8eca2d71dba82 Mon Sep 17 00:00:00 2001 From: Felix Mulder Date: Wed, 18 Jan 2017 17:45:42 +0100 Subject: Harmonize package objects and packages in Doc AST --- doc-tool/test/ConstructorTest.scala | 14 +++++++------- doc-tool/test/PackageStructure.scala | 8 ++++---- doc-tool/test/UsecaseTest.scala | 10 +++++----- 3 files changed, 16 insertions(+), 16 deletions(-) (limited to 'doc-tool/test') diff --git a/doc-tool/test/ConstructorTest.scala b/doc-tool/test/ConstructorTest.scala index 76abce100..4808ceab3 100644 --- a/doc-tool/test/ConstructorTest.scala +++ b/doc-tool/test/ConstructorTest.scala @@ -22,7 +22,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(cls: Class), _, _) => + case PackageImpl(_, _, _, List(cls: Class), _, _, _) => cls.constructors.headOption match { case Some(ParamListImpl(NamedReference("str", _, false, false) :: Nil, false) :: Nil) => // success! @@ -44,7 +44,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(cls: Class), _, _) => + case PackageImpl(_, _, _, List(cls: Class), _, _, _) => cls.constructors match { case ( ParamListImpl(NamedReference("str1", _, false, false) :: Nil, false) :: @@ -69,7 +69,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(cls: Class), _, _) => + case PackageImpl(_, _, _, List(cls: Class), _, _, _) => cls.constructors match { case ( ParamListImpl(NamedReference("str1", _, false, false) :: Nil, false) :: @@ -101,7 +101,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(cls: Class), _, _) => + case PackageImpl(_, _, _, List(cls: Class), _, _, _) => cls.constructors match { case ( ParamListImpl(NamedReference("main", _, false, false) :: Nil, false) :: Nil @@ -139,7 +139,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(cls: CaseClass, obj: Object), _, _) => + case PackageImpl(_, _, _, List(cls: CaseClass, obj: Object), _, _, _) => cls.constructors match { case ( ParamListImpl(NamedReference("main", _, false, false) :: Nil, false) :: Nil @@ -172,7 +172,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(trt: Trait), _, _) => + case PackageImpl(_, _, _, List(trt: Trait), _, _, _) => trt.traitParams match { case ParamListImpl(NamedReference("main", _, false, false) :: Nil, false) :: Nil => case _ => @@ -199,7 +199,7 @@ class Constructors extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(cc: CaseClass, _, cls: Class, trt: Trait), _, _) => + case PackageImpl(_, _, _, List(cc: CaseClass, _, cls: Class, trt: Trait), _, _, _) => import model.json._ lazy val incorrectJson = s"The json generated for:\n$actualSource\n\nIs not correct" assert(cc.json.contains(s""""constructors":[[{"list":[{"title":"main""""), incorrectJson) diff --git a/doc-tool/test/PackageStructure.scala b/doc-tool/test/PackageStructure.scala index be80c57fc..b242d2f39 100644 --- a/doc-tool/test/PackageStructure.scala +++ b/doc-tool/test/PackageStructure.scala @@ -29,7 +29,7 @@ class PackageStructure extends DottyDocTest { checkSources(source1 :: source2 :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(tA, tB), _, _) => + case PackageImpl(_, _, _, List(tA, tB), _, _, _) => assert( tA.name == "A" && tB.name == "B", s"trait A had name '${tA.name}' and trait B had name '${tB.name}'" @@ -65,8 +65,8 @@ class PackageStructure extends DottyDocTest { _, _, "scala", - List(PackageImpl(_, _, "scala.collection", List(tA, tB), _, _)), - _, _ + List(PackageImpl(_, _, "scala.collection", List(tA, tB), _, _, _)), + _, _, _ ) => assert( tA.name == "A" && tB.name == "B", @@ -78,7 +78,7 @@ class PackageStructure extends DottyDocTest { } packages("scala.collection") match { - case PackageImpl(_, _, "scala.collection", List(tA, tB), _, _) => + case PackageImpl(_, _, "scala.collection", List(tA, tB), _, _, _) => assert( tA.name == "A" && tB.name == "B", s"trait A had name '${tA.name}' and trait B had name '${tB.name}'" diff --git a/doc-tool/test/UsecaseTest.scala b/doc-tool/test/UsecaseTest.scala index 2731517e7..bc896ed8d 100644 --- a/doc-tool/test/UsecaseTest.scala +++ b/doc-tool/test/UsecaseTest.scala @@ -29,7 +29,7 @@ class UsecaseTest extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(trt: Trait), _, _) => + case PackageImpl(_, _, _, List(trt: Trait), _, _, _) => val List(foo: Def) = trt.members assert(foo.comment.isDefined, "Lost comment in transformations") @@ -73,7 +73,7 @@ class UsecaseTest extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(trt: Trait), _, _) => + case PackageImpl(_, _, _, List(trt: Trait), _, _, _) => val List(foo: Def) = trt.members val returnValue = foo.returnValue match { @@ -118,7 +118,7 @@ class UsecaseTest extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(trt: Trait), _, _) => + case PackageImpl(_, _, _, List(trt: Trait), _, _, _) => val List(foo: Def) = trt.members val returnValue = foo.returnValue match { @@ -166,7 +166,7 @@ class UsecaseTest extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(trt: Trait), _, _) => + case PackageImpl(_, _, _, List(trt: Trait), _, _, _) => val List(map: Def) = trt.members val returnValue = map.returnValue match { @@ -209,7 +209,7 @@ class UsecaseTest extends DottyDocTest { checkSources(source :: Nil) { packages => packages("scala") match { - case PackageImpl(_, _, _, List(trt: Trait), _, _) => + case PackageImpl(_, _, _, List(trt: Trait), _, _, _) => val List(map: Def) = trt.members assert(map.comment.isDefined, "Lost comment in transformations") -- cgit v1.2.3