From a7333c5f3ecb918a813c819524289ef0b608e846 Mon Sep 17 00:00:00 2001 From: Mattrixwv Date: Wed, 29 Jun 2022 11:28:27 -0400 Subject: [PATCH] Updated more sonarqube findings --- .../mattrixwv/matrix/TestDoubleMatrix.java | 35 +++++++++++-------- .../mattrixwv/matrix/TestIntegerMatrix.java | 35 +++++++++++-------- .../com/mattrixwv/matrix/TestLongMatrix.java | 35 +++++++++++-------- 3 files changed, 60 insertions(+), 45 deletions(-) diff --git a/src/test/java/com/mattrixwv/matrix/TestDoubleMatrix.java b/src/test/java/com/mattrixwv/matrix/TestDoubleMatrix.java index 75f7843..dc9fcdc 100644 --- a/src/test/java/com/mattrixwv/matrix/TestDoubleMatrix.java +++ b/src/test/java/com/mattrixwv/matrix/TestDoubleMatrix.java @@ -117,38 +117,43 @@ public class TestDoubleMatrix{ public void testEquals(){ //1x1 DoubleMatrix matrix = new DoubleMatrix(grid1); - assertTrue("DoubleMatrix 1x1 failed equals DoubleMatrix.", matrix.equals(matrix)); + boolean gridEquals = matrix.equals(matrix); + assertTrue("DoubleMatrix 1x1 failed equals DoubleMatrix.", gridEquals); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals = matrix.equals(grid1); - assertTrue("DoubleMatrix 1x1 failed equals double[][].", gridEquals); + boolean gridEquals1 = matrix.equals(grid1); + assertTrue("DoubleMatrix 1x1 failed equals double[][].", gridEquals1); //2x2 matrix = new DoubleMatrix(grid2); - assertTrue("DoubleMatrix 2x2 failed equals DoubleMatrix.", matrix.equals(matrix)); + boolean gridEquals2 = matrix.equals(matrix); + assertTrue("DoubleMatrix 2x2 failed equals DoubleMatrix.", gridEquals2); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals2 = matrix.equals(grid2); - assertTrue("DoubleMatrix 2x2 failed equals double[][].", gridEquals2); + boolean gridEquals21 = matrix.equals(grid2); + assertTrue("DoubleMatrix 2x2 failed equals double[][].", gridEquals21); //3x3 matrix = new DoubleMatrix(grid3); - assertTrue("DoubleMatrix 3x3 failed equals DoubleMatrix.", matrix.equals(matrix)); + boolean gridEquals3 = matrix.equals(matrix); + assertTrue("DoubleMatrix 3x3 failed equals DoubleMatrix.", gridEquals3); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals3 = matrix.equals(grid3); - assertTrue("DoubleMatrix 3x3 failed equals double[][].", gridEquals3); + boolean gridEquals31 = matrix.equals(grid3); + assertTrue("DoubleMatrix 3x3 failed equals double[][].", gridEquals31); //4x4 matrix = new DoubleMatrix(grid4); - assertTrue("DoubleMatrix 4x4 failed equals DoubleMatrix.", matrix.equals(matrix)); + boolean gridEquals4 = matrix.equals(matrix); + assertTrue("DoubleMatrix 4x4 failed equals DoubleMatrix.", gridEquals4); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals4 = matrix.equals(grid4); - assertTrue("DoubleMatrix 4x4 failed equals double[][].", gridEquals4); + boolean gridEquals41 = matrix.equals(grid4); + assertTrue("DoubleMatrix 4x4 failed equals double[][].", gridEquals41); //10x10 matrix = new DoubleMatrix(grid10); - assertTrue("DoubleMatrix 10x10 failed equals DoubleMatrix.", matrix.equals(matrix)); + boolean gridEquals10 = matrix.equals(matrix); + assertTrue("DoubleMatrix 10x10 failed equals DoubleMatrix.", gridEquals10); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals10 = matrix.equals(grid10); - assertTrue("DoubleMatrix 10x10 failed equals double[][].", gridEquals10); + boolean gridEquals101 = matrix.equals(grid10); + assertTrue("DoubleMatrix 10x10 failed equals double[][].", gridEquals101); } @Test diff --git a/src/test/java/com/mattrixwv/matrix/TestIntegerMatrix.java b/src/test/java/com/mattrixwv/matrix/TestIntegerMatrix.java index ada38fc..6ad0c0a 100644 --- a/src/test/java/com/mattrixwv/matrix/TestIntegerMatrix.java +++ b/src/test/java/com/mattrixwv/matrix/TestIntegerMatrix.java @@ -117,38 +117,43 @@ public class TestIntegerMatrix{ public void testEquals(){ //1x1 IntegerMatrix matrix = new IntegerMatrix(grid1); - assertTrue("IntegerMatrix 1x1 failed equals IntegerMatrix.", matrix.equals(matrix)); + boolean gridEquals = matrix.equals(matrix); + assertTrue("IntegerMatrix 1x1 failed equals IntegerMatrix.", gridEquals); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals = matrix.equals(grid1); - assertTrue("IntegerMatrix 1x1 failed equals int[][].", gridEquals); + boolean gridEquals1 = matrix.equals(grid1); + assertTrue("IntegerMatrix 1x1 failed equals int[][].", gridEquals1); //2x2 matrix = new IntegerMatrix(grid2); - assertTrue("IntegerMatrix 2x2 failed equals IntegerMatrix.", matrix.equals(matrix)); + boolean gridEquals2 = matrix.equals(matrix); + assertTrue("IntegerMatrix 2x2 failed equals IntegerMatrix.", gridEquals2); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals2 = matrix.equals(grid2); - assertTrue("IntegerMatrix 2x2 failed equals int[][].", gridEquals2); + boolean gridEquals21 = matrix.equals(grid2); + assertTrue("IntegerMatrix 2x2 failed equals int[][].", gridEquals21); //3x3 matrix = new IntegerMatrix(grid3); - assertTrue("IntegerMatrix 3x3 failed equals IntegerMatrix.", matrix.equals(matrix)); + boolean gridEquals3 = matrix.equals(matrix); + assertTrue("IntegerMatrix 3x3 failed equals IntegerMatrix.", gridEquals3); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals3 = matrix.equals(grid3); - assertTrue("IntegerMatrix 3x3 failed equals int[][].", gridEquals3); + boolean gridEquals31 = matrix.equals(grid3); + assertTrue("IntegerMatrix 3x3 failed equals int[][].", gridEquals31); //4x4 matrix = new IntegerMatrix(grid4); - assertTrue("IntegerMatrix 4x4 failed equals IntegerMatrix.", matrix.equals(matrix)); + boolean gridEquals4 = matrix.equals(matrix); + assertTrue("IntegerMatrix 4x4 failed equals IntegerMatrix.", gridEquals4); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals4 = matrix.equals(grid4); - assertTrue("IntegerMatrix 4x4 failed equals int[][].", gridEquals4); + boolean gridEquals41 = matrix.equals(grid4); + assertTrue("IntegerMatrix 4x4 failed equals int[][].", gridEquals41); //10x10 matrix = new IntegerMatrix(grid10); - assertTrue("IntegerMatrix = 10x10 failed equals IntegerMatrix.", matrix.equals(matrix)); + boolean gridEquals10 = matrix.equals(matrix); + assertTrue("IntegerMatrix = 10x10 failed equals IntegerMatrix.", gridEquals10); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals10 = matrix.equals(grid10); - assertTrue("IntegerMatrix 10x10 failed equals int[][].", gridEquals10); + boolean gridEquals101 = matrix.equals(grid10); + assertTrue("IntegerMatrix 10x10 failed equals int[][].", gridEquals101); } @Test diff --git a/src/test/java/com/mattrixwv/matrix/TestLongMatrix.java b/src/test/java/com/mattrixwv/matrix/TestLongMatrix.java index c8bdf68..10fae9c 100644 --- a/src/test/java/com/mattrixwv/matrix/TestLongMatrix.java +++ b/src/test/java/com/mattrixwv/matrix/TestLongMatrix.java @@ -117,38 +117,43 @@ public class TestLongMatrix{ public void testEquals(){ //1x1 LongMatrix matrix = new LongMatrix(grid1); - assertTrue("LongMatrix 1x1 failed equals LongMatrix.", matrix.equals(matrix)); + boolean gridEquals = matrix.equals(matrix); + assertTrue("LongMatrix 1x1 failed equals LongMatrix.", gridEquals); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals = matrix.equals(grid1); - assertTrue("LongMatrix 1x1 failed equals long[][].", gridEquals); + boolean gridEquals1 = matrix.equals(grid1); + assertTrue("LongMatrix 1x1 failed equals long[][].", gridEquals1); //2x2 matrix = new LongMatrix(grid2); - assertTrue("LongMatrix 2x2 failed equals LongMatrix.", matrix.equals(matrix)); + boolean gridEquals2 = matrix.equals(matrix); + assertTrue("LongMatrix 2x2 failed equals LongMatrix.", gridEquals2); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals2 = matrix.equals(grid2); - assertTrue("LongMatrix 2x2 failed equals long[][].", gridEquals2); + boolean gridEquals21 = matrix.equals(grid2); + assertTrue("LongMatrix 2x2 failed equals long[][].", gridEquals21); //3x3 matrix = new LongMatrix(grid3); - assertTrue("LongMatrix 3x3 failed equals LongMatrix.", matrix.equals(matrix)); + boolean gridEquals3 = matrix.equals(matrix); + assertTrue("LongMatrix 3x3 failed equals LongMatrix.", gridEquals3); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals3 = matrix.equals(grid3); - assertTrue("LongMatrix 3x3 failed equals long[][].", gridEquals3); + boolean gridEquals31 = matrix.equals(grid3); + assertTrue("LongMatrix 3x3 failed equals long[][].", gridEquals31); //4x4 matrix = new LongMatrix(grid4); - assertTrue("LongMatrix 4x4 failed equals LongMatrix.", matrix.equals(matrix)); + boolean gridEquals4 = matrix.equals(matrix); + assertTrue("LongMatrix 4x4 failed equals LongMatrix.", gridEquals4); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals4 = matrix.equals(grid4); - assertTrue("LongMatrix 4x4 failed equals long[][].", gridEquals4); + boolean gridEquals41 = matrix.equals(grid4); + assertTrue("LongMatrix 4x4 failed equals long[][].", gridEquals41); //10x10 matrix = new LongMatrix(grid10); - assertTrue("LongMatrix = 10x10 failed equals LongMatrix.", matrix.equals(matrix)); + boolean gridEquals10 = matrix.equals(matrix); + assertTrue("LongMatrix = 10x10 failed equals LongMatrix.", gridEquals10); @SuppressWarnings("unlikely-arg-type") - boolean gridEquals10 = matrix.equals(grid10); - assertTrue("LongMatrix 10x10 failed equals long[][].", gridEquals10); + boolean gridEquals101 = matrix.equals(grid10); + assertTrue("LongMatrix 10x10 failed equals long[][].", gridEquals101); } @Test