{"thread":{"id":"19821","subject":"[EGIT PATCH2/2] fixed-toString-for-CommitTimeRevFilter-wrote-JUnit-tests","startedAt":"2009-06-15T21:36:35Z","lastAt":"2009-06-16T22:19:08Z","messageCount":2,"participants":["Mark Struberg","Robin Rosenberg"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"116360","messageId":"168892.81103.qm@web27804.mail.ukl.yahoo.com","threadId":"19821","inReplyTo":null,"subject":"[EGIT PATCH2/2] fixed-toString-for-CommitTimeRevFilter-wrote-JUnit-tests","fromName":"Mark Struberg","fromEmail":"struberg@yahoo.de","sentAt":"2009-06-15T21:36:35Z","receivedAt":"2009-06-15T21:36:35Z","isPatch":false,"sender":{"key":"struberg@yahoo.de","avatar":"https://gravatar.com/avatar/119742c3e8dbc8db35a92bdff0581aec8d364d415f770e60431cba262daa974f?d=mp&s=160"},"body":"\n>From 72dd9d071ce140f267b8b4effd34d122627135e6 Mon Sep 17 00:00:00 2001\nFrom: Mark Struberg <struberg@yahoo.de>\nDate: Mon, 15 Jun 2009 08:07:53 +0200\nSubject: [PATCH] fixed toString for CommitTimeRevFilter + wrote JUnit tests for after, before and between walks\n\n---\n .../spearce/jgit/revwalk/RevWalkFilterTest.java    |   62 ++++++++++++++++++++\n .../jgit/revwalk/filter/CommitTimeRevFilter.java   |   21 +++++--\n 2 files changed, 78 insertions(+), 5 deletions(-)\n\ndiff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/RevWalkFilterTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/RevWalkFilterTest.java\nindex 6a26d2e..c9ed18c 100644\n--- a/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/RevWalkFilterTest.java\n+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/revwalk/RevWalkFilterTest.java\n@@ -38,11 +38,13 @@\n package org.spearce.jgit.revwalk;\n \n import java.io.IOException;\n+import java.util.Date;\n \n import org.spearce.jgit.errors.IncorrectObjectTypeException;\n import org.spearce.jgit.errors.MissingObjectException;\n import org.spearce.jgit.errors.StopWalkException;\n import org.spearce.jgit.revwalk.filter.AndRevFilter;\n+import org.spearce.jgit.revwalk.filter.CommitTimeRevFilter;\n import org.spearce.jgit.revwalk.filter.NotRevFilter;\n import org.spearce.jgit.revwalk.filter.OrRevFilter;\n import org.spearce.jgit.revwalk.filter.RevFilter;\n@@ -215,6 +217,66 @@ public void testFilter_NO_MERGES() throws Exception {\n \t\tassertCommit(a, rw.next());\n \t\tassertNull(rw.next());\n \t}\n+\t\n+\tpublic void testCommitTimeRevFilter() throws Exception {\n+\t\tfinal RevCommit a = commit();\n+\t\ttick(100);\n+\t\t\n+\t\tfinal RevCommit b = commit(a);\n+\t\ttick(100);\n+\t\t\n+\t\tDate since = new Date(nowTick);\n+\t\tfinal RevCommit c1 = commit(b);\n+\t\ttick(100);\n+\n+\t\tfinal RevCommit c2 = commit(b);\n+\t\ttick(100);\n+\n+\t\tDate until =  new Date(nowTick);\n+\t\tfinal RevCommit d = commit(c1, c2);\n+\t\ttick(100);\n+\n+\t\tfinal RevCommit e = commit(d);\n+\n+\t\t{\n+\t\t\tRevFilter after = CommitTimeRevFilter.after(since);\n+\t\t\tassertNotNull(after);\n+\t\t\tSystem.out.println(after.toString());\n+\t\t\trw.setRevFilter(after);\n+\t\t\tmarkStart(e);\n+\t\t\tassertCommit(e, rw.next());\n+\t\t\tassertCommit(d, rw.next());\n+\t\t\tassertCommit(c2, rw.next());\n+\t\t\tassertCommit(c1, rw.next());\n+\t\t\tassertNull(rw.next());\n+\t\t}\n+\t\t\n+\t\t{\n+\t\t\tRevFilter before = CommitTimeRevFilter.before(until);\n+\t\t\tassertNotNull(before);\n+\t\t\tSystem.out.println(before.toString());\n+\t\t\trw.reset();\n+\t\t\trw.setRevFilter(before);\n+\t\t\tmarkStart(e);\n+\t\t\tassertCommit(c2, rw.next());\n+\t\t\tassertCommit(c1, rw.next());\n+\t\t\tassertCommit(b, rw.next());\n+\t\t\tassertCommit(a, rw.next());\n+\t\t\tassertNull(rw.next());\n+\t\t}\n+\n+\t\t{\n+\t\t\tRevFilter between = CommitTimeRevFilter.between(since, until);\n+\t\t\tassertNotNull(between);\n+\t\t\tSystem.out.println(between.toString());\n+\t\t\trw.reset();\n+\t\t\trw.setRevFilter(between);\n+\t\t\tmarkStart(e);\n+\t\t\tassertCommit(c2, rw.next());\n+\t\t\tassertCommit(c1, rw.next());\n+\t\t\tassertNull(rw.next());\n+\t\t}\n+\t}\n \n \tprivate static class MyAll extends RevFilter {\n \t\t@Override\ndiff --git a/org.spearce.jgit/src/org/spearce/jgit/revwalk/filter/CommitTimeRevFilter.java b/org.spearce.jgit/src/org/spearce/jgit/revwalk/filter/CommitTimeRevFilter.java\nindex 0aaa78d..2af9862 100644\n--- a/org.spearce.jgit/src/org/spearce/jgit/revwalk/filter/CommitTimeRevFilter.java\n+++ b/org.spearce.jgit/src/org/spearce/jgit/revwalk/filter/CommitTimeRevFilter.java\n@@ -93,11 +93,6 @@ public RevFilter clone() {\n \t\treturn this;\n \t}\n \n-\t@Override\n-\tpublic String toString() {\n-\t\treturn super.toString() + \"(\" + new Date(when * 1000) + \")\";\n-\t}\n-\n \tprivate static class Before extends CommitTimeRevFilter {\n \t\tBefore(final long ts) {\n \t\t\tsuper(ts);\n@@ -109,6 +104,11 @@ public boolean include(final RevWalk walker, final RevCommit cmit)\n \t\t\t\tIncorrectObjectTypeException, IOException {\n \t\t\treturn cmit.getCommitTime() <= when;\n \t\t}\n+\n+\t\t@Override\n+\t\tpublic String toString() {\n+\t\t\treturn super.toString() + \"(\" + new Date(when * 1000L) + \")\";\n+\t\t}\n \t}\n \n \tprivate static class After extends CommitTimeRevFilter {\n@@ -128,6 +128,11 @@ public boolean include(final RevWalk walker, final RevCommit cmit)\n \t\t\t\tthrow StopWalkException.INSTANCE;\n \t\t\treturn true;\n \t\t}\n+\n+\t\t@Override\n+\t\tpublic String toString() {\n+\t\t\treturn super.toString() + \"(\" + new Date(when * 1000L) + \")\";\n+\t\t}\n \t}\n \n \tprivate static class Between extends CommitTimeRevFilter {\n@@ -144,6 +149,12 @@ public boolean include(final RevWalk walker, final RevCommit cmit)\n \t\t\t\tIncorrectObjectTypeException, IOException {\n \t\t\treturn cmit.getCommitTime() <= until && cmit.getCommitTime() >= when;\n \t\t}\n+\n+\t\t@Override\n+\t\tpublic String toString() {\n+\t\t\treturn super.toString() + \"(\" + new Date(when * 1000L) + \" - \" + new Date(until * 1000L) + \")\";\n+\t\t}\n+\n \t}\n \n }\n-- \n1.6.0.6\n\n\n\n      \n"},{"id":"116446","messageId":"200906170019.11627.robin.rosenberg.lists@dewire.com","threadId":"19821","inReplyTo":"168892.81103.qm@web27804.mail.ukl.yahoo.com","subject":"Re: [EGIT PATCH2/2] fixed-toString-for-CommitTimeRevFilter-wrote-JUnit-tests","fromName":"Robin Rosenberg","fromEmail":"robin.rosenberg.lists@dewire.com","sentAt":"2009-06-16T22:19:08Z","receivedAt":"2009-06-16T22:19:08Z","isPatch":false,"sender":{"key":"robin.rosenberg@dewire.com","avatar":"https://avatars.githubusercontent.com/u/46357?v=4"},"body":"måndag 15 juni 2009 23:36:35 skrev Mark Struberg <struberg@yahoo.de>:\n> \n> From 72dd9d071ce140f267b8b4effd34d122627135e6 Mon Sep 17 00:00:00 2001\n> From: Mark Struberg <struberg@yahoo.de>\n> Date: Mon, 15 Jun 2009 08:07:53 +0200\n> Subject: [PATCH] fixed toString for CommitTimeRevFilter + wrote JUnit tests for after, before and between walks\n\nWhat is the connection between the toString and the rest of the patch? Should be\nseparate patches.\n\nYou should sign off the patches.\n\nStart the subject with a capital letter.\n\nTechnically it seemed ok, but I shouldn't have pushed them, as I did, by mistake when pusing\nShawn's latest patch. The formal errors should have been fixed firsts.\n\n-- robin\n"}]}