diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/TestAPI.kt | 12 | ||||
| -rw-r--r-- | test/src/model/PackageTest.kt | 17 |
2 files changed, 11 insertions, 18 deletions
diff --git a/test/src/TestAPI.kt b/test/src/TestAPI.kt index 12c85c77..5ecdf1fb 100644 --- a/test/src/TestAPI.kt +++ b/test/src/TestAPI.kt @@ -27,10 +27,14 @@ public fun verifyModel(vararg files: String, verifier: (DocumentationModule) -> addSources(files.toList()) } - val result = environment.processFiles { context, module, file -> - context.createDocumentationModule(module, file) - }.reduce {(aggregate, item) -> aggregate.merge(item) } - verifier(result) + val documentation = environment.withContext<DocumentationModule> { environment, module, context -> + val packageSet = environment.getSourceFiles().map { file -> + context.getPackageFragment(file)!!.fqName + }.toSet() + + context.createDocumentationModule(module, packageSet) + } + verifier(documentation) Disposer.dispose(environment) } diff --git a/test/src/model/PackageTest.kt b/test/src/model/PackageTest.kt index aa4bd088..b855ad7d 100644 --- a/test/src/model/PackageTest.kt +++ b/test/src/model/PackageTest.kt @@ -47,7 +47,7 @@ public class PackageTest { Test fun multipleFiles() { verifyModel("test/data/packages/dottedNamePackage.kt", "test/data/packages/simpleNamePackage.kt") { model -> assertEquals(2, model.members.count()) - with(model.members.elementAt(0)) { + with(model.members.single { it.name == "simple" }) { assertEquals(DocumentationNode.Kind.Package, kind) assertEquals("simple", name) assertEquals(DocumentationContent.Empty, doc) @@ -55,9 +55,8 @@ public class PackageTest { assertTrue(members.none()) assertTrue(links.none()) } - with(model.members.elementAt(1)) { + with(model.members.single { it.name == "dot.name" }) { assertEquals(DocumentationNode.Kind.Package, kind) - assertEquals("dot.name", name) assertEquals(DocumentationContent.Empty, doc) assertTrue(details.none()) assertTrue(members.none()) @@ -68,7 +67,7 @@ public class PackageTest { Test fun multipleFilesSamePackage() { verifyModel("test/data/packages/simpleNamePackage.kt", "test/data/packages/simpleNamePackage2.kt") { model -> - assertEquals(2, model.members.count()) + assertEquals(1, model.members.count()) with(model.members.elementAt(0)) { assertEquals(DocumentationNode.Kind.Package, kind) assertEquals("simple", name) @@ -77,16 +76,6 @@ public class PackageTest { assertTrue(members.none()) assertTrue(links.none()) } - // TODO: Looks like package fragments should be merged into package view in the model - // and here should be single member - with(model.members.elementAt(1)) { - assertEquals(DocumentationNode.Kind.Package, kind) - assertEquals("simple", name) - assertEquals(DocumentationContent.Empty, doc) - assertTrue(details.none()) - assertTrue(members.none()) - assertTrue(links.none()) - } } } }
\ No newline at end of file |