Checkpoint #290 - All tests passing

Author: Steve Ramage

src/main/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/SemanticDataRepository.kt

@@ -433,13 +433,17 @@ unit types. These options are documented in <a href="http://man7.org/linux/man-p
 
   fun getValidatorMap() : Map<Validator, OptionValueInformation> = validatorMap
 
-  val sectionNamesFromValidators: Set<String>
-    /**
-     * Return the section names from the validators.
-     *
-     * @return set
-     */
-    get() = Collections.unmodifiableSet(fileClassToSectionToKeyAndValidatorMap.keys)
+
+  /**
+   * Return the section names from the validators.
+   *
+   * @return set
+   */
+  fun getSectionNamesForSectionAndKey(filename: String): MutableSet<String> {
+    val fileClass = getFileClassForFilename(filename)
+
+    return Collections.unmodifiableSet(fileClassToSectionToKeyAndValidatorMap.getOrDefault(fileClass.fileClass, emptyMap()).keys)
+  }
 
 
   fun getValidatorForSectionAndKey(filename: String, sectionName: String, keyName: String) : Validator {

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/documentation/UnitFileDocumentationProviderTest.kt

@@ -1,8 +1,6 @@
 package net.sjrx.intellij.plugins.systemdunitfiles.documentation
 
 import com.intellij.lang.documentation.DocumentationProviderEx
-import com.intellij.psi.PsiElement
-import com.intellij.psi.impl.FakePsiElement
 import junit.framework.TestCase
 import net.sjrx.intellij.plugins.systemdunitfiles.AbstractUnitFileTest
 
@@ -215,8 +213,43 @@ class UnitFileDocumentationProviderTest : AbstractUnitFileTest() {
     val psiFile = setupFileInEditor("file.service", file)
 
     // Exercise SUT
-    val unknownSectionHeader = getAllSectionInFile(psiFile)[0]
-    val doc = sut.generateDoc(unknownSectionHeader, unknownSectionHeader)
+    val sectionHeader = getAllSectionInFile(psiFile)[0]
+    val doc = sut.generateDoc(sectionHeader, sectionHeader)
+
+    // Verification
+    TestCase.assertNotNull(doc)
+    TestCase.assertTrue(doc!!.length > 1)
+  }
+
+  fun testGenerateDocForKnownSectionReturnsSomeValidTextInNSpawnFile() {
+    // Fixture Setup
+    val file = """
+           [Network]
+           Private=true
+           """.trimIndent()
+    val psiFile = setupFileInEditor("file.nspawn", file)
+
+    // Exercise SUT
+    val section = getAllSectionInFile(psiFile)[0]
+    val doc = sut.generateDoc(section, section)
+
+    // Verification
+    TestCase.assertNotNull(doc)
+    TestCase.assertTrue(doc!!.length > 1)
+  }
+
+  fun testGenerateDocKnownKeySeparatorReturnsSomeValidTextInNSpawnFile() {
+    // Fixture Setup
+    val file = """
+           [Network]
+           Private=true
+           """.trimIndent()
+    val psiFile = setupFileInEditor("file.nspawn", file)
+
+    // Exercise SUT
+
+    val documentationKey = getAllKeysInFile(psiFile)[0]
+    val doc = sut.generateDoc(documentationKey, documentationKey)
 
     // Verification
     TestCase.assertNotNull(doc)

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/MissingRequiredKeyInspectionTest.kt

@@ -29,15 +29,15 @@ class MissingRequiredKeyInspectionTest : AbstractUnitFileTest() {
     assertSize(2, highlights)
   }
 
-  fun testServiceHasNoWarningsARequiredOptionInUnitSectionPresent() {
+  fun testServiceHasNoWarningsEnoughRequiredOptionsInUnitSectionArePresent() {
 
     // Fixture Setup
     // language="unit file (systemd)"
     val file = """
       # SPDX-License-Identifier: LGPL-2.1-or-later
       [Unit]
       Description=Daughter Service
-      SuccessAction=foo
+      SuccessAction=reboot
 
       [Service]
       Type=oneshot
@@ -358,4 +358,29 @@ class MissingRequiredKeyInspectionTest : AbstractUnitFileTest() {
     assertSize(0, highlights)
 
   }
+
+  fun testNSpawnFileHasNoWarningsWhenEmpty() {
+
+    // Fixture Setup
+    // language="unit file (systemd)"
+    val file = """
+      # SPDX-License-Identifier: LGPL-2.1-or-later
+      [Files]
+      
+
+      [Network]
+
+      [Exec]
+    """.trimIndent()
+
+    // Exercise SUT
+    setupFileInEditor("file.nspawn", file)
+    enableInspection(MissingRequiredKeyInspection::class.java)
+
+    val highlights = myFixture.doHighlighting()
+
+    // Verification
+    assertSize(0, highlights)
+  }
+
 }

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/inspections/UnknownKeyInSectionInspectionTest.kt

@@ -682,6 +682,44 @@ class UnknownKeyInSectionInspectionTest : AbstractUnitFileTest() {
     TestCase.assertEquals("BusName", highlightElement!!.text)
   }
 
+  fun testNSpawnFileTypeThrowsWarningWithKeyFromServiceFile() {
+    // Fixture Setup
+    val file = """
+           [Exec]
+           BusName=yes
+           """.trimIndent()
+    enableInspection(UnknownKeyInSectionInspection::class.java)
+    setupFileInEditor("some.nspawn", file)
+
+    // Exercise SUT
+    val highlights = myFixture.doHighlighting()
+
+    // Verification
+    assertSize(1, highlights)
+    val info = highlights[0]
+    TestCase.assertEquals(UnknownKeyInSectionInspection.INSPECTION_TOOL_TIP_TEXT, info!!.description)
+    TestCase.assertEquals(HighlightInfoType.WARNING, info.type)
+    val highlightElement = myFixture.file.findElementAt(info.getStartOffset())
+    TestCase.assertEquals("BusName", highlightElement!!.text)
+  }
+
+  fun testNSpawnFileTypeHasNoWarningsWithKnownKey() {
+    // Fixture Setup
+    val file = """
+           [Timer]
+           RandomizedDelaySec=50
+           """.trimIndent()
+    enableInspection(UnknownKeyInSectionInspection::class.java)
+    setupFileInEditor("some.timer", file)
+
+    // Exercise SUT
+    val highlights = myFixture.doHighlighting()
+
+    // Verification
+    assertEmpty(highlights)
+  }
+
+
   fun testSomeNewKeysFromSystemdV240HasNoWarnings() {
     // Fixture Setup
     val file = """

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/SemanticDataDocumentationCompletionTest.kt

@@ -19,7 +19,7 @@ class SemanticDataDocumentationCompletionTest : AbstractUnitFileTest() {
     val code: MutableSet<String> = TreeSet()
 
     for (fileClass in FileClass.entries) {
-      for (sectionName in sdr.sectionNamesFromValidators) {
+      for (sectionName in sdr.getSectionNamesForFile(fileClass.fileClass)) {
         // TODO fix me
         for (keyName in sdr.getAllowedKeywordsInSectionFromValidators("file.service", sectionName)) {
           code.add("$sectionName.$keyName")

src/test/kotlin/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/optionvalues/OptionValueTest.kt

@@ -15,7 +15,7 @@ class OptionValueTest : AbstractUnitFileTest() {
     var totalMissingValidators = 0
     var totalFoundValidators = 0
     for (fileClass in FileClass.entries) {
-      for (sectionName in SemanticDataRepository.instance.sectionNamesFromValidators) {
+      for (sectionName in SemanticDataRepository.instance.getSectionNamesForFile(fileClass.fileClass)) {
         for (key in SemanticDataRepository.instance.getAllowedKeywordsInSectionFromValidators("file.service", sectionName)) {
 
           // TODO fix file.service
@@ -40,5 +40,9 @@ class OptionValueTest : AbstractUnitFileTest() {
       assertEquals("Number of missing validators is too high at ${totalMissingValidators} vs. found ${totalFoundValidators}", sortedList, "")
     }
 
+    if (totalFoundValidators == 0) {
+      fail("There are no found validators, something is wrong")
+    }
+
   }
 }