Skip to content

Commit 3cd9bf9

Browse files
Merge branch 'main' into completed
# Conflicts: # 2-0-data-structures-and-algorithms/2-2-4-linked-list/src/test/java/com/bobocode/cs/LinkedListTest.java # 3-0-java-core/3-6-4-random-field-comparator/README.MD # 3-0-java-core/3-6-4-random-field-comparator/src/main/java/com/bobocode/se/RandomFieldComparator.java # 3-0-java-core/3-6-4-random-field-comparator/src/test/java/com/bobocode/se/RandomFieldComparatorTest.java
2 parents eb858fb + 75f437c commit 3cd9bf9

File tree

2 files changed

+2
-1
lines changed
  • 2-0-data-structures-and-algorithms/2-2-4-linked-list/src/test/java/com/bobocode/cs
  • 3-0-java-core/3-6-4-random-field-comparator

2 files changed

+2
-1
lines changed

2-0-data-structures-and-algorithms/2-2-4-linked-list/src/test/java/com/bobocode/cs/LinkedListTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@ void removeLast() {
408408

409409
int newLastElement = getInternalElement(getInternalSize() - 1);
410410
int tailElement = (int) getNodeValue(TAIL_NODE_FIELD);
411+
411412
int size = getInternalSize();
412413

413414
assertThat(deletedElement).isEqualTo(9);

3-0-java-core/3-6-4-random-field-comparator/README.MD

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
* implement a logic of choosing a random field to use it for comparison of objects of provided type ✅
66
* implement a mechanism to check if field type is `Comparable`
77
* implement a method `compare` that compares two objects by randomly-provided field ✅
8-
* extend a method `compare` to manage null field values following condition when null value grater than a non-null value ✅
8+
* extend a method `compare` to manage null field values following condition when null value greater than a non-null value ✅
99
* implement method `getComparingFieldName` that retrieves the name of randomly-chosen comparing field✅
1010
* implement method `toString`
1111

0 commit comments

Comments
 (0)