From 3070a93d6a2e6a0495632d5313b3ba32660a7be3 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 14 Sep 2019 19:24:49 +0200 Subject: [PATCH] Fix checkstyle violations This fixes trivial checkstyle violations reported by updated checkstyle plugin. Change-Id: I7315da6d9d9c3578d73a4474a471e6af708b470d Signed-off-by: Robert Varga --- .../tools/junit/BaseExpectations.java | 8 +++--- .../tools/junit/BaseTestCase.java | 26 +++++++++---------- .../lisp/util/LispAddressUtilTest.java | 2 +- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java index c2ed1e05f..23d154bb0 100644 --- a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java +++ b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseExpectations.java @@ -130,7 +130,7 @@ public abstract class BaseExpectations extends Expectations { private String methodName; private Method method; - public MethodAction(Object testInstance, String methodName) { + MethodAction(Object testInstance, String methodName) { this.testInstance = testInstance; this.methodName = methodName; method = findMethod(testInstance.getClass()); @@ -177,7 +177,7 @@ public abstract class BaseExpectations extends Expectations { private final Object[] values; private int i = 0; - public ActionSequenceValue(Object... values) { + ActionSequenceValue(Object... values) { this.values = values; } @@ -340,14 +340,14 @@ public abstract class BaseExpectations extends Expectations { }; } - public class StringArrayMatcher extends BaseMatcher { + public final class StringArrayMatcher extends BaseMatcher { private final Object[] expected; /** * @param expected * null are considered "any" */ - private StringArrayMatcher(Object... expected) { + StringArrayMatcher(Object... expected) { this.expected = expected; } diff --git a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java index a88e13ab8..e2777d75b 100644 --- a/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java +++ b/commons/unittest_tools/src/main/java/org/opendaylight/lispflowmapping/tools/junit/BaseTestCase.java @@ -89,19 +89,6 @@ public abstract class BaseTestCase extends BaseExpectations { return inject(testedObject, new FieldData(field, member)); } - protected Object injectStatic(Class clazz, String memberName, Object member) throws Exception { - assertNotNull(clazz); - assertNotNull(memberName); - assertNotNull(member); - - Field field = null; - for (Class cls = clazz; (cls != null) && (field == null); cls = cls.getSuperclass()) { - field = cls.getDeclaredField(memberName); - } - assertNotNull("Couldn't find member '" + memberName + "' in " + clazz.getSimpleName(), field); - return inject(null, new FieldData(field, member)); - } - protected Object inject(Object testedObject, FieldData fieldData) { assertNotNull(fieldData.field); Field field = fieldData.field; @@ -121,6 +108,19 @@ public abstract class BaseTestCase extends BaseExpectations { return null; } + protected Object injectStatic(Class clazz, String memberName, Object member) throws Exception { + assertNotNull(clazz); + assertNotNull(memberName); + assertNotNull(member); + + Field field = null; + for (Class cls = clazz; (cls != null) && (field == null); cls = cls.getSuperclass()) { + field = cls.getDeclaredField(memberName); + } + assertNotNull("Couldn't find member '" + memberName + "' in " + clazz.getSimpleName(), field); + return inject(null, new FieldData(field, member)); + } + protected static final class FieldData { public final Field field; public Object value; diff --git a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java index 8bf667a29..c36e716ce 100644 --- a/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java +++ b/mappingservice/lisp-proto/src/test/java/org/opendaylight/lispflowmapping/lisp/util/LispAddressUtilTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright (c) 2016 Cisco Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the -- 2.36.6