Fix tests

Author: hannesa2

MPChartLib/src/main/java/com/github/mikephil/charting/renderer/YAxisRenderer.java

@@ -18,34 +18,30 @@
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class YAxisRenderer extends AxisRenderer {
 
     protected YAxis mYAxis;
 
     protected Paint mZeroLinePaint;
 
-    public YAxisRenderer(ViewPortHandler viewPortHandler, YAxis yAxis, Transformer trans) {
+    public YAxisRenderer(@NonNull ViewPortHandler viewPortHandler, YAxis yAxis, Transformer trans) {
         super(viewPortHandler, trans, yAxis);
 
         this.mYAxis = yAxis;
 
-        if(this.viewPortHandler != null) {
-
-            mAxisLabelPaint.setColor(Color.BLACK);
-            mAxisLabelPaint.setTextSize(Utils.convertDpToPixel(10f));
+		mAxisLabelPaint.setColor(Color.BLACK);
+		mAxisLabelPaint.setTextSize(Utils.convertDpToPixel(10f));
 
-            mZeroLinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-            mZeroLinePaint.setColor(Color.GRAY);
-            mZeroLinePaint.setStrokeWidth(1f);
-            mZeroLinePaint.setStyle(Paint.Style.STROKE);
-        }
-    }
+		mZeroLinePaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+		mZeroLinePaint.setColor(Color.GRAY);
+		mZeroLinePaint.setStrokeWidth(1f);
+		mZeroLinePaint.setStyle(Paint.Style.STROKE);
+	}
 
     /**
      * Return the axis label x position based on axis dependency and label position
-     * @param dependency
-     * @param labelPosition
-     * @return
      */
     private float calculateAxisLabelsXPosition(AxisDependency dependency, YAxisLabelPosition labelPosition) {
         float viewPortBase = dependency == AxisDependency.LEFT ? viewPortHandler.offsetLeft() : viewPortHandler.contentRight();
@@ -56,9 +52,6 @@ private float calculateAxisLabelsXPosition(AxisDependency dependency, YAxisLabel
 
     /**
      * Return the text align based on axis dependency and label position
-     * @param dependency
-     * @param labelPosition
-     * @return
      */
     private Align getAxisLabelTextAlign(AxisDependency dependency, YAxisLabelPosition labelPosition) {
         if (dependency == AxisDependency.LEFT ^ labelPosition == YAxisLabelPosition.OUTSIDE_CHART) {
@@ -114,9 +107,6 @@ public void renderAxisLine(Canvas c) {
 
     /**
      * draws the y-labels on the specified x-position
-     *
-     * @param fixedPosition
-     * @param positions
      */
     protected void drawYLabels(Canvas c, float fixedPosition, float[] positions, float offset) {
 
@@ -200,11 +190,6 @@ public RectF getGridClippingRect() {
 
     /**
      * Calculates the path for a grid line.
-     *
-     * @param p
-     * @param i
-     * @param positions
-     * @return
      */
     protected Path linePath(Path p, int i, float[] positions) {
 
@@ -218,8 +203,6 @@ protected Path linePath(Path p, int i, float[] positions) {
     /**
      * Transforms the values contained in the axis entries to screen pixels and returns them in form of a float array
      * of x- and y-coordinates.
-     *
-     * @return
      */
     protected float[] getTransformedPositions() {
 
@@ -283,8 +266,6 @@ protected void drawZeroLine(Canvas c) {
     protected RectF mLimitLineClippingRect = new RectF();
     /**
      * Draws the LimitLines associated with this axis to the screen.
-     *
-     * @param c
      */
     @Override
     public void renderLimitLines(Canvas c) {
@@ -331,7 +312,7 @@ public void renderLimitLines(Canvas c) {
             String label = l.getLabel();
 
             // if drawing the limit-value label is enabled
-            if (label != null && !label.equals("")) {
+            if (label != null && !label.isEmpty()) {
 
                 mLimitLinePaint.setStyle(l.getTextStyle());
                 mLimitLinePaint.setPathEffect(null);

MPChartLib/src/test/java/com/github/mikephil/charting/test/AxisRendererTest.kt

@@ -3,6 +3,7 @@ package com.github.mikephil.charting.test
 import com.github.mikephil.charting.components.YAxis
 import com.github.mikephil.charting.renderer.AxisRenderer
 import com.github.mikephil.charting.renderer.YAxisRenderer
+import com.github.mikephil.charting.utils.ViewPortHandler
 import org.junit.Assert
 import org.junit.Test
 
@@ -11,7 +12,7 @@ class AxisRendererTest {
     fun testComputeAxisValues() {
         var yAxis = YAxis()
         yAxis.labelCount = 6
-        var renderer: AxisRenderer = YAxisRenderer(null, yAxis, null)
+        var renderer: AxisRenderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(0f, 100f, false)
         var entries = yAxis.mEntries
@@ -24,7 +25,7 @@ class AxisRendererTest {
         yAxis = YAxis()
         yAxis.labelCount = 6
         yAxis.granularity = 50f
-        renderer = YAxisRenderer(null, yAxis, null)
+        renderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(0f, 100f, false)
         entries = yAxis.mEntries
@@ -36,7 +37,7 @@ class AxisRendererTest {
 
         yAxis = YAxis()
         yAxis.setLabelCount(5, true)
-        renderer = YAxisRenderer(null, yAxis, null)
+        renderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(0f, 100f, false)
         entries = yAxis.mEntries
@@ -48,7 +49,7 @@ class AxisRendererTest {
 
         yAxis = YAxis()
         yAxis.setLabelCount(5, true)
-        renderer = YAxisRenderer(null, yAxis, null)
+        renderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(0f, 0.01f, false)
         entries = yAxis.mEntries
@@ -60,7 +61,7 @@ class AxisRendererTest {
 
         yAxis = YAxis()
         yAxis.setLabelCount(5, false)
-        renderer = YAxisRenderer(null, yAxis, null)
+        renderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(0f, 0.01f, false)
         entries = yAxis.mEntries
@@ -72,7 +73,7 @@ class AxisRendererTest {
 
         yAxis = YAxis()
         yAxis.labelCount = 6
-        renderer = YAxisRenderer(null, yAxis, null)
+        renderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(-50f, 50f, false)
         entries = yAxis.mEntries
@@ -84,7 +85,7 @@ class AxisRendererTest {
 
         yAxis = YAxis()
         yAxis.labelCount = 6
-        renderer = YAxisRenderer(null, yAxis, null)
+        renderer = YAxisRenderer(ViewPortHandler(), yAxis, null)
 
         renderer.computeAxis(-50f, 100f, false)
         entries = yAxis.mEntries