< prev index next >

test/jdk/java/util/Date/TimestampTest.java

Print this page
*** 1,7 ***
  /*
!  * Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ---
  /*
!  * Copyright (c) 2004, 2023, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 24,27 ***
  /*
   * @test
   * @bug 5008227
   * @summary Make sure that changes to the Date class don't break java.sql.Timestamp.
   * @modules java.sql
!  * @library /java/text/testlib
   */
  
  import java.util.*;
  import java.sql.Timestamp;
  
! public class TimestampTest extends IntlTest {
  
!     public static void main(String[] args) throws Exception {
!         new TimestampTest().run(args);
!     }
  
      /**
       * 5008227: java.sql.Timestamp.after() is not returning correct result
       *
       * Test before(), after(), equals(), compareTo() and getTime().
       */
      public void Test5008227() {
          long t = System.currentTimeMillis();
          Timestamp ts1 = new Timestamp(t), ts2 = new Timestamp(t);
          ts1.setNanos(999999999);
          ts2.setNanos(  1000000);
--- 24,28 ---
  /*
   * @test
   * @bug 5008227
   * @summary Make sure that changes to the Date class don't break java.sql.Timestamp.
   * @modules java.sql
!  * @run junit TimestampTest
   */
  
  import java.util.*;
  import java.sql.Timestamp;
  
! import org.junit.jupiter.api.Test;
  
! import static org.junit.jupiter.api.Assertions.fail;
! 
! public class TimestampTest {
  
      /**
       * 5008227: java.sql.Timestamp.after() is not returning correct result
       *
       * Test before(), after(), equals(), compareTo() and getTime().
       */
+     @Test
      public void Test5008227() {
          long t = System.currentTimeMillis();
          Timestamp ts1 = new Timestamp(t), ts2 = new Timestamp(t);
          ts1.setNanos(999999999);
          ts2.setNanos(  1000000);

*** 86,32 ***
       */
      private void compareTimestamps(Timestamp ts1, Timestamp ts2, int expected) {
          boolean expectedResult = expected > 0;
          boolean result = ts1.after(ts2);
          if (result != expectedResult) {
!             errln("ts1.after(ts2) returned " + result
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
  
          expectedResult = expected < 0;
          result = ts1.before(ts2);
          if (result != expectedResult) {
!             errln("ts1.before(ts2) returned " + result
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
  
          expectedResult = expected == 0;
          result = ts1.equals(ts2);
          if (result != expectedResult) {
!             errln("ts1.equals(ts2) returned " + result
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
  
          int x = ts1.compareTo(ts2);
          int y = (x > 0) ? 1 : (x < 0) ? -1 : 0;
          if (y != expected) {
!             errln("ts1.compareTo(ts2) returned " + x + ", expected "
                    + relation(expected, "") + "0"
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
          long t1 = ts1.getTime();
          long t2 = ts2.getTime();
--- 87,32 ---
       */
      private void compareTimestamps(Timestamp ts1, Timestamp ts2, int expected) {
          boolean expectedResult = expected > 0;
          boolean result = ts1.after(ts2);
          if (result != expectedResult) {
!             fail("ts1.after(ts2) returned " + result
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
  
          expectedResult = expected < 0;
          result = ts1.before(ts2);
          if (result != expectedResult) {
!             fail("ts1.before(ts2) returned " + result
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
  
          expectedResult = expected == 0;
          result = ts1.equals(ts2);
          if (result != expectedResult) {
!             fail("ts1.equals(ts2) returned " + result
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
  
          int x = ts1.compareTo(ts2);
          int y = (x > 0) ? 1 : (x < 0) ? -1 : 0;
          if (y != expected) {
!             fail("ts1.compareTo(ts2) returned " + x + ", expected "
                    + relation(expected, "") + "0"
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
          long t1 = ts1.getTime();
          long t2 = ts2.getTime();

*** 120,11 ***
              int n1 = ts1.getNanos();
              int n2 = ts2.getNanos();
              z = (n1 > n2) ? 1 : (n1 < n2) ? -1 : 0;
          }
          if (z != expected) {
!             errln("ts1.getTime() " + relation(z, "==") + " ts2.getTime(), expected "
                    + relation(expected, "==")
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
      }
  
--- 121,11 ---
              int n1 = ts1.getNanos();
              int n2 = ts2.getNanos();
              z = (n1 > n2) ? 1 : (n1 < n2) ? -1 : 0;
          }
          if (z != expected) {
!             fail("ts1.getTime() " + relation(z, "==") + " ts2.getTime(), expected "
                    + relation(expected, "==")
                    + ". (ts1=" + ts1 + ", ts2=" + ts2 + ")");
          }
      }
  
< prev index next >