From 22b2fcf74207220c65ae57125548dfb4c55ac646 Mon Sep 17 00:00:00 2001
From: Jan-Hendrik Frintrop <jhfrintrop@users.noreply.github.com>
Date: Tue, 18 Jul 2017 12:07:15 +0200
Subject: [PATCH] Change default deb package name (#19)

* Change default deb package name

Changed default deb package name to `"{$name}_{$version}_{$arch}.deb"` since this is what normally would be generated.

* Fix tests for default deb name

The tests with default package name still expected the old version of the name.

* Fixed tests

Tests tried to get the Control via `$this->getControl()` which obviously failed.
---
 src/wdm/debian/Packager.php       |  6 +++++-
 tests/wdm/debian/PackagerTest.php | 16 ++++++++++++++--
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/wdm/debian/Packager.php b/src/wdm/debian/Packager.php
index 1eee342..b291e63 100644
--- a/src/wdm/debian/Packager.php
+++ b/src/wdm/debian/Packager.php
@@ -196,7 +196,11 @@ class Packager
     public function build($debPackageName = false)
     {
         if (!$debPackageName) {
-            $debPackageName = basename($this->getOutputPath() . ".deb");
+            $control = $this->getControl();
+            $name = $control['Package'];
+            $version = $control['Version'];
+            $arch = $control['Architecture'];
+            $debPackageName = "{$name}_{$version}_{$arch}.deb";
         }
 
         $command = "dpkg -b {$this->getOutputPath()} {$debPackageName}";
diff --git a/tests/wdm/debian/PackagerTest.php b/tests/wdm/debian/PackagerTest.php
index c10f4ca..6490775 100644
--- a/tests/wdm/debian/PackagerTest.php
+++ b/tests/wdm/debian/PackagerTest.php
@@ -57,8 +57,14 @@ class PackagerTest extends \PHPUnit_Framework_TestCase
 
         $this->object->run();
         $command = $this->object->build();
+        
+        $control = $this->object->getControl();
+        $name = $control['Package'];
+        $version = $control['Version'];
+        $arch = $control['Architecture'];
+        $debPackageName = "{$name}_{$version}_{$arch}.deb";
 
-        $this->assertEquals("dpkg -b vfs://root/tmp tmp.deb", $command);
+        $this->assertEquals("dpkg -b vfs://root/tmp {$debPackageName}", $command);
     }
 
     public function testCreateDebWhenOutputFolderIsMissing()
@@ -72,8 +78,14 @@ class PackagerTest extends \PHPUnit_Framework_TestCase
 
         $this->object->run();
         $command = $this->object->build();
+        
+        $control = $this->object->getControl();
+        $name = $control['Package'];
+        $version = $control['Version'];
+        $arch = $control['Architecture'];
+        $debPackageName = "{$name}_{$version}_{$arch}.deb";
 
-        $this->assertEquals("dpkg -b vfs://root/tmp tmp.deb", $command);
+        $this->assertEquals("dpkg -b vfs://root/tmp {$debPackageName}", $command);
     }
 
     public function testCreateDebPackageWithAnotherName()