You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by fa...@apache.org on 2022/07/15 22:52:46 UTC

svn commit: r1902757 - in /poi/trunk: poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/ poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/ poi/src/test/java/org/apache/poi/ss/usermodel/

Author: fanningpj
Date: Fri Jul 15 22:52:45 2022
New Revision: 1902757

URL: http://svn.apache.org/viewvc?rev=1902757&view=rev
Log:
[github-349] tidy up some test assertions. Thanks to XenoAmess. This closes #349

Modified:
    poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
    poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
    poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
    poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java?rev=1902757&r1=1902756&r2=1902757&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFLineChartData.java Fri Jul 15 22:52:45 2022
@@ -18,7 +18,7 @@ package org.apache.poi.xssf.usermodel.ch
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.io.IOException;
 
@@ -50,7 +50,7 @@ class TestXSSFLineChartData {
     };
 
     @Test
-    void testOneSeriePlot() throws IOException {
+    void testOneSeriesPlot() throws IOException {
         XSSFWorkbook wb = new XSSFWorkbook();
         XSSFSheet sheet = (XSSFSheet) new SheetBuilder(wb, plotData).build();
         XSSFDrawing drawing = sheet.createDrawingPatriarch();
@@ -68,7 +68,7 @@ class TestXSSFLineChartData {
 
         assertNotNull(series);
         assertEquals(1, lineChartData.getSeriesCount());
-        assertTrue(lineChartData.getSeries(0) == series);
+        assertSame(series, lineChartData.getSeries(0));
 
         chart.plot(lineChartData);
         wb.close();

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java?rev=1902757&r1=1902756&r2=1902757&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xssf/usermodel/charts/TestXSSFScatterChartData.java Fri Jul 15 22:52:45 2022
@@ -19,7 +19,7 @@ package org.apache.poi.xssf.usermodel.ch
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertSame;
 
 import java.io.IOException;
 
@@ -52,7 +52,7 @@ public final class TestXSSFScatterChartD
     };
 
     @Test
-    void testOneSeriePlot() throws IOException {
+    void testOneSeriesPlot() throws IOException {
         XSSFWorkbook wb = new XSSFWorkbook();
         XSSFSheet sheet = (XSSFSheet) new SheetBuilder(wb, plotData).build();
         XSSFDrawing drawing = sheet.createDrawingPatriarch();
@@ -71,7 +71,7 @@ public final class TestXSSFScatterChartD
         assertEquals(ScatterStyle.LINE_MARKER, scatterChartData.getStyle());
         assertNotNull(series);
         assertEquals(1, scatterChartData.getSeriesCount());
-        assertTrue(scatterChartData.getSeries(0) == series);
+        assertSame(series, scatterChartData.getSeries(0));
 
         chart.plot(scatterChartData);
         wb.close();

Modified: poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java?rev=1902757&r1=1902756&r2=1902757&view=diff
==============================================================================
--- poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java (original)
+++ poi/trunk/poi-ooxml/src/test/java/org/apache/poi/xwpf/usermodel/TestXWPFComments.java Fri Jul 15 22:52:45 2022
@@ -55,7 +55,7 @@ class TestXWPFComments {
             assertNotNull(docIn.getDocComments());
             assertEquals(1, docIn.getComments().length);
             comment = docIn.getCommentByID("0");
-            assertTrue(null != comment);
+            assertNotNull(comment);
             assertEquals("Author", comment.getAuthor());
         }
     }

Modified: poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java
URL: http://svn.apache.org/viewvc/poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java?rev=1902757&r1=1902756&r2=1902757&view=diff
==============================================================================
--- poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java (original)
+++ poi/trunk/poi/src/test/java/org/apache/poi/ss/usermodel/BaseTestRangeCopier.java Fri Jul 15 22:52:45 2022
@@ -153,7 +153,7 @@ public abstract class BaseTestRangeCopie
         assertEquals(cellContent, getCellContent(destSheet, "D6"));
         assertFalse(destSheet.getMergedRegions().isEmpty());
         destSheet.getMergedRegions().forEach((mergedRegion) -> {
-            assertTrue(mergedRegion.equals(mergedRangeAddress));
+            assertEquals(mergedRangeAddress, mergedRegion);
         });
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org