Merge pull request #555 from smeup/bugfix/printer-file-precedence

Bugfix/printer file precedence
smeup · Jul 1, 2024 · 9352055 · 9352055
2 parents 4abb66b + 1d7bbaa
commit 9352055
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 9 deletions.
diff --git a/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt b/rpgJavaInterpreter-core/src/main/kotlin/com/smeup/rpgparser/parsing/parsetreetoast/misc.kt
@@ -194,6 +194,15 @@ private fun MutableMap<String, DataDefinition>.addIfNotPresent(dataDefinition: D
 
 private fun FileDefinition.loadMetadata(): FileMetadata {
     return when {
+        fileType == FileType.PRINTER -> {
+            FileMetadata(
+                name = this.name,
+                tableName = this.name,
+                recordFormat = this.internalFormatName ?: this.name,
+                fields = emptyList(),
+                accessFields = emptyList()
+            )
+        }
         (fileType == FileType.DB || MainExecutionContext.getConfiguration().dspfConfig == null) -> {
             val reloadConfig = MainExecutionContext.getConfiguration()
                 .reloadConfig
@@ -215,15 +224,6 @@ private fun FileDefinition.loadMetadata(): FileMetadata {
                 error("Not found metadata for $this", error)
             }.getOrNull() ?: error("Not found metadata for $this")
         }
-        fileType == FileType.PRINTER -> {
-            FileMetadata(
-                name = this.name,
-                tableName = this.name,
-                recordFormat = this.internalFormatName ?: this.name,
-                fields = emptyList(),
-                accessFields = emptyList()
-            )
-        }
         else -> error("Unhandled file type $fileType")
     }
 }

diff --git a/...avaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT50FileAccess1Test.kt b/...avaInterpreter-core/src/test/kotlin/com/smeup/rpgparser/smeup/MULANGT50FileAccess1Test.kt
@@ -44,4 +44,16 @@ open class MULANGT50FileAccess1Test : MULANGTTest() {
         val expected = listOf("ok")
         assertEquals(expected, "smeup/MUDRNRAPU00220".outputOf(configuration = smeupConfig))
     }
+
+    /**
+     * Printer file with O-specs with no DSPF config
+     * @see #LS24002987
+     */
+    @Test
+    fun executeMUDRNRAPU00220WithoutDSPF() {
+        val expected = listOf("ok")
+        val mockSmeupConfig = smeupConfig.copy()
+        mockSmeupConfig.dspfConfig = null
+        assertEquals(expected, "smeup/MUDRNRAPU00220".outputOf(configuration = mockSmeupConfig))
+    }
 }