tests(modules.symlinkScript): update tests for symlinkScript

check that binaries work, and also use our new testing lib.

Author: BirdeeHub

modules/symlinkScript/checks/filesToPatch.nix

@@ -1,75 +1,72 @@
 {
-  pkgs,
   self,
+  pkgs,
+  tlib,
   ...
 }:
 
 let
-  # Create a dummy package with a desktop file that references itself
-  dummyPackage =
-    (pkgs.runCommand "dummy-app" { } ''
-      mkdir -p $out/bin
-      mkdir -p $out/share/applications
+  inherit (tlib) isFile fileContains test;
+in
+test "filesToPatch-test" {
+  regular = let
+    wrappedPackage = self.lib.wrapPackage {
+      inherit pkgs;
+      # Create a dummy package with a desktop file that references itself
+      package = (pkgs.runCommand "dummy-app" { } ''
+        mkdir -p $out/bin
+        mkdir -p $out/share/applications
 
-      # Create a simple executable
-      cat > $out/bin/dummy-app <<'EOF'
-      #!/bin/sh
-      echo "Hello from dummy app"
-      EOF
-      chmod +x $out/bin/dummy-app
+        cat > $out/bin/dummy-app <<'EOF'
+        #!/bin/sh
+        echo "Hello from dummy app"
+        EOF
+        chmod +x $out/bin/dummy-app
 
-      # Create a desktop file that references the package path
-      cat > $out/share/applications/dummy-app.desktop <<EOF
-      [Desktop Entry]
-      Name=Dummy App
-      Exec=$out/bin/dummy-app
-      Icon=$out/share/icons/dummy-app.png
-      Type=Application
-      EOF
-    '')
-    // {
-      meta.mainProgram = "dummy-app";
+        cat > $out/share/applications/dummy-app.desktop <<EOF
+        [Desktop Entry]
+        Name=Dummy App
+        Exec=$out/bin/dummy-app
+        Icon=$out/share/icons/dummy-app.png
+        Type=Application
+        EOF
+      '')
+      // {
+        meta.mainProgram = "dummy-app";
+      };
     };
-
-  # Wrap the package
-  wrappedPackage = self.lib.wrapPackage {
-    inherit pkgs;
-    package = dummyPackage;
-  };
-
-in
-pkgs.runCommand "filesToPatch-test"
-  {
-    originalPath = "${dummyPackage}";
+    originalPath = "${wrappedPackage.configuration.package}";
     wrappedPath = "${wrappedPackage}";
-  }
-  ''
-    echo "Testing filesToPatch functionality..."
-    echo "Original package path: $originalPath"
-    echo "Wrapped package path: $wrappedPath"
-
-    # Read the desktop file
-    desktopFile="${wrappedPackage}/share/applications/dummy-app.desktop"
-
-    if [ ! -f "$desktopFile" ]; then
-      echo "FAIL: Desktop file not found at $desktopFile"
-      exit 1
-    fi
-
-    # The desktop file should NOT contain references to the original package
-    if grep -qF "$originalPath" "$desktopFile"; then
-      echo "FAIL: Desktop file still contains reference to original package"
-      echo "Original path: $originalPath"
-      exit 1
-    fi
-
-    # The desktop file SHOULD contain references to the wrapped package
-    if ! grep -qF "$wrappedPath" "$desktopFile"; then
-      echo "FAIL: Desktop file does not contain reference to wrapped package"
-      echo "Wrapped path: $wrappedPath"
-      exit 1
-    fi
-
-    echo "SUCCESS: Desktop file was properly patched"
-    touch $out
-  ''
+    desktopFile = "${wrappedPackage}/share/applications/dummy-app.desktop";
+  in {
+    desktopFileExists = isFile desktopFile;
+    noOriginalReferences = {
+      cond = ''! grep -qF '${originalPath}' '${desktopFile}' '';
+      msg = "Desktop file still contains reference to original package. Original path: ${originalPath}";
+    };
+    containsWrappedReferences = fileContains desktopFile wrappedPath;
+  };
+  binary = let
+    wrappedPackage = self.lib.wrapPackage [ { inherit pkgs; }
+      ({ wlib, pkgs, ... }: {
+        filesToPatch = [ "bin/fileToBePatched" ];
+        package = wlib.wrapPackage [ { inherit pkgs; }
+          ({pkgs, ... }: {
+            config.package = pkgs.hello;
+            config.wrapperImplementation = "binary";
+            config.wrapperVariants.fileToBePatched.exePath = "bin/hello"; # <- not the main one, the outer wrapper module will thus not wrap it automatically.
+            config.flags."--greeting" = "Hello, ${placeholder "out"}"; # <- maybe stick a \0 at the end here for good measure? Just in case it didnt already have null bytes? IDK?
+          })
+        ];
+      })
+    ];
+    originalPath = "${wrappedPackage.configuration.package}";
+    wrappedPath = "${wrappedPackage}/bin/fileToBePatched";
+  in {
+    noOriginalReferences = {
+      cond = ''! grep -qF '${originalPath}' '${wrappedPath}' '';
+      msg = "Desktop file still contains reference to original package. Original path: ${originalPath}";
+    };
+    containsWrappedReferences = fileContains wrappedPath wrappedPackage;
+  };
+}