Merge branch 'stable-5.4' into stable-5.5

* stable-5.4:
  WorkingTreeIterator: handle different timestamp resolutions

Change-Id: I83384336e0d766237d0579152673c9eefc9edd65
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

1 files changed, 182 insertions, 0 deletions

diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java
new file mode 100644
index 0000000000..271b4ea3c8
--- /dev/null
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/treewalk/InstantComparatorTest.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (C) 2019, Thomas Wolf <thomas.wolf@paranor.ch>
+ * and other copyright owners as documented in the project's IP log.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Distribution License v1.0 which
+ * accompanies this distribution, is reproduced below, and is
+ * available at http://www.eclipse.org/org/documents/edl-v10.php
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ *   copyright notice, this list of conditions and the following
+ *   disclaimer in the documentation and/or other materials provided
+ *   with the distribution.
+ *
+ * - Neither the name of the Eclipse Foundation, Inc. nor the
+ *   names of its contributors may be used to endorse or promote
+ *   products derived from this software without specific prior
+ *   written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package org.eclipse.jgit.treewalk;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.time.Instant;
+
+import org.junit.Test;
+
+public class InstantComparatorTest {
+
+	private final InstantComparator cmp = new InstantComparator();
+
+	@Test
+	public void compareNow() {
+		Instant now = Instant.now();
+		assertEquals(0, cmp.compare(now, now));
+		assertEquals(0, cmp.compare(now, now, true));
+	}
+
+	@Test
+	public void compareSeconds() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond());
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		assertEquals(0, cmp.compare(t, s));
+		assertEquals(0, cmp.compare(t, t));
+		assertEquals(0, cmp.compare(s, t));
+	}
+
+	@Test
+	public void compareSecondsOnly() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 987654321);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		assertEquals(0, cmp.compare(t, s, true));
+		assertEquals(0, cmp.compare(t, t, true));
+		assertEquals(0, cmp.compare(s, t, true));
+	}
+
+	@Test
+	public void compareSecondsUnequal() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond());
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond() - 1L);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+	}
+
+	@Test
+	public void compareMillisEqual() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123000000);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		assertEquals(0, cmp.compare(s, t));
+		assertEquals(0, cmp.compare(t, t));
+		assertEquals(0, cmp.compare(t, s));
+		s = Instant.ofEpochSecond(now.getEpochSecond(), 123456000);
+		assertEquals(0, cmp.compare(s, t));
+		assertEquals(0, cmp.compare(t, s));
+		s = Instant.ofEpochSecond(now.getEpochSecond(), 123400000);
+		assertEquals(0, cmp.compare(s, t));
+		assertEquals(0, cmp.compare(t, s));
+	}
+
+	@Test
+	public void compareMillisUnequal() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123000000);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 122000000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		t = Instant.ofEpochSecond(now.getEpochSecond(), 130000000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		t = Instant.ofEpochSecond(now.getEpochSecond(), 200000000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		s = Instant.ofEpochSecond(now.getEpochSecond() - 1L, 123000000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+	}
+
+	@Test
+	public void compareMicrosEqual() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456000);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		assertEquals(0, cmp.compare(s, t));
+		assertEquals(0, cmp.compare(t, s));
+		s = Instant.ofEpochSecond(now.getEpochSecond(), 123456700);
+		assertEquals(0, cmp.compare(s, t));
+		assertEquals(0, cmp.compare(t, s));
+	}
+
+	@Test
+	public void compareMicrosUnequal() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456000);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123455000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		t = Instant.ofEpochSecond(now.getEpochSecond(), 123460000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		t = Instant.ofEpochSecond(now.getEpochSecond(), 123500000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		s = Instant.ofEpochSecond(now.getEpochSecond() - 1L, 123456000);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+	}
+
+	@Test
+	public void compareNanosEqual() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		assertEquals(0, cmp.compare(s, t));
+		assertEquals(0, cmp.compare(t, s));
+	}
+
+	@Test
+	public void compareNanosUnequal() {
+		Instant now = Instant.now();
+		Instant t = Instant.ofEpochSecond(now.getEpochSecond(), 123456789);
+		Instant s = Instant.ofEpochSecond(now.getEpochSecond(), 123456700);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		t = Instant.ofEpochSecond(now.getEpochSecond(), 123456800);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		s = Instant.ofEpochSecond(now.getEpochSecond() - 1L, 123456789);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+		s = Instant.ofEpochSecond(now.getEpochSecond(), 123456788);
+		assertTrue(cmp.compare(s, t) < 0);
+		assertTrue(cmp.compare(t, s) > 0);
+	}
+}