Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove incorrect assertion in MarkedCircularBuffer.popFirst #1627

Merged
merged 2 commits into from Sep 3, 2020
Merged

Remove incorrect assertion in MarkedCircularBuffer.popFirst #1627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1400d8c
Remove incorrect assertion in MarkedCircularBuffer.popFirst
glbrntt Sep 2, 2020
bf13e3d
Merge branch 'master' into gb-marked-circular-buffer-pop-first
glbrntt Sep 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/NIO/MarkedCircularBuffer.swift
View file
Open in desktop
Expand Up @@ -41,12 +41,12 @@ public struct MarkedCircularBuffer<Element>: CustomStringConvertible {
/// Removes the first element from the buffer.
@inlinable
public mutating func removeFirst() -> Element {
assert(self._buffer.count > 0)
return self.popFirst()!
}

@inlinable
public mutating func popFirst() -> Element? {
assert(self._buffer.count > 0)
if let markedIndexOffset = self._markedIndexOffset {
if markedIndexOffset > 0 {
self._markedIndexOffset = markedIndexOffset - 1
Expand Down
1 change: 1 addition & 0 deletions Tests/NIOTests/MarkedCircularBufferTests+XCTest.swift
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ extension MarkedCircularBufferTests {
("testCount", testCount),
("testSubscript", testSubscript),
("testIsEmpty", testIsEmpty),
("testPopFirst", testPopFirst),
]
}
}
Expand Down
23 changes: 18 additions & 5 deletions Tests/NIOTests/MarkedCircularBufferTests.swift
View file
Open in desktop
Expand Up @@ -123,11 +123,24 @@ class MarkedCircularBufferTests: XCTestCase {
buf.append(i)
}
XCTAssertFalse(buf.isEmpty)
let _ = buf.removeFirst()
let _ = buf.removeFirst()
let _ = buf.removeFirst()
let _ = buf.removeFirst()
XCTAssertEqual(buf.removeFirst(), 1)
XCTAssertEqual(buf.removeFirst(), 2)
XCTAssertEqual(buf.removeFirst(), 3)
XCTAssertEqual(buf.removeFirst(), 4)
XCTAssertTrue(buf.isEmpty)
}

func testPopFirst() throws {
var buf = MarkedCircularBuffer<Int>(initialCapacity: 4)
for i in 1...4 {
buf.append(i)
}
XCTAssertFalse(buf.isEmpty)
XCTAssertEqual(buf.popFirst(), 1)
XCTAssertEqual(buf.popFirst(), 2)
XCTAssertEqual(buf.popFirst(), 3)
XCTAssertEqual(buf.popFirst(), 4)
XCTAssertNil(buf.popFirst())
XCTAssertTrue(buf.isEmpty)
}

}