From 619c303eb98b3c2d74b3169a1673124c3ebd45bd Mon Sep 17 00:00:00 2001 From: Sorin Basca Date: Mon, 19 Sep 2022 11:12:04 +0100 Subject: Fix errorprone 2.15.0 errors Bug: 246761518 Test: RUN_ERROR_PRONE=true m javac-check lint-check dist Change-Id: I71fb6b41c28433e364b608a1fba62582a8560503 --- src/main/java/org/testng/internal/ClonedMethod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/testng/internal/ClonedMethod.java b/src/main/java/org/testng/internal/ClonedMethod.java index 1a8ff08e..7544506e 100755 --- a/src/main/java/org/testng/internal/ClonedMethod.java +++ b/src/main/java/org/testng/internal/ClonedMethod.java @@ -146,7 +146,7 @@ public class ClonedMethod implements ITestNGMethod { @Override public Class getRealClass() { - return m_javaMethod.getClass(); + return m_javaMethod.getDeclaringClass(); } @Override -- cgit v1.2.3 From 4d1c1645506aad06ba0ba5e4427e52a4a94f9db7 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Sat, 15 Oct 2022 21:33:28 -0700 Subject: Fix errorprone warnings that should be errors This commit is part of a large scale change to fix errorprone errors that have been downgraded to warnings in the android source tree, so that they can be promoted to errors again. The full list of changes include the following, but not all will be present in any one individual commit: BadAnnotationImplementation BadShiftAmount BanJNDI BoxedPrimitiveEquality ComparableType ComplexBooleanConstant CollectionToArraySafeParameter ConditionalExpressionNumericPromotion DangerousLiteralNull DoubleBraceInitialization DurationFrom DurationTemporalUnit EmptyTopLevelDeclaration EqualsNull EqualsReference FormatString FromTemporalAccessor GetClassOnAnnotation GetClassOnClass HashtableContains IdentityBinaryExpression IdentityHashMapBoxing InstantTemporalUnit InvalidTimeZoneID InvalidZoneId IsInstanceIncompatibleType JUnitParameterMethodNotFound LockOnBoxedPrimitive MathRoundIntLong MislabeledAndroidString MisusedDayOfYear MissingSuperCall MisusedWeekYear ModifyingCollectionWithItself NoCanIgnoreReturnValueOnClasses NonRuntimeAnnotation NullableOnContainingClass NullTernary OverridesJavaxInjectableMethod ParcelableCreator PeriodFrom PreconditionsInvalidPlaceholder ProtoBuilderReturnValueIgnored ProtoFieldNullComparison RandomModInteger RectIntersectReturnValueIgnored ReturnValueIgnored SelfAssignment SelfComparison SelfEquals SizeGreaterThanOrEqualsZero StringBuilderInitWithChar TreeToString TryFailThrowable UnnecessaryCheckNotNull UnusedCollectionModifiedInPlace XorPower See https://errorprone.info/bugpatterns for more information on the checks. Bug: 253827323 Test: m RUN_ERROR_PRONE=true javac-check Change-Id: I5d329a8c86c460ec34fe0dedd39f7ea7717066c0 --- Android.bp | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Android.bp b/Android.bp index bc1b1a92..8047a81c 100644 --- a/Android.bp +++ b/Android.bp @@ -102,6 +102,18 @@ java_library { "guice", ], libs: ["junit"], + + errorprone: { + javacflags: [ + "-Xep:ComparableType:WARN", + "-Xep:NonRuntimeAnnotation:WARN", + "-Xep:GetClassOnAnnotation:WARN", + "-Xep:RandomModInteger:WARN", + "-Xep:FormatString:WARN", + "-Xep:DoubleBraceInitialization:WARN", + "-Xep:UnusedCollectionModifiedInPlace:WARN", + ], + }, } // TODO: also add the tests once we have testng working. -- cgit v1.2.3