Update to Drupal 8.2.0. For more information, see https://www.drupal.org/project/drupal/releases/8.2.0

core/modules/datetime/datetime.module

@@ -39,7 +39,7 @@ function datetime_help($route_name, RouteMatchInterface $route_match) {
       $output .= '<dd>' . t('Dates can be displayed using the <em>Plain</em> or the <em>Default</em> formatter. The <em>Plain</em> formatter displays the date in the <a href="http://en.wikipedia.org/wiki/ISO_8601">ISO 8601</a> format. If you choose the <em>Default</em> formatter, you can choose a format from a predefined list that can be managed on the <a href=":date_format_list">Date and time formats</a> page.', array(':date_format_list' => \Drupal::url('entity.date_format.collection'))) . '</dd>';
       $output .= '</dl>';
       return $output;
-    }
+  }
 }
 
 /**

core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeDefaultFormatter.php

@@ -86,7 +86,7 @@ class DateTimeDefaultFormatter extends DateTimeFormatterBase {
    */
   protected function formatDate($date) {
     $format_type = $this->getSetting('format_type');
-    $timezone = $this->getSetting('timezone_override');
+    $timezone = $this->getSetting('timezone_override') ?: $date->getTimezone()->getName();
     return $this->dateFormatter->format($date->getTimestamp(), $format_type, '', $timezone != '' ? $timezone : NULL);
   }
 

core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimeFormatterBase.php

@@ -9,6 +9,7 @@ use Drupal\Core\Field\FieldDefinitionInterface;
 use Drupal\Core\Field\FormatterBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 
@@ -140,7 +141,14 @@ abstract class DateTimeFormatterBase extends FormatterBase implements ContainerF
    *   A DrupalDateTime object.
    */
   protected function setTimeZone(DrupalDateTime $date) {
-    $date->setTimeZone(timezone_open(drupal_get_user_timezone()));
+    if ($this->getFieldSetting('datetime_type') === DateTimeItem::DATETIME_TYPE_DATE) {
+      // A date without time has no timezone conversion.
+      $timezone = DATETIME_STORAGE_TIMEZONE;
+    }
+    else {
+      $timezone = drupal_get_user_timezone();
+    }
+    $date->setTimeZone(timezone_open($timezone));
   }
 
   /**

core/modules/datetime/src/Plugin/Field/FieldFormatter/DateTimePlainFormatter.php

@@ -3,6 +3,7 @@
 namespace Drupal\datetime\Plugin\Field\FieldFormatter;
 
 use Drupal\Core\Field\FieldItemListInterface;
+use Drupal\datetime\Plugin\Field\FieldType\DateTimeItem;
 
 /**
  * Plugin implementation of the 'Plain' formatter for 'datetime' fields.
@@ -33,8 +34,6 @@ class DateTimePlainFormatter extends DateTimeFormatterBase {
           // A date without time will pick up the current time, use the default.
           datetime_date_default_time($date);
         }
-        else {
-        }
         $this->setTimeZone($date);
 
         $output = $this->formatDate($date);
@@ -56,7 +55,7 @@ class DateTimePlainFormatter extends DateTimeFormatterBase {
    * {@inheritdoc}
    */
   protected function formatDate($date) {
-    $format = $this->getFieldSetting('datetime_type') == 'date' ? DATETIME_DATE_STORAGE_FORMAT : DATETIME_DATETIME_STORAGE_FORMAT;
+    $format = $this->getFieldSetting('datetime_type') == DateTimeItem::DATETIME_TYPE_DATE ? DATETIME_DATE_STORAGE_FORMAT : DATETIME_DATETIME_STORAGE_FORMAT;
     $timezone = $this->getSetting('timezone_override');
     return $this->dateFormatter->format($date->getTimestamp(), 'custom', $format, $timezone != '' ? $timezone : NULL);
   }

core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeDatelistWidget.php

@@ -61,16 +61,16 @@ class DateTimeDatelistWidget extends DateTimeWidgetBase {
         break;
     }
     switch ($time_type) {
-       case '24':
-         $date_part_order = array_merge($date_part_order, array('hour', 'minute'));
-         break;
+      case '24':
+        $date_part_order = array_merge($date_part_order, array('hour', 'minute'));
+        break;
 
-       case '12':
-         $date_part_order = array_merge($date_part_order, array('hour', 'minute', 'ampm'));
-         break;
+      case '12':
+        $date_part_order = array_merge($date_part_order, array('hour', 'minute', 'ampm'));
+        break;
 
-       case 'none':
-         break;
+      case 'none':
+        break;
     }
 
     $element['value'] = array(

core/modules/datetime/src/Plugin/Field/FieldWidget/DateTimeWidgetBase.php

@@ -34,6 +34,12 @@ class DateTimeWidgetBase extends WidgetBase {
       '#required' => $element['#required'],
     );
 
+    if ($this->getFieldSetting('datetime_type') == DateTimeItem::DATETIME_TYPE_DATE) {
+      // A date-only field should have no timezone conversion performed, so
+      // use the same timezone as for storage.
+      $element['value']['#date_timezone'] = DATETIME_STORAGE_TIMEZONE;
+    }
+
     if ($items[$delta]->date) {
       $date = $items[$delta]->date;
       // The date was created and verified during field_load(), so it is safe to

core/modules/datetime/src/Plugin/views/filter/Date.php

@@ -58,7 +58,7 @@ class Date extends NumericDate implements ContainerFactoryPluginInterface {
    *   The plugin implementation definition.
    * @param \Drupal\Core\Datetime\DateFormatterInterface $date_formatter
    *   The date formatter service.
-   * @param \Symfony\Component\HttpFoundation\RequestStack
+   * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   The request stack used to determine the current time.
    */
   public function __construct(array $configuration, $plugin_id, $plugin_definition, DateFormatterInterface $date_formatter, RequestStack $request_stack) {

core/modules/datetime/src/Tests/DateTestBase.php

@@ -0,0 +1,182 @@
+<?php
+
+namespace Drupal\datetime\Tests;
+
+use Drupal\Component\Utility\Unicode;
+use Drupal\Core\Entity\Entity\EntityFormDisplay;
+use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\datetime_range\Plugin\Field\FieldType\DateRangeItem;
+use Drupal\entity_test\Entity\EntityTest;
+use Drupal\field\Entity\FieldConfig;
+use Drupal\field\Entity\FieldStorageConfig;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Provides a base class for testing Datetime field functionality.
+ */
+abstract class DateTestBase extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = ['node', 'entity_test', 'datetime', 'field_ui'];
+
+  /**
+   * An array of display options to pass to entity_get_display()
+   *
+   * @var array
+   */
+  protected $displayOptions;
+
+  /**
+   * A field storage to use in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldStorageConfig
+   */
+  protected $fieldStorage;
+
+  /**
+   * The field used in this test class.
+   *
+   * @var \Drupal\field\Entity\FieldConfig
+   */
+  protected $field;
+
+  /**
+   * The date formatter service.
+   *
+   * @var \Drupal\Core\Datetime\DateFormatterInterface
+   */
+  protected $dateFormatter;
+
+  /**
+   * An array of timezone extremes to test.
+   *
+   * @var string[]
+   */
+  protected static $timezones = [
+    // UTC-12, no DST.
+    'Pacific/Kwajalein',
+    // UTC-11, no DST
+    'Pacific/Midway',
+    // UTC-7, no DST.
+    'America/Phoenix',
+    // UTC.
+    'UTC',
+    // UTC+5:30, no DST.
+    'Asia/Kolkata',
+    // UTC+12, no DST
+    'Pacific/Funafuti',
+    // UTC+13, no DST.
+    'Pacific/Tongatapu',
+  ];
+
+  /**
+   * Returns the type of field to be tested.
+   *
+   * @return string
+   */
+  abstract protected function getTestFieldType();
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    $web_user = $this->drupalCreateUser([
+      'access content',
+      'view test entity',
+      'administer entity_test content',
+      'administer entity_test form display',
+      'administer content types',
+      'administer node fields',
+    ]);
+    $this->drupalLogin($web_user);
+
+    // Create a field with settings to validate.
+    $this->createField();
+
+    $this->dateFormatter = $this->container->get('date.formatter');
+  }
+
+  /**
+   * Creates a date test field.
+   */
+  protected function createField() {
+    $field_name = Unicode::strtolower($this->randomMachineName());
+    $type = $this->getTestFieldType();
+    $widget_type = $formatter_type = $type . '_default';
+
+    $this->fieldStorage = FieldStorageConfig::create([
+      'field_name' => $field_name,
+      'entity_type' => 'entity_test',
+      'type' => $type,
+      'settings' => ['datetime_type' => DateRangeItem::DATETIME_TYPE_DATE],
+    ]);
+    $this->fieldStorage->save();
+    $this->field = FieldConfig::create([
+      'field_storage' => $this->fieldStorage,
+      'bundle' => 'entity_test',
+      'required' => TRUE,
+    ]);
+    $this->field->save();
+
+    EntityFormDisplay::load('entity_test.entity_test.default')
+      ->setComponent($field_name, ['type' => $widget_type])
+      ->save();
+
+    $this->displayOptions = [
+      'type' => $formatter_type,
+      'label' => 'hidden',
+      'settings' => ['format_type' => 'medium'] + $this->defaultSettings,
+    ];
+    EntityViewDisplay::create([
+      'targetEntityType' => $this->field->getTargetEntityTypeId(),
+      'bundle' => $this->field->getTargetBundle(),
+      'mode' => 'full',
+      'status' => TRUE,
+    ])->setComponent($field_name, $this->displayOptions)
+      ->save();
+  }
+
+  /**
+   * Renders a entity_test and sets the output in the internal browser.
+   *
+   * @param int $id
+   *   The entity_test ID to render.
+   * @param string $view_mode
+   *   (optional) The view mode to use for rendering. Defaults to 'full'.
+   * @param bool $reset
+   *   (optional) Whether to reset the entity_test controller cache. Defaults to
+   *   TRUE to simplify testing.
+   */
+  protected function renderTestEntity($id, $view_mode = 'full', $reset = TRUE) {
+    if ($reset) {
+      $this->container->get('entity_type.manager')->getStorage('entity_test')->resetCache([$id]);
+    }
+    $entity = EntityTest::load($id);
+    $display = EntityViewDisplay::collectRenderDisplay($entity, $view_mode);
+    $build = $display->build($entity);
+    $output = $this->container->get('renderer')->renderRoot($build);
+    $this->setRawContent($output);
+    $this->verbose($output);
+  }
+
+  /**
+   * Sets the site timezone to a given timezone.
+   *
+   * @param string $timezone
+   *   The timezone identifier to set.
+   */
+  protected function setSiteTimezone($timezone) {
+    // Set an explicit site timezone, and disallow per-user timezones.
+    $this->config('system.date')
+      ->set('timezone.user.configurable', 0)
+      ->set('timezone.default', $timezone)
+      ->save();
+  }
+
+}

core/modules/datetime/src/Tests/DateTimeFieldTest.php

@@ -5,108 +5,31 @@ namespace Drupal\datetime\Tests;
 use Drupal\Component\Utility\SafeMarkup;
 use Drupal\Component\Utility\Unicode;
 use Drupal\Core\Datetime\DrupalDateTime;
-use Drupal\Core\Entity\Entity\EntityViewDisplay;
+use Drupal\Core\Datetime\Entity\DateFormat;
+use Drupal\entity_test\Entity\EntityTest;
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\node\Entity\Node;
-use Drupal\simpletest\WebTestBase;
 
 /**
  * Tests Datetime field functionality.
  *
  * @group datetime
  */
-class DateTimeFieldTest extends WebTestBase {
-
-  /**
-   * Modules to enable.
-   *
-   * @var array
-   */
-  public static $modules = array('node', 'entity_test', 'datetime', 'field_ui');
+class DateTimeFieldTest extends DateTestBase {
 
   /**
    * The default display settings to use for the formatters.
-   */
-  protected $defaultSettings;
-
-  /**
-   * An array of display options to pass to entity_get_display()
    *
    * @var array
    */
-  protected $displayOptions;
-
-  /**
-   * A field storage to use in this test class.
-   *
-   * @var \Drupal\field\Entity\FieldStorageConfig
-   */
-  protected $fieldStorage;
-
-  /**
-   * The field used in this test class.
-   *
-   * @var \Drupal\field\Entity\FieldConfig
-   */
-  protected $field;
+  protected $defaultSettings = ['timezone_override' => ''];
 
   /**
    * {@inheritdoc}
    */
-  protected function setUp() {
-    parent::setUp();
-
-    // Set an explicit site timezone, and disallow per-user timezones.
-    $this->config('system.date')
-      ->set('timezone.user.configurable', 0)
-      ->set('timezone.default', 'Asia/Tokyo')
-      ->save();
-
-    $web_user = $this->drupalCreateUser(array(
-      'access content',
-      'view test entity',
-      'administer entity_test content',
-      'administer entity_test form display',
-      'administer content types',
-      'administer node fields',
-    ));
-    $this->drupalLogin($web_user);
-
-    // Create a field with settings to validate.
-    $field_name = Unicode::strtolower($this->randomMachineName());
-    $this->fieldStorage = FieldStorageConfig::create(array(
-      'field_name' => $field_name,
-      'entity_type' => 'entity_test',
-      'type' => 'datetime',
-      'settings' => array('datetime_type' => 'date'),
-    ));
-    $this->fieldStorage->save();
-    $this->field = FieldConfig::create([
-      'field_storage' => $this->fieldStorage,
-      'bundle' => 'entity_test',
-      'required' => TRUE,
-    ]);
-    $this->field->save();
-
-    entity_get_form_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'default')
-      ->setComponent($field_name, array(
-        'type' => 'datetime_default',
-      ))
-      ->save();
-
-    $this->defaultSettings = array(
-      'timezone_override' => '',
-    );
-
-    $this->displayOptions = array(
-      'type' => 'datetime_default',
-      'label' => 'hidden',
-      'settings' => array('format_type' => 'medium') + $this->defaultSettings,
-    );
-    entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
-      ->setComponent($field_name, $this->displayOptions)
-      ->save();
+  protected function getTestFieldType() {
+    return 'datetime';
   }
 
   /**
@@ -115,128 +38,155 @@ class DateTimeFieldTest extends WebTestBase {
   function testDateField() {
     $field_name = $this->fieldStorage->getName();
 
-    // Display creation form.
-    $this->drupalGet('entity_test/add');
-    $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Date element found.');
-    $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]/h4[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
-    $this->assertNoFieldByName("{$field_name}[0][value][time]", '', 'Time element not found.');
+    // Loop through defined timezones to test that date-only fields work at the
+    // extremes.
+    foreach (static::$timezones as $timezone) {
 
-    // Build up a date in the UTC timezone.
-    $value = '2012-12-31 00:00:00';
-    $date = new DrupalDateTime($value, 'UTC');
+      $this->setSiteTimezone($timezone);
 
-    // The expected values will use the default time.
-    datetime_date_default_time($date);
+      // Display creation form.
+      $this->drupalGet('entity_test/add');
+      $this->assertFieldByName("{$field_name}[0][value][date]", '', 'Date element found.');
+      $this->assertFieldByXPath('//*[@id="edit-' . $field_name . '-wrapper"]/h4[contains(@class, "js-form-required")]', TRUE, 'Required markup found');
+      $this->assertNoFieldByName("{$field_name}[0][value][time]", '', 'Time element not found.');
 
-    // Update the timezone to the system default.
-    $date->setTimezone(timezone_open(drupal_get_user_timezone()));
+      // Build up a date in the UTC timezone. Note that using this will also
+      // mimic the user in a different timezone simply entering '2012-12-31' via
+      // the UI.
+      $value = '2012-12-31 00:00:00';
+      $date = new DrupalDateTime($value, DATETIME_STORAGE_TIMEZONE);
 
-    // Submit a valid date and ensure it is accepted.
-    $date_format = entity_load('date_format', 'html_date')->getPattern();
-    $time_format = entity_load('date_format', 'html_time')->getPattern();
+      // Submit a valid date and ensure it is accepted.
+      $date_format = DateFormat::load('html_date')->getPattern();
+      $time_format = DateFormat::load('html_time')->getPattern();
 
-    $edit = array(
-      "{$field_name}[0][value][date]" => $date->format($date_format),
-    );
-    $this->drupalPostForm(NULL, $edit, t('Save'));
-    preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
-    $id = $match[1];
-    $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
-    $this->assertRaw($date->format($date_format));
-    $this->assertNoRaw($date->format($time_format));
+      $edit = array(
+        "{$field_name}[0][value][date]" => $date->format($date_format),
+      );
+      $this->drupalPostForm(NULL, $edit, t('Save'));
+      preg_match('|entity_test/manage/(\d+)|', $this->url, $match);
+      $id = $match[1];
+      $this->assertText(t('entity_test @id has been created.', array('@id' => $id)));
+      $this->assertRaw($date->format($date_format));
+      $this->assertNoRaw($date->format($time_format));
 
-    // Verify that the date is output according to the formatter settings.
-    $options = array(
-      'format_type' => array('short', 'medium', 'long'),
-    );
-    foreach ($options as $setting => $values) {
-      foreach ($values as $new_value) {
-        // Update the entity display settings.
-        $this->displayOptions['settings'] = array($setting => $new_value) + $this->defaultSettings;
-        entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
-          ->setComponent($field_name, $this->displayOptions)
-          ->save();
+      // Verify the date doesn't change if using a timezone that is UTC+12 when
+      // the entity is edited through the form.
+      $entity = EntityTest::load($id);
+      $this->assertEqual('2012-12-31', $entity->{$field_name}->value);
+      $this->drupalGet('entity_test/manage/' . $id . '/edit');
+      $this->drupalPostForm(NULL, [], t('Save'));
+      $this->drupalGet('entity_test/manage/' . $id . '/edit');
+      $this->drupalPostForm(NULL, [], t('Save'));
+      $this->drupalGet('entity_test/manage/' . $id . '/edit');
+      $this->drupalPostForm(NULL, [], t('Save'));
+      $entity = EntityTest::load($id);
+      $this->assertEqual('2012-12-31', $entity->{$field_name}->value);
 
-        $this->renderTestEntity($id);
-        switch ($setting) {
-          case 'format_type':
-            // Verify that a date is displayed.
-            $expected = format_date($date->getTimestamp(), $new_value);
-            $expected_iso = format_date($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', 'UTC');
-            $this->renderTestEntity($id);
-            $this->assertFieldByXPath('//time[@datetime="' . $expected_iso . '"]', $expected, SafeMarkup::format('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', array('%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso)));
-            break;
+      // Reset display options since these get changed below.
+      $this->displayOptions = array(
+        'type' => 'datetime_default',
+        'label' => 'hidden',
+        'settings' => array('format_type' => 'medium') + $this->defaultSettings,
+      );
+      // Verify that the date is output according to the formatter settings.
+      $options = array(
+        'format_type' => array('short', 'medium', 'long'),
+      );
+      // Formats that display a time component for date-only fields will display
+      // the default time, so that is applied before calculating the expected
+      // value.
+      datetime_date_default_time($date);
+      foreach ($options as $setting => $values) {
+        foreach ($values as $new_value) {
+          // Update the entity display settings.
+          $this->displayOptions['settings'] = array($setting => $new_value) + $this->defaultSettings;
+          entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
+            ->setComponent($field_name, $this->displayOptions)
+            ->save();
+
+          $this->renderTestEntity($id);
+          switch ($setting) {
+            case 'format_type':
+              // Verify that a date is displayed. Since this is a date-only
+              // field, it is expected to display the time as 00:00:00.
+              $expected = format_date($date->getTimestamp(), $new_value, '', DATETIME_STORAGE_TIMEZONE);
+              $expected_iso = format_date($date->getTimestamp(), 'custom', 'Y-m-d\TH:i:s\Z', DATETIME_STORAGE_TIMEZONE);
+              $this->renderTestEntity($id);
+              $this->assertFieldByXPath('//time[@datetime="' . $expected_iso . '"]', $expected, SafeMarkup::format('Formatted date field using %value format displayed as %expected with %expected_iso attribute.', array('%value' => $new_value, '%expected' => $expected, '%expected_iso' => $expected_iso)));
+              break;
+          }
         }
       }
+
+      // Verify that the plain formatter works.
+      $this->displayOptions['type'] = 'datetime_plain';
+      $this->displayOptions['settings'] = $this->defaultSettings;
+      entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
+        ->setComponent($field_name, $this->displayOptions)
+        ->save();
+      $expected = $date->format(DATETIME_DATE_STORAGE_FORMAT);
+      $this->renderTestEntity($id);
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
+
+      // Verify that the 'datetime_custom' formatter works.
+      $this->displayOptions['type'] = 'datetime_custom';
+      $this->displayOptions['settings'] = array('date_format' => 'm/d/Y') + $this->defaultSettings;
+      entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
+        ->setComponent($field_name, $this->displayOptions)
+        ->save();
+      $expected = $date->format($this->displayOptions['settings']['date_format']);
+      $this->renderTestEntity($id);
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', array('%expected' => $expected)));
+
+      // Verify that the 'datetime_time_ago' formatter works for intervals in the
+      // past.  First update the test entity so that the date difference always
+      // has the same interval.  Since the database always stores UTC, and the
+      // interval will use this, force the test date to use UTC and not the local
+      // or user timezome.
+      $timestamp = REQUEST_TIME - 87654321;
+      $entity = EntityTest::load($id);
+      $field_name = $this->fieldStorage->getName();
+      $date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
+      $entity->{$field_name}->value = $date->format($date_format);
+      $entity->save();
+
+      $this->displayOptions['type'] = 'datetime_time_ago';
+      $this->displayOptions['settings'] = array(
+        'future_format' => '@interval in the future',
+        'past_format' => '@interval in the past',
+        'granularity' => 3,
+      );
+      entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
+        ->setComponent($field_name, $this->displayOptions)
+        ->save();
+      $expected = SafeMarkup::format($this->displayOptions['settings']['past_format'], [
+        '@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+      ]);
+      $this->renderTestEntity($id);
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
+
+      // Verify that the 'datetime_time_ago' formatter works for intervals in the
+      // future.  First update the test entity so that the date difference always
+      // has the same interval.  Since the database always stores UTC, and the
+      // interval will use this, force the test date to use UTC and not the local
+      // or user timezome.
+      $timestamp = REQUEST_TIME + 87654321;
+      $entity = EntityTest::load($id);
+      $field_name = $this->fieldStorage->getName();
+      $date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
+      $entity->{$field_name}->value = $date->format($date_format);
+      $entity->save();
+
+      entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
+        ->setComponent($field_name, $this->displayOptions)
+        ->save();
+      $expected = SafeMarkup::format($this->displayOptions['settings']['future_format'], [
+        '@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+      ]);
+      $this->renderTestEntity($id);
+      $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
     }
-
-    // Verify that the plain formatter works.
-    $this->displayOptions['type'] = 'datetime_plain';
-    $this->displayOptions['settings'] = $this->defaultSettings;
-    entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
-      ->setComponent($field_name, $this->displayOptions)
-      ->save();
-    $expected = $date->format(DATETIME_DATE_STORAGE_FORMAT);
-    $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using plain format displayed as %expected.', array('%expected' => $expected)));
-
-    // Verify that the 'datetime_custom' formatter works.
-    $this->displayOptions['type'] = 'datetime_custom';
-    $this->displayOptions['settings'] = array('date_format' => 'm/d/Y') + $this->defaultSettings;
-    entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
-      ->setComponent($field_name, $this->displayOptions)
-      ->save();
-    $expected = $date->format($this->displayOptions['settings']['date_format']);
-    $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_custom format displayed as %expected.', array('%expected' => $expected)));
-
-    // Verify that the 'datetime_time_ago' formatter works for intervals in the
-    // past.  First update the test entity so that the date difference always
-    // has the same interval.  Since the database always stores UTC, and the
-    // interval will use this, force the test date to use UTC and not the local
-    // or user timezome.
-    $timestamp = REQUEST_TIME - 87654321;
-    $entity = entity_load('entity_test', $id);
-    $field_name = $this->fieldStorage->getName();
-    $date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
-    $entity->{$field_name}->value = $date->format($date_format);
-    $entity->save();
-
-    $this->displayOptions['type'] = 'datetime_time_ago';
-    $this->displayOptions['settings'] = array(
-      'future_format' => '@interval in the future',
-      'past_format' => '@interval in the past',
-      'granularity' => 3,
-    );
-    entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
-      ->setComponent($field_name, $this->displayOptions)
-      ->save();
-    $expected = SafeMarkup::format($this->displayOptions['settings']['past_format'], [
-      '@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
-    ]);
-    $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
-
-    // Verify that the 'datetime_time_ago' formatter works for intervals in the
-    // future.  First update the test entity so that the date difference always
-    // has the same interval.  Since the database always stores UTC, and the
-    // interval will use this, force the test date to use UTC and not the local
-    // or user timezome.
-    $timestamp = REQUEST_TIME + 87654321;
-    $entity = entity_load('entity_test', $id);
-    $field_name = $this->fieldStorage->getName();
-    $date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
-    $entity->{$field_name}->value = $date->format($date_format);
-    $entity->save();
-
-    entity_get_display($this->field->getTargetEntityTypeId(), $this->field->getTargetBundle(), 'full')
-      ->setComponent($field_name, $this->displayOptions)
-      ->save();
-    $expected = SafeMarkup::format($this->displayOptions['settings']['future_format'], [
-      '@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
-    ]);
-    $this->renderTestEntity($id);
-    $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
   }
 
   /**
@@ -261,8 +211,8 @@ class DateTimeFieldTest extends WebTestBase {
     $date->setTimezone(timezone_open(drupal_get_user_timezone()));
 
     // Submit a valid date and ensure it is accepted.
-    $date_format = entity_load('date_format', 'html_date')->getPattern();
-    $time_format = entity_load('date_format', 'html_time')->getPattern();
+    $date_format = DateFormat::load('html_date')->getPattern();
+    $time_format = DateFormat::load('html_time')->getPattern();
 
     $edit = array(
       "{$field_name}[0][value][date]" => $date->format($date_format),
@@ -336,7 +286,7 @@ class DateTimeFieldTest extends WebTestBase {
     // interval will use this, force the test date to use UTC and not the local
     // or user timezome.
     $timestamp = REQUEST_TIME - 87654321;
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $field_name = $this->fieldStorage->getName();
     $date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
     $entity->{$field_name}->value = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
@@ -352,7 +302,7 @@ class DateTimeFieldTest extends WebTestBase {
       ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = SafeMarkup::format($this->displayOptions['settings']['past_format'], [
-      '@interval' => \Drupal::service('date.formatter')->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+      '@interval' => $this->dateFormatter->formatTimeDiffSince($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
     ]);
     $this->renderTestEntity($id);
     $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
@@ -363,7 +313,7 @@ class DateTimeFieldTest extends WebTestBase {
     // interval will use this, force the test date to use UTC and not the local
     // or user timezome.
     $timestamp = REQUEST_TIME + 87654321;
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $field_name = $this->fieldStorage->getName();
     $date = DrupalDateTime::createFromTimestamp($timestamp, 'UTC');
     $entity->{$field_name}->value = $date->format(DATETIME_DATETIME_STORAGE_FORMAT);
@@ -373,7 +323,7 @@ class DateTimeFieldTest extends WebTestBase {
       ->setComponent($field_name, $this->displayOptions)
       ->save();
     $expected = SafeMarkup::format($this->displayOptions['settings']['future_format'], [
-      '@interval' => \Drupal::service('date.formatter')->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
+      '@interval' => $this->dateFormatter->formatTimeDiffUntil($timestamp, ['granularity' => $this->displayOptions['settings']['granularity']])
     ]);
     $this->renderTestEntity($id);
     $this->assertText($expected, SafeMarkup::format('Formatted date field using datetime_time_ago format displayed as %expected.', array('%expected' => $expected)));
@@ -586,7 +536,7 @@ class DateTimeFieldTest extends WebTestBase {
     $this->drupalPostForm(NULL, $edit, t('Save'));
     $this->assertResponse(200);
     $this->assertOptionSelected("edit-$field_name-0-value-minute", '0', 'Correct minute selected.');
- }
+  }
 
   /**
    * The data provider for testing the validation of the datelist widget.
@@ -849,27 +799,4 @@ class DateTimeFieldTest extends WebTestBase {
     $this->assertText('There is data for this field in the database. The field settings can no longer be changed.');
   }
 
-  /**
-   * Renders a entity_test and sets the output in the internal browser.
-   *
-   * @param int $id
-   *   The entity_test ID to render.
-   * @param string $view_mode
-   *   (optional) The view mode to use for rendering. Defaults to 'full'.
-   * @param bool $reset
-   *   (optional) Whether to reset the entity_test controller cache. Defaults to
-   *   TRUE to simplify testing.
-   */
-  protected function renderTestEntity($id, $view_mode = 'full', $reset = TRUE) {
-    if ($reset) {
-      \Drupal::entityManager()->getStorage('entity_test')->resetCache(array($id));
-    }
-    $entity = entity_load('entity_test', $id);
-    $display = EntityViewDisplay::collectRenderDisplay($entity, $view_mode);
-    $build = $display->build($entity);
-    $output = \Drupal::service('renderer')->renderRoot($build);
-    $this->setRawContent($output);
-    $this->verbose($output);
-  }
-
 }

core/modules/datetime/src/Tests/Views/FilterDateTimeTest.php

@@ -136,7 +136,8 @@ class FilterDateTimeTest extends DateTimeHandlerTestBase {
     $view->initHandlers();
     $view->filter[$field]->operator = 'not between';
     $view->filter[$field]->value['min'] = '2001-01-01';
-    $view->filter[$field]->value['max'] = '2002-01-01';
+    // Set maximum date to date of node 1 to test range borders.
+    $view->filter[$field]->value['max'] = '2001-10-10T12:12:12';
     $view->setDisplay('default');
     $this->executeView($view);
     $expected_result = [

core/modules/datetime/tests/src/Kernel/DateTimeItemTest.php

@@ -57,7 +57,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
 
     // Verify entity has been created properly.
     $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $this->assertTrue($entity->field_datetime instanceof FieldItemListInterface, 'Field implements interface.');
     $this->assertTrue($entity->field_datetime[0] instanceof FieldItemInterface, 'Field item implements interface.');
     $this->assertEqual($entity->field_datetime->value, $value);
@@ -70,7 +70,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
 
     // Read changed entity and assert changed values.
     $entity->save();
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $this->assertEqual($entity->field_datetime->value, $new_value);
 
     // Test the generateSampleValue() method.
@@ -90,7 +90,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
     $entity->save();
     // Load the entity and ensure the field was saved correctly.
     $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with string value.');
 
     // Test DateTimeItem::setValue() using property array.
@@ -100,7 +100,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
     $entity->save();
     // Load the entity and ensure the field was saved correctly.
     $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $this->assertEqual($entity->field_datetime[0]->value, $value, 'DateTimeItem::setValue() works with array value.');
   }
 
@@ -116,7 +116,7 @@ class DateTimeItemTest extends FieldKernelTestBase {
     $entity->save();
     // Load the entity and ensure the field was saved correctly.
     $id = $entity->id();
-    $entity = entity_load('entity_test', $id);
+    $entity = EntityTest::load($id);
     $this->assertEqual($entity->field_datetime[0]->value, $value, '"Value" property can be set directly.');
   }