Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/com/fasterxml/uuid/EthernetAddress.java
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ public EthernetAddress(byte [] addr)
* bytes.
*/
public EthernetAddress(long addr) {
_address = addr;
_address = addr & 0x0000ffffffffffffL;
}

/**
Expand Down
24 changes: 24 additions & 0 deletions src/test/java/com/fasterxml/uuid/EthernetAddressTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -1425,4 +1425,28 @@ private void assertEthernetAddressArraysAreNotEqual(byte[] array1,
}
fail("Array1 and Array2 matched");
}

@Test
public void longConstructorUsesOnlyLowestSixBytes() {
long expected = 0x0123456789abL;
EthernetAddress canonical = new EthernetAddress(expected);
for (long highBits : new long[] { 0x0001000000000000L, Long.MIN_VALUE, 0xffff000000000000L }) {
EthernetAddress address = new EthernetAddress(highBits | expected);
assertEquals(expected, address.toLong());
assertEquals(canonical, address);
assertEquals(canonical.hashCode(), address.hashCode());
assertEquals(0, canonical.compareTo(address));
assertEquals(canonical.toString(), address.toString());
assertArrayEquals(canonical.toByteArray(), address.toByteArray());
}
}

@Test
public void longFactoryRoundTripsNegativeInput() {
EthernetAddress address = EthernetAddress.valueOf(-1L);
assertEquals(0xffffffffffffL, address.toLong());
assertEquals(address, new EthernetAddress(address.toString()));
assertEquals(address, new EthernetAddress(address.toByteArray()));
}

}