Fix broken MacFileAssociationsTest

Author: alexeysemenyukoracle

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacFileAssociationBuilder.java

@@ -42,11 +42,11 @@ MacFileAssociation create(FileAssociation fa) throws ConfigException {
                 Optional.ofNullable(cfBundleTypeName).orElse(DEFAULTS.cfBundleTypeName),
                 Optional.ofNullable(cfBundleTypeRole).orElse(DEFAULTS.cfBundleTypeRole),
                 Optional.ofNullable(lsHandlerRank).orElse(DEFAULTS.lsHandlerRank),
-                Optional.ofNullable(lsTypeIsPackage).orElse(DEFAULTS.lsTypeIsPackage),
+                Optional.ofNullable(lsTypeIsPackage),
                 Optional.ofNullable(nsDocumentClass),
                 Optional.ofNullable(nsPersistentStoreTypeKey),
-                Optional.ofNullable(lsSupportsOpeningDocumentsInPlace).orElse(DEFAULTS.lsSupportsOpeningDocumentsInPlace),
-                Optional.ofNullable(uiSupportsDocumentBrowser).orElse(DEFAULTS.uiSupportsDocumentBrowser),
+                Optional.ofNullable(lsSupportsOpeningDocumentsInPlace),
+                Optional.ofNullable(uiSupportsDocumentBrowser),
                 Optional.ofNullable(utTypeConformsTo).orElse(DEFAULTS.utTypeConformsTo),
                 Optional.ofNullable(nsExportableTypes).orElse(DEFAULTS.nsExportableTypes));
 
@@ -118,9 +118,6 @@ MacFileAssociationBuilder nsExportableTypes(List<String> v) {
             .lsHandlerRank("Owner")
             .cfBundleTypeRole("Editor")
             .cfBundleTypeName("")
-            .lsTypeIsPackage(false)
-            .lsSupportsOpeningDocumentsInPlace(false)
-            .uiSupportsDocumentBrowser(false)
             .utTypeConformsTo(List.of("public.data"))
             .nsExportableTypes(List.of());
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/MacPackagingPipeline.java

@@ -27,7 +27,7 @@
 import static jdk.jpackage.internal.ApplicationImageUtils.createWriteAppImageFileAction;
 import static jdk.jpackage.internal.util.PListWriter.writeArray;
 import static jdk.jpackage.internal.util.PListWriter.writeBoolean;
-import static jdk.jpackage.internal.util.PListWriter.writeBooleanIf;
+import static jdk.jpackage.internal.util.PListWriter.writeBooleanOptional;
 import static jdk.jpackage.internal.util.PListWriter.writeDict;
 import static jdk.jpackage.internal.util.PListWriter.writeKey;
 import static jdk.jpackage.internal.util.PListWriter.writeString;
@@ -389,9 +389,9 @@ private static void addFaToCFBundleDocumentTypes(XMLStreamWriter xml,
         writeStringOptional(xml, "NSPersistentStoreTypeKey", fa.nsPersistentStoreTypeKey());
         writeStringOptional(xml, "NSDocumentClass", fa.nsDocumentClass());
         writeBoolean(xml, "LSIsAppleDefaultForType", true);
-        writeBooleanIf(xml, "LSTypeIsPackage", fa.lsTypeIsPackage(), true);
-        writeBooleanIf(xml, "LSSupportsOpeningDocumentsInPlace", fa.lsSupportsOpeningDocumentsInPlace(), true);
-        writeBooleanIf(xml, "UISupportsDocumentBrowser", fa.uiSupportsDocumentBrowser(), true);
+        writeBooleanOptional(xml, "LSTypeIsPackage", fa.lsTypeIsPackage());
+        writeBooleanOptional(xml, "LSSupportsOpeningDocumentsInPlace", fa.lsSupportsOpeningDocumentsInPlace());
+        writeBooleanOptional(xml, "UISupportsDocumentBrowser", fa.uiSupportsDocumentBrowser());
         faWriteIcon(xml, "CFBundleTypeIconFile", fa);
     }
 

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/model/MacFileAssociationMixin.java

@@ -35,25 +35,25 @@ public interface MacFileAssociationMixin {
 
     String lsHandlerRank();
 
-    boolean lsTypeIsPackage();
+    Optional<Boolean> lsTypeIsPackage();
 
     Optional<String> nsDocumentClass();
 
     Optional<String> nsPersistentStoreTypeKey();
 
-    boolean lsSupportsOpeningDocumentsInPlace();
+    Optional<Boolean> lsSupportsOpeningDocumentsInPlace();
 
-    boolean uiSupportsDocumentBrowser();
+    Optional<Boolean> uiSupportsDocumentBrowser();
 
     List<String> utTypeConformsTo();
 
     List<String> nsExportableTypes();
 
     record Stub(String cfBundleTypeName, String cfBundleTypeRole,
-            String lsHandlerRank, boolean lsTypeIsPackage, Optional<String> nsDocumentClass,
+            String lsHandlerRank, Optional<Boolean> lsTypeIsPackage, Optional<String> nsDocumentClass,
             Optional<String> nsPersistentStoreTypeKey,
-            boolean lsSupportsOpeningDocumentsInPlace,
-            boolean uiSupportsDocumentBrowser, List<String> utTypeConformsTo,
+            Optional<Boolean> lsSupportsOpeningDocumentsInPlace,
+            Optional<Boolean> uiSupportsDocumentBrowser, List<String> utTypeConformsTo,
             List<String> nsExportableTypes) implements MacFileAssociationMixin {
 
     }

src/jdk.jpackage/macosx/classes/jdk/jpackage/internal/util/PListWriter.java

@@ -41,10 +41,10 @@ public static void writeBoolean(XMLStreamWriter xml, String key, boolean value)
         xml.writeEmptyElement(Boolean.toString(value));
     }
 
-    public static void writeBooleanIf(XMLStreamWriter xml, String key, boolean value, boolean expectedValue)
+    public static void writeBooleanOptional(XMLStreamWriter xml, String key, Optional<Boolean> value)
             throws XMLStreamException {
-        if (expectedValue == value) {
-            writeBoolean(xml, key, value);
+        if (value.isPresent()) {
+            writeBoolean(xml, key, value.orElseThrow());
         }
     }