Fix : Target class creation

.gitignore

@@ -19,6 +19,7 @@ default.properties
 *.orig
 Thumbs.db
 /dolibarr_genesis.mp4
+.phpunit.result.cache
 # Log files
 dolibarr_install.log
 upgrade.log

htdocs/webhook/class/target.class.php

@@ -228,9 +228,12 @@ class Target extends CommonObject
 		if ($resultcreate <= 0) {
 			return $resultcreate;
 		}
-		$resultvalidate = $this->validate($user, $notrigger);
 
-		return $resultvalidate;
+		$resultvalidate = $this->validate($user, $notrigger);
+		if ($resultvalidate <= 0) {
+			return $resultvalidate;
+		}
+		return $this->id;
 	}
 
 	/**
@@ -891,10 +894,8 @@ class Target extends CommonObject
 	 */
 	public function initAsSpecimen()
 	{
-		// Set here init that are not commonf fields
+		$this->url = "https://thisisunurl";
-		// $this->property1 = ...
+		$this->trigger_codes = "ThisIsATestCode";
-		// $this->property2 = ...
-
 		$this->initAsSpecimenCommon();
 	}
 

test/phpunit/TargetTest.php

@@ -0,0 +1,229 @@
+<?php
+/* Copyright (C) 2007-2017 Laurent Destailleur  <eldy@users.sourceforge.net>
+ * Copyright (C) 2022 Alice Adminson <aadminson@example.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+/**
+ * \file    test/phpunit/TargetTest.php
+ * \ingroup webhook
+ * \brief   PHPUnit test for Target class.
+ */
+
+global $conf, $user, $langs, $db;
+//define('TEST_DB_FORCE_TYPE','mysql');	// This is to force using mysql driver
+
+//require_once 'PHPUnit/Autoload.php';
+require_once dirname(__FILE__).'/../../htdocs/master.inc.php';
+require_once dirname(__FILE__).'/../../htdocs/webhook/class/target.class.php';
+
+if (empty($user->id)) {
+	print "Load permissions for admin user nb 1\n";
+	$user->fetch(1);
+	$user->getrights();
+}
+$conf->global->MAIN_DISABLE_ALL_MAILS = 1;
+
+$langs->load("main");
+
+
+/**
+ * Class TargetTest
+ *
+ * @backupGlobals disabled
+ * @backupStaticAttributes enabled
+ * @remarks	backupGlobals must be disabled to have db,conf,user and lang not erased.
+ */
+class TargetTest extends PHPUnit\Framework\TestCase
+{
+	protected $savconf;
+	protected $savuser;
+	protected $savlangs;
+	protected $savdb;
+
+	/**
+	 * Constructor
+	 * We save global variables into local variables
+	 *
+	 * @return TargetTest
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		//$this->sharedFixture
+		global $conf, $user, $langs, $db;
+		$this->savconf = $conf;
+		$this->savuser = $user;
+		$this->savlangs = $langs;
+		$this->savdb = $db;
+
+		print __METHOD__." db->type=".$db->type." user->id=".$user->id;
+		//print " - db ".$db->db;
+		print "\n";
+	}
+
+	/**
+	 * Global test setup
+	 *
+	 * @return void
+	 */
+	public static function setUpBeforeClass() : void
+	{
+		global $conf, $user, $langs, $db;
+		$db->begin(); // This is to have all actions inside a transaction even if test launched without suite.
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Unit test setup
+	 *
+	 * @return void
+	 */
+	protected function setUp() : void
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Unit test teardown
+	 *
+	 * @return void
+	 */
+	protected function tearDown() : void
+	{
+		print __METHOD__."\n";
+	}
+
+	/**
+	 * Global test teardown
+	 *
+	 * @return void
+	 */
+	public static function tearDownAfterClass() : void
+	{
+		global $conf, $user, $langs, $db;
+		$db->rollback();
+
+		print __METHOD__."\n";
+	}
+
+
+	/**
+	 * testTargetCreate
+	 *
+	 * @return int
+	 */
+	public function testTargetCreate()
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Target($this->savdb);
+		$localobject->initAsSpecimen();
+		$result = $localobject->create($user);
+
+		print __METHOD__." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+
+		return $result;
+	}
+
+	/**
+	 * testTargetFetch
+	 *
+	 * @param   int	$id Id of object
+	 * @return  Target
+	 *
+	 * @depends	testTargetCreate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testTargetFetch($id)
+	{
+		global $conf,$user,$langs,$db;
+		$conf=$this->savconf;
+		$user=$this->savuser;
+		$langs=$this->savlangs;
+		$db=$this->savdb;
+
+		$localobject=new Target($this->savdb);
+		$result=$localobject->fetch($id);
+
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$id." result=".$result."\n";
+		return $localobject;
+	}
+
+	/**
+	 * testTargetUpdate
+	 * @param  Target $localobject Target
+	 * @return int
+	 *
+	 * @depends	testTargetFetch
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testTargetUpdate($localobject)
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject->note_private='New note private after update';
+		$result = $localobject->update($user);
+
+		$this->assertLessThan($result, 0);
+		print __METHOD__." id=".$localobject->id." result=".$result."\n";
+
+		return $result;
+	}
+
+	/**
+	 * testTargetDelete
+	 *
+	 * @param	int		$id		Id of object
+	 * @return	int
+	 *
+	 * @depends	testTargetUpdate
+	 * The depends says test is run only if previous is ok
+	 */
+	public function testTargetDelete($id)
+	{
+		global $conf, $user, $langs, $db;
+		$conf = $this->savconf;
+		$user = $this->savuser;
+		$langs = $this->savlangs;
+		$db = $this->savdb;
+
+		$localobject = new Target($this->savdb);
+		$result = $localobject->fetch($id);
+		$result = $localobject->delete($user);
+
+		print __METHOD__." id=".$id." result=".$result."\n";
+		$this->assertLessThan($result, 0);
+		return $result;
+	}
+}