From c26e3f45391ef1cf31c1a944eb05b0f730d87615 Mon Sep 17 00:00:00 2001 From: Aleksey Kulikov Date: Thu, 2 Sep 2021 14:31:05 +0300 Subject: [PATCH] refactor(reflog): use naming conventions for similar methods --- lib/src/bindings/reflog.dart | 2 +- lib/src/reflog.dart | 8 ++++---- test/reference_test.dart | 12 ++++++------ test/reflog_test.dart | 10 ++++------ 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/src/bindings/reflog.dart b/lib/src/bindings/reflog.dart index 64e8c02..3d0dd63 100644 --- a/lib/src/bindings/reflog.dart +++ b/lib/src/bindings/reflog.dart @@ -34,7 +34,7 @@ int entryCount(Pointer reflog) => /// /// Requesting the reflog entry with an index of 0 (zero) will return /// the most recently created entry. -Pointer entryByIndex(Pointer reflog, int idx) { +Pointer getByIndex(Pointer reflog, int idx) { return libgit2.git_reflog_entry_byindex(reflog, idx); } diff --git a/lib/src/reflog.dart b/lib/src/reflog.dart index 979dabf..f5b6101 100644 --- a/lib/src/reflog.dart +++ b/lib/src/reflog.dart @@ -21,11 +21,11 @@ class RefLog { late final Pointer _reflogPointer; /// Returns a list with entries of reference log. - List list() { + List get entries { var log = []; for (var i = 0; i < count; i++) { - log.add(entryAt(i)); + log.add(RefLogEntry(bindings.getByIndex(_reflogPointer, i))); } return log; @@ -38,8 +38,8 @@ class RefLog { /// /// Requesting the reflog entry with an index of 0 (zero) will return /// the most recently created entry. - RefLogEntry entryAt(int index) { - return RefLogEntry(bindings.entryByIndex(_reflogPointer, index)); + RefLogEntry operator [](int index) { + return RefLogEntry(bindings.getByIndex(_reflogPointer, index)); } /// Releases memory allocated for reflog object. diff --git a/test/reference_test.dart b/test/reference_test.dart index 600a127..5a18a90 100644 --- a/test/reference_test.dart +++ b/test/reference_test.dart @@ -162,7 +162,7 @@ void main() { ); final reflog = ref.log; - final reflogEntry = reflog.entryAt(0); + final reflogEntry = reflog[0]; expect(reflogEntry.message, 'log message'); expect(reflogEntry.committer.name, 'name'); @@ -297,7 +297,7 @@ void main() { ); final reflog = ref.log; - final reflogEntry = reflog.entryAt(0); + final reflogEntry = reflog[0]; expect(reflogEntry.message, 'log message'); expect(reflogEntry.committer.name, 'name'); @@ -338,7 +338,7 @@ void main() { test('returns log for reference', () { final ref = repo.references['refs/heads/master']; final reflog = ref.log; - expect(reflog.list().last.message, 'commit (initial): init'); + expect(reflog.entries.last.message, 'commit (initial): init'); reflog.free(); ref.free(); @@ -379,9 +379,9 @@ void main() { ref.setTarget('refs/heads/feature', 'log message'); expect(ref.target.sha, '5aecfa0fb97eadaac050ccb99f03c3fb65460ad4'); final reflog = ref.log; - expect(reflog.list().first.message, 'log message'); - expect(reflog.list().first.committer.name, 'name'); - expect(reflog.list().first.committer.email, 'email'); + expect(reflog.entries.first.message, 'log message'); + expect(reflog.entries.first.committer.name, 'name'); + expect(reflog.entries.first.committer.email, 'email'); reflog.free(); ref.free(); diff --git a/test/reflog_test.dart b/test/reflog_test.dart index 55aaf4e..f5d6ee4 100644 --- a/test/reflog_test.dart +++ b/test/reflog_test.dart @@ -38,15 +38,13 @@ void main() { }); test('returns the log message', () { - final entry = reflog.entryAt(0); - expect(entry.message, "commit: add subdirectory file"); + expect(reflog[0].message, "commit: add subdirectory file"); }); test('returns the committer of the entry', () { - final entry = reflog.entryAt(0); - expect(entry.committer.name, 'Aleksey Kulikov'); - expect(entry.committer.email, 'skinny.mind@gmail.com'); - expect(entry.committer.time, 1630568461); + expect(reflog[0].committer.name, 'Aleksey Kulikov'); + expect(reflog[0].committer.email, 'skinny.mind@gmail.com'); + expect(reflog[0].committer.time, 1630568461); }); }); }