Moar support

Author: Steve Ramage

src/main/resources/net/sjrx/intellij/plugins/systemdunitfiles/semanticdata/undocumentedSectionToKeywordMap.json

@@ -1,4 +1,13 @@
 {
+  "nspawn": {
+    "Files": {
+      "PrivateUsersChown":{
+        "reason": "moved",
+        "replacedWithKey": "PrivateUsersOwnership",
+        "documentationLink": "https://www.freedesktop.org/software/systemd/man/latest/systemd.nspawn.html#PrivateUsersOwnership="
+      }
+    }
+  },
   "unit": {
     "Mount": {
       "BlockIOAccounting": {

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

@@ -5,6 +5,7 @@ import net.sjrx.intellij.plugins.systemdunitfiles.AbstractUnitFileTest
 
 class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   fun testNonDeprecatedOptionDoesNotThrowError() {
+    // language="unit file (systemd)"
     val file = """
            [Service]
            ExecStart=/bin/bash
@@ -23,6 +24,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testUnknownOptionDoesNotThrowError() {
+    // language="unit file (systemd)"
     val file = """
            [Service]
            SomeOption=/bin/bash
@@ -41,6 +43,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testSingleExampleThrowsWarning() {
+    // language="unit file (systemd)"
     val file = """
            [Service]
            MemoryLimit=8
@@ -64,6 +67,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testAllDocumentedDeprecatedOptionsInServiceAsOfV240ThrowsWarning() {
+    // language="unit file (systemd)"
     val file = """
            [Service]
            CPUShares=52
@@ -91,6 +95,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testAllDocumentedDeprecatedOptionsInMountAsOfV240ThrowsWarning() {
+    // language="unit file (systemd)"
     val file = """
            [Mount]
            CPUShares=52
@@ -118,6 +123,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testAllDocumentedDeprecatedOptionsInSocketAsOfV240ThrowsWarning() {
+    // language="unit file (systemd)"
     val file = """
            [Socket]
            CPUShares=52
@@ -145,6 +151,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testAllDocumentedDeprecatedOptionsInSwapAsOfV240ThrowsWarning() {
+    // language="unit file (systemd)"
     val file = """
            [Swap]
            CPUShares=52
@@ -172,6 +179,7 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
   }
 
   fun testAllDocumentedDeprecatedOptionsInSliceAsOfV240ThrowsWarning() {
+    // language="unit file (systemd)"
     val file = """
            [Slice]
            CPUShares=52
@@ -197,4 +205,29 @@ class DeprecatedOptionsInspectionTest : AbstractUnitFileTest() {
     // Verification
     assertSize(9, highlights)
   }
+
+  fun testSingleExampleInNSpawnFileThrowsWarning() {
+
+    // language="unit file (systemd)"
+    val file = """
+           [Files]
+           PrivateUsersChown=true
+           """.trimIndent()
+
+    // Exercise SUT
+    setupFileInEditor("file.nspawn", file)
+    enableInspection(DeprecatedOptionsInspection::class.java)
+
+    // Verification
+    val highlights = myFixture.doHighlighting()
+
+
+    // Verification
+    assertSize(1, highlights)
+    val info = highlights[0]
+    TestCase.assertEquals("'PrivateUsersChown' in section 'Files' has been renamed to 'PrivateUsersOwnership'", info!!.description)
+    val highlightElement = myFixture.file.findElementAt(info.getStartOffset())
+    TestCase.assertNotNull(highlightElement)
+    TestCase.assertEquals("PrivateUsersChown", highlightElement!!.text)
+  }
 }

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

@@ -9,9 +9,9 @@ class SemanticDataDocumentationCompletionTest : AbstractUnitFileTest() {
     val doc: MutableSet<String> = TreeSet()
 
     for (fileClass in FileClass.entries) {
-      for (sectionName in sdr.getSectionNamesForFile(fileClass.name)) {
+      for (sectionName in sdr.getSectionNamesForFile(fileClass.fileClass)) {
         for (keyName in sdr.getDocumentedKeywordsInSection(fileClass, sectionName)) {
-          doc.add("$sectionName.$keyName")
+          doc.add("${fileClass.fileClass}.$sectionName.$keyName")
         }
       }
     }
@@ -20,12 +20,13 @@ class SemanticDataDocumentationCompletionTest : AbstractUnitFileTest() {
     for (fileClass in FileClass.entries) {
       for (sectionName in sdr.getSectionNamesForFile(fileClass.fileClass)) {
         for (keyName in sdr.getAllowedKeywordsInSectionFromValidators(fileClass, sectionName)) {
-          code.add("$sectionName.$keyName")
+          code.add("${fileClass.fileClass}.$sectionName.$keyName")
         }
       }
     }
-    println(doc.size)
-    println(code.size)
+
+    println(doc.size) //0
+    println(code.size) //1131
     val codeButNotDoc: MutableSet<String> = TreeSet(code)
     val docButNotCode: MutableSet<String> = TreeSet(doc)
     codeButNotDoc.removeAll(doc)

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

@@ -35,7 +35,7 @@ class OptionValueTest : AbstractUnitFileTest() {
 
     println("Missing:$totalMissingValidators")
     println("Found:$totalFoundValidators")
-    if (totalMissingValidators > 560) {
+    if (totalMissingValidators > 611) {
       assertEquals("Number of missing validators is too high at ${totalMissingValidators} vs. found ${totalFoundValidators}", sortedList, "")
     }