We have warnings coming from tests being public. Hide them.
Change-Id: I3080c8cc3618d4a711814343defecb1d05d40102
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
import java.util.Optional;
import org.junit.jupiter.api.Test;
-public class BiMapYangNamespaceContextTest {
+class BiMapYangNamespaceContextTest {
private static final QNameModule FOO = QNameModule.of("foo");
private static final QNameModule BAR = QNameModule.of("bar");
private static final QNameModule BAZ = QNameModule.of("baz");
ImmutableBiMap.of("foo", FOO, "bar", BAR));
@Test
- public void testEquals() {
+ void testEquals() {
assertTrue(context.equals(context));
assertTrue(context.equals(new BiMapYangNamespaceContext(ImmutableBiMap.of("foo", FOO, "bar", BAR))));
assertFalse(context.equals(null));
}
@Test
- public void testPrefixForNamespace() {
+ void testPrefixForNamespace() {
assertEquals(Optional.of("foo"), context.findPrefixForNamespace(FOO));
assertEquals(Optional.of("bar"), context.findPrefixForNamespace(BAR));
assertEquals(Optional.empty(), context.findPrefixForNamespace(BAZ));
}
@Test
- public void testNamespaceForPrefix() {
+ void testNamespaceForPrefix() {
assertEquals(Optional.of(FOO), context.findNamespaceForPrefix("foo"));
assertEquals(Optional.of(BAR), context.findNamespaceForPrefix("bar"));
assertEquals(Optional.empty(), context.findNamespaceForPrefix("baz"));
}
@Test
- public void testReadWrite() throws IOException {
+ void testReadWrite() throws IOException {
final byte[] bytes;
- try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
- try (DataOutputStream dos = new DataOutputStream(bos)) {
+ try (var bos = new ByteArrayOutputStream()) {
+ try (var dos = new DataOutputStream(bos)) {
context.writeTo(dos);
}
bytes = bos.toByteArray();
}
final BiMapYangNamespaceContext other;
- try (DataInputStream dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
+ try (var dis = new DataInputStream(new ByteArrayInputStream(bytes))) {
other = BiMapYangNamespaceContext.readFrom(dis);
}
}
@Test
- public void testCreateQName() {
+ void testCreateQName() {
assertEquals(QName.create(FOO, "some"), context.createQName("foo", "some"));
}
}
import static org.junit.jupiter.api.Assertions.assertSame;
import org.eclipse.jdt.annotation.NonNullByDefault;
-import org.eclipse.jdt.annotation.Nullable;
import org.junit.jupiter.api.Test;
import org.opendaylight.yangtools.concepts.Either;
@NonNullByDefault
-public class DerivedStringTest {
- public static class EagerDerivedString extends CachingDerivedString<EagerDerivedString> {
- private static final long serialVersionUID = 1L;
-
- protected EagerDerivedString(final String str) {
- super(str);
- }
-
- @Override
- @SuppressWarnings("checkstyle:parameterName")
- public final int compareTo(final EagerDerivedString o) {
- return toCanonicalString().compareTo(o.toCanonicalString());
- }
-
- @Override
- public final CanonicalValueSupport<EagerDerivedString> support() {
- return EAGER_SUPPORT;
- }
-
- @Override
- public final int hashCode() {
- return toCanonicalString().hashCode();
- }
-
- @Override
- public final boolean equals(@Nullable final Object obj) {
- if (obj == this) {
- return true;
- }
- if (obj instanceof String) {
- return toCanonicalString().equals(obj);
- }
-
- return obj instanceof DerivedString
- && toCanonicalString().equals(((DerivedString<?>)obj).toCanonicalString());
- }
-
- @Override
- protected final String computeCanonicalString() {
- throw new UnsupportedOperationException();
- }
- }
-
- public static class LazyDerivedString extends CachingDerivedString<LazyDerivedString> {
- private static final long serialVersionUID = 1L;
-
- private final String str;
-
- protected LazyDerivedString(final String str) {
- this.str = str;
- }
-
- @Override
- @SuppressWarnings("checkstyle:parameterName")
- public final int compareTo(final LazyDerivedString o) {
- return str.compareTo(o.str);
- }
-
- @Override
- public final CanonicalValueSupport<LazyDerivedString> support() {
- return LAZY_SUPPORT;
- }
-
- @Override
- public final int hashCode() {
- return str.hashCode();
- }
-
- @Override
- public final boolean equals(@Nullable final Object obj) {
- if (obj == this) {
- return true;
- }
- if (obj instanceof String) {
- return str.equals(obj);
- }
-
- return obj instanceof DerivedString && str.equals(((DerivedString<?>)obj).toCanonicalString());
- }
-
- @Override
- protected final String computeCanonicalString() {
- return str;
- }
- }
-
- public static final class EagerDerivedStringSupport extends AbstractCanonicalValueSupport<EagerDerivedString> {
+class DerivedStringTest {
+ static final class EagerDerivedStringSupport extends AbstractCanonicalValueSupport<EagerDerivedString> {
EagerDerivedStringSupport() {
super(EagerDerivedString.class);
}
}
}
- public static final class LazyDerivedStringSupport extends AbstractCanonicalValueSupport<LazyDerivedString> {
+ static final class LazyDerivedStringSupport extends AbstractCanonicalValueSupport<LazyDerivedString> {
LazyDerivedStringSupport() {
super(LazyDerivedString.class);
}
}
}
- private static final CanonicalValueSupport<EagerDerivedString> EAGER_SUPPORT = new EagerDerivedStringSupport();
- private static final CanonicalValueSupport<LazyDerivedString> LAZY_SUPPORT = new LazyDerivedStringSupport();
+ static final CanonicalValueSupport<EagerDerivedString> EAGER_SUPPORT = new EagerDerivedStringSupport();
+ static final CanonicalValueSupport<LazyDerivedString> LAZY_SUPPORT = new LazyDerivedStringSupport();
@Test
- public void testEager() {
- final DerivedString<?> foo = new EagerDerivedString("foo");
+ void testEager() {
+ final var foo = new EagerDerivedString("foo");
assertSame("foo", foo.toString());
}
@Test
- public void testLazy() {
- final DerivedString<?> foo = new LazyDerivedString("foo");
- final String first = foo.toString();
+ void testLazy() {
+ final var foo = new LazyDerivedString("foo");
+ final var first = foo.toString();
assertEquals("foo", first);
assertSame(first, foo.toString());
}
-
}
--- /dev/null
+/*
+ * Copyright (c) 2025 PANTHEON.tech, s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.common;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+@NonNullByDefault
+public class EagerDerivedString extends CachingDerivedString<EagerDerivedString> {
+ @java.io.Serial
+ private static final long serialVersionUID = 1L;
+
+ protected EagerDerivedString(final String str) {
+ super(str);
+ }
+
+ @Override
+ @SuppressWarnings("checkstyle:parameterName")
+ public final int compareTo(final EagerDerivedString o) {
+ return toCanonicalString().compareTo(o.toCanonicalString());
+ }
+
+ @Override
+ public final CanonicalValueSupport<EagerDerivedString> support() {
+ return DerivedStringTest.EAGER_SUPPORT;
+ }
+
+ @Override
+ public final int hashCode() {
+ return toCanonicalString().hashCode();
+ }
+
+ @Override
+ public final boolean equals(@Nullable final Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (obj instanceof String) {
+ return toCanonicalString().equals(obj);
+ }
+
+ return obj instanceof DerivedString<?> ds && toCanonicalString().equals(ds.toCanonicalString());
+ }
+
+ @Override
+ protected final String computeCanonicalString() {
+ throw new UnsupportedOperationException();
+ }
+}
\ No newline at end of file
import java.io.ObjectOutputStream;
import org.junit.jupiter.api.Test;
-public class ErrorTagTest {
+class ErrorTagTest {
@Test
- public void testSerialization() throws Exception {
- final ErrorTag expected = new ErrorTag("test");
+ void testSerialization() throws Exception {
+ final var expected = new ErrorTag("test");
final byte[] bytes;
- try (ByteArrayOutputStream bos = new ByteArrayOutputStream()) {
- try (ObjectOutputStream oos = new ObjectOutputStream(bos)) {
+ try (var bos = new ByteArrayOutputStream()) {
+ try (var oos = new ObjectOutputStream(bos)) {
oos.writeObject(expected);
}
bytes = bos.toByteArray();
}
- try (ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
+ try (var ois = new ObjectInputStream(new ByteArrayInputStream(bytes))) {
assertEquals(expected, ois.readObject());
}
}
--- /dev/null
+/*
+ * Copyright (c) 2025 PANTHEON.tech, s.r.o. and others. All rights reserved.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.opendaylight.yangtools.yang.common;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import org.eclipse.jdt.annotation.Nullable;
+
+@NonNullByDefault
+public class LazyDerivedString extends CachingDerivedString<LazyDerivedString> {
+ @java.io.Serial
+ private static final long serialVersionUID = 1L;
+
+ private final String str;
+
+ protected LazyDerivedString(final String str) {
+ this.str = str;
+ }
+
+ @Override
+ @SuppressWarnings("checkstyle:parameterName")
+ public final int compareTo(final LazyDerivedString o) {
+ return str.compareTo(o.str);
+ }
+
+ @Override
+ public final CanonicalValueSupport<LazyDerivedString> support() {
+ return DerivedStringTest.LAZY_SUPPORT;
+ }
+
+ @Override
+ public final int hashCode() {
+ return str.hashCode();
+ }
+
+ @Override
+ public final boolean equals(@Nullable final Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (obj instanceof String) {
+ return str.equals(obj);
+ }
+
+ return obj instanceof DerivedString<?> ds && str.equals(ds.toCanonicalString());
+ }
+
+ @Override
+ protected final String computeCanonicalString() {
+ return str;
+ }
+}
\ No newline at end of file
import java.util.Optional;
import org.junit.jupiter.api.Test;
-public class RevisionTest {
+class RevisionTest {
@Test
void testOf() {
assertEquals("2017-12-25", Revision.of("2017-12-25").toString());
}
@Test
- public void testErrors() {
+ void testErrors() {
final RpcResultBuilder<Object> rpcResultBuilder = RpcResultBuilder.status(true);
final RpcError rpcErrorShort = RpcResultBuilder.newError(ErrorType.RPC, TAG, "msg");
final RpcError rpcErrorLong = RpcResultBuilder.newError(ErrorType.RPC, TAG, "msg", "applicationTag", "info",
import java.math.RoundingMode;
import org.junit.jupiter.api.Test;
-public class YT1440Test {
+class YT1440Test {
@Test
- public void testScaleSame() {
+ void testScaleSame() {
final var twenty = Decimal64.valueOf(2, 20);
assertSame(twenty, twenty.scaleTo(2));
}
@Test
- public void testScaleZero() {
+ void testScaleZero() {
final var two = Decimal64.valueOf(2, 0);
final var one = two.scaleTo(1);
assertEquals(1, one.scale());
}
@Test
- public void testScaleUpNoRemain() {
+ void testScaleUpNoRemain() {
// Template, scale=5
final var two = Decimal64.valueOf(2, 20);
}
@Test
- public void testScaleDownNoRemain() {
+ void testScaleDownNoRemain() {
// Template, scale=5
final var five = Decimal64.valueOf(5, 20);
}
@Test
- public void testScaleDownPositive() {
+ void testScaleDownPositive() {
final var two = Decimal64.valueOf("0.63");
assertEquals(2, two.scale());
assertEquals(63, two.unscaledValue());
}
@Test
- public void testScaleDownNegative() {
+ void testScaleDownNegative() {
final var two = Decimal64.valueOf("-0.63");
assertEquals(2, two.scale());
assertEquals(-63, two.unscaledValue());
}
@Test
- public void testScaleDownTrim() {
+ void testScaleDownTrim() {
final var two = Decimal64.valueOf("0.63");
final var ex = assertThrows(ArithmeticException.class, () -> two.scaleTo(1));
assertEquals("Decreasing scale of 0.63 to 1 requires rounding", ex.getMessage());
import java.util.AbstractMap.SimpleImmutableEntry;
import org.junit.jupiter.api.Test;
-public class YangNamesTest {
+class YangNamesTest {
@Test
public void testParseFileName() {
assertEquals(new SimpleImmutableEntry<>("foo", null), YangNames.parseFilename("foo"));
}
@Test
- public void testParseFileNameNull() {
+ void testParseFileNameNull() {
assertThrows(NullPointerException.class, () -> YangNames.parseFilename(null));
}
}
import org.junit.jupiter.api.Test;
-public class YangVersionTest {
+class YangVersionTest {
@Test
- public void testGetReference() {
+ void testGetReference() {
assertEquals("RFC6020", YangVersion.VERSION_1.reference());
assertEquals("RFC7950", YangVersion.VERSION_1_1.reference());
}
@Test
- public void testParse() {
+ void testParse() {
assertNull(YangVersion.forString(""));
assertNull(YangVersion.forString("1."));
assertEquals(YangVersion.VERSION_1, YangVersion.forString("1"));
}
@Test
- public void testParseNull() {
+ void testParseNull() {
assertThrows(NullPointerException.class, () -> YangVersion.forString(null));
}
@Test
- public void testToString() {
+ void testToString() {
assertEquals("1", YangVersion.VERSION_1.toString());
assertEquals("1.1", YangVersion.VERSION_1_1.toString());
}
Code Review / yangtools.git / commitdiff