You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2020/02/16 15:23:50 UTC
svn commit: r1874082 - in
/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util: MatrixTest.java
TestMatrix.java
Author: lehmi
Date: Sun Feb 16 15:23:49 2020
New Revision: 1874082
URL: http://svn.apache.org/viewvc?rev=1874082&view=rev
Log:
PDFBOX-4778: add tests, merge test classes
Removed:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestMatrix.java
Modified:
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/MatrixTest.java
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/MatrixTest.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/MatrixTest.java?rev=1874082&r1=1874081&r2=1874082&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/MatrixTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/MatrixTest.java Sun Feb 16 15:23:49 2020
@@ -22,11 +22,125 @@ import static org.junit.Assert.*;
/**
*
+ * @author Neil McErlean
* @author Tilman Hausherr
*/
public class MatrixTest
{
+ @Test
+ public void testConstructionAndCopy() throws Exception
+ {
+ Matrix m1 = new Matrix();
+ assertMatrixIsPristine(m1);
+
+ Matrix m2 = m1.clone();
+ assertNotSame(m1, m2);
+ assertMatrixIsPristine(m2);
+ }
+
+ @Test
+ public void testMultiplication() throws Exception
+ {
+ // This matrix will not change - we use it to drive the various multiplications.
+ final Matrix testMatrix = new Matrix();
+
+ // Create matrix with values
+ // [ 0, 1, 2
+ // 1, 2, 3
+ // 2, 3, 4]
+ for (int x = 0; x < 3; x++)
+ {
+ for (int y = 0; y < 3; y++)
+ {
+ testMatrix.setValue(x, y, x + y);
+ }
+ }
+
+ Matrix m1 = testMatrix.clone();
+ Matrix m2 = testMatrix.clone();
+
+ // Multiply two matrices together producing a new result matrix.
+ Matrix product = m1.multiply(m2);
+
+ assertNotSame(m1, product);
+ assertNotSame(m2, product);
+
+ // Operand 1 should not have changed
+ assertMatrixValuesEqualTo(new float[] { 0, 1, 2, 1, 2, 3, 2, 3, 4 }, m1);
+ // Operand 2 should not have changed
+ assertMatrixValuesEqualTo(new float[] { 0, 1, 2, 1, 2, 3, 2, 3, 4 }, m2);
+ assertMatrixValuesEqualTo(new float[] { 5, 8, 11, 8, 14, 20, 11, 20, 29 }, product);
+
+ // Multiply two matrices together with the result being written to a third matrix
+ // (Any existing values there will be overwritten).
+ Matrix resultMatrix = new Matrix();
+
+ Matrix retVal = m1.multiply(m2, resultMatrix);
+ assertSame(retVal, resultMatrix);
+ // Operand 1 should not have changed
+ assertMatrixValuesEqualTo(new float[] { 0, 1, 2, 1, 2, 3, 2, 3, 4 }, m1);
+ // Operand 2 should not have changed
+ assertMatrixValuesEqualTo(new float[] { 0, 1, 2, 1, 2, 3, 2, 3, 4 }, m2);
+ assertMatrixValuesEqualTo(new float[] { 5, 8, 11, 8, 14, 20, 11, 20, 29 }, resultMatrix);
+
+ // Multiply two matrices together with the result being written into the other matrix
+ retVal = m1.multiply(m2, m2);
+ assertSame(retVal, m2);
+ // Operand 1 should not have changed
+ assertMatrixValuesEqualTo(new float[] { 0, 1, 2, 1, 2, 3, 2, 3, 4 }, m1);
+ assertMatrixValuesEqualTo(new float[] { 5, 8, 11, 8, 14, 20, 11, 20, 29 }, retVal);
+
+ // Multiply two matrices together with the result being written into 'this' matrix
+ m1 = testMatrix.clone();
+ m2 = testMatrix.clone();
+
+ retVal = m1.multiply(m2, m1);
+ assertSame(retVal, m1);
+ // Operand 2 should not have changed
+ assertMatrixValuesEqualTo(new float[] { 0, 1, 2, 1, 2, 3, 2, 3, 4 }, m2);
+ assertMatrixValuesEqualTo(new float[] { 5, 8, 11, 8, 14, 20, 11, 20, 29 }, retVal);
+
+ // Multiply the same matrix with itself with the result being written into 'this' matrix
+ m1 = testMatrix.clone();
+
+ retVal = m1.multiply(m1, m1);
+ assertSame(retVal, m1);
+ assertMatrixValuesEqualTo(new float[] { 5, 8, 11, 8, 14, 20, 11, 20, 29 }, retVal);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testIllegalValueNaN1()
+ {
+ Matrix m = new Matrix();
+ m.setValue(0, 0, Float.MAX_VALUE);
+ m.multiply(m, m);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testIllegalValueNaN2()
+ {
+ Matrix m = new Matrix();
+ m.setValue(0, 0, Float.NaN);
+ m.multiply(m, m);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testIllegalValuePositiveInfinity()
+ {
+ Matrix m = new Matrix();
+ m.setValue(0, 0, Float.POSITIVE_INFINITY);
+ m.multiply(m, m);
+ }
+
+ @Test(expected = IllegalArgumentException.class)
+ public void testIllegalValueNegativeInfinity()
+ {
+ Matrix m = new Matrix();
+ m.setValue(0, 0, Float.NEGATIVE_INFINITY);
+ m.multiply(m, m);
+ }
+
/**
* Test of PDFBOX-2872 bug
*/
@@ -44,5 +158,36 @@ public class MatrixTest
}
-
+ /**
+ * This method asserts that the matrix values for the given {@link Matrix} object are equal to the pristine, or
+ * original, values.
+ *
+ * @param m the Matrix to test.
+ */
+ private void assertMatrixIsPristine(Matrix m)
+ {
+ assertMatrixValuesEqualTo(new float[] { 1, 0, 0, 0, 1, 0, 0, 0, 1 }, m);
+ }
+
+ /**
+ * This method asserts that the matrix values for the given {@link Matrix} object have the specified values.
+ *
+ * @param values the expected values
+ * @param m the matrix to test
+ */
+ private void assertMatrixValuesEqualTo(float[] values, Matrix m)
+ {
+ float delta = 0.00001f;
+ for (int i = 0; i < values.length; i++)
+ {
+ // Need to convert a (row, column) coordinate into a straight index.
+ int row = (int) Math.floor(i / 3);
+ int column = i % 3;
+ StringBuilder failureMsg = new StringBuilder();
+ failureMsg.append("Incorrect value for matrix[").append(row).append(",").append(column)
+ .append("]");
+ assertEquals(failureMsg.toString(), values[i], m.getValue(row, column), delta);
+ }
+ }
+
}