From: Umherirrender <umherirrender_de.wp@web.de>
Date: Tue, 29 May 2018 19:13:17 +0000 (+0200)
Subject: Call Database::timestamp in some tests
X-Git-Tag: 1.34.0-rc.0~5246^2
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/journal.php?a=commitdiff_plain;h=1cee41b9dc4966dde5f62dbf5c4ef395b2ccc6db;p=lhc%2Fweb%2Fwiklou.git

Call Database::timestamp in some tests

Also add non-optional database fields to insert.
The fields are defined with a default in mysql,
but not in postgres or oracle.

Bug: T195807
Change-Id: I201638e3438cb0e5004f8da121e64a770e6a8fca
---

diff --git a/tests/phpunit/includes/api/ApiEditPageTest.php b/tests/phpunit/includes/api/ApiEditPageTest.php
index c196338915..3909b305e5 100644
--- a/tests/phpunit/includes/api/ApiEditPageTest.php
+++ b/tests/phpunit/includes/api/ApiEditPageTest.php
@@ -733,7 +733,7 @@ class ApiEditPageTest extends ApiTestCase {
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->update(
 			'revision',
-			[ 'rev_timestamp' => wfTimestamp( TS_MW, time() - 86400 ) ],
+			[ 'rev_timestamp' => $dbw->timestamp( time() - 86400 ) ],
 			[ 'rev_id' => $revId1 ],
 			__METHOD__
 		);
diff --git a/tests/phpunit/maintenance/deleteAutoPatrolLogsTest.php b/tests/phpunit/maintenance/deleteAutoPatrolLogsTest.php
index cd68fa50dc..19e93dedc4 100644
--- a/tests/phpunit/maintenance/deleteAutoPatrolLogsTest.php
+++ b/tests/phpunit/maintenance/deleteAutoPatrolLogsTest.php
@@ -27,6 +27,7 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 	}
 
 	private function insertLoggingData() {
+		$dbw = wfGetDB( DB_MASTER );
 		$logs = [];
 
 		// Manual patrolling
@@ -35,7 +36,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'patrol',
 			'log_user' => 7251,
 			'log_params' => '',
-			'log_timestamp' => 20041223210426
+			'log_timestamp' => $dbw->timestamp( '20041223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Autopatrol #1
@@ -44,7 +47,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'autopatrol',
 			'log_user' => 7252,
 			'log_params' => '',
-			'log_timestamp' => 20051223210426
+			'log_timestamp' => $dbw->timestamp( '20051223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Block
@@ -53,7 +58,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'block',
 			'log_user' => 7253,
 			'log_params' => '',
-			'log_timestamp' => 20061223210426
+			'log_timestamp' => $dbw->timestamp( '20061223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Very old/ invalid patrol
@@ -62,7 +69,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'patrol',
 			'log_user' => 7253,
 			'log_params' => 'nanana',
-			'log_timestamp' => 20061223210426
+			'log_timestamp' => $dbw->timestamp( '20061223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Autopatrol #2
@@ -71,7 +80,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'autopatrol',
 			'log_user' => 7254,
 			'log_params' => '',
-			'log_timestamp' => 20071223210426
+			'log_timestamp' => $dbw->timestamp( '20071223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Autopatrol #3 old way
@@ -80,7 +91,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'patrol',
 			'log_user' => 7255,
 			'log_params' => serialize( [ '6::auto' => true ] ),
-			'log_timestamp' => 20081223210426
+			'log_timestamp' => $dbw->timestamp( '20081223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Manual patrol #2 old way
@@ -89,7 +102,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'patrol',
 			'log_user' => 7256,
 			'log_params' => serialize( [ '6::auto' => false ] ),
-			'log_timestamp' => 20091223210426
+			'log_timestamp' => $dbw->timestamp( '20091223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Autopatrol #4 very old way
@@ -98,7 +113,9 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'patrol',
 			'log_user' => 7257,
 			'log_params' => "9227851\n0\n1",
-			'log_timestamp' => 20081223210426
+			'log_timestamp' => $dbw->timestamp( '20081223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
 		// Manual patrol #3 very old way
@@ -107,10 +124,12 @@ class DeleteAutoPatrolLogsTest extends MaintenanceBaseTestCase {
 			'log_action' => 'patrol',
 			'log_user' => 7258,
 			'log_params' => "9227851\n0\n0",
-			'log_timestamp' => 20091223210426
+			'log_timestamp' => $dbw->timestamp( '20091223210426' ),
+			'log_namespace' => NS_MAIN,
+			'log_title' => 'DeleteAutoPatrolLogs',
 		];
 
-		wfGetDB( DB_MASTER )->insert( 'logging', $logs );
+		$dbw->insert( 'logging', $logs );
 	}
 
 	public function runProvider() {