You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@poi.apache.org by ki...@apache.org on 2019/12/27 23:00:20 UTC
svn commit: r1872041 [13/23] - in /poi/trunk/src:
excelant/testcases/org/apache/poi/ss/examples/formula/
excelant/testcases/org/apache/poi/ss/excelant/
excelant/testcases/org/apache/poi/ss/excelant/util/
java/org/apache/poi/hssf/record/aggregates/ java...
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaFormatRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,20 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AreaFormatRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestAreaFormatRecord extends TestCase {
+public final class TestAreaFormatRecord {
byte[] data = new byte[] {
(byte)0xFF,(byte)0xFF,(byte)0xFF,(byte)0x00, // forecolor
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00, // backcolor
@@ -41,8 +42,8 @@ public final class TestAreaFormatRecord
};
+ @Test
public void testLoad() {
-
AreaFormatRecord record = new AreaFormatRecord(TestcaseRecordInputStream.create(0x100a, data));
assertEquals( 0xFFFFFF, record.getForegroundColor());
assertEquals( 0x000000, record.getBackgroundColor());
@@ -57,8 +58,8 @@ public final class TestAreaFormatRecord
assertEquals( 20, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AreaFormatRecord record = new AreaFormatRecord();
record.setForegroundColor( 0xFFFFFF );
record.setBackgroundColor( 0x000000 );
@@ -70,8 +71,6 @@ public final class TestAreaFormatRecord
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(AreaFormatRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAreaRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,25 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AreaRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestAreaRecord extends TestCase {
+public final class TestAreaRecord {
byte[] data = new byte[] {
(byte)0x02,(byte)0x00 // format flags
};
+ @Test
public void testLoad() {
AreaRecord record = new AreaRecord(TestcaseRecordInputStream.create(0x101A, data));
@@ -43,21 +45,17 @@ public final class TestAreaRecord extend
assertTrue(record.isDisplayAsPercentage());
assertFalse(record.isShadow());
-
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AreaRecord record = new AreaRecord();
record.setStacked( false );
record.setDisplayAsPercentage( true );
record.setShadow( false );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(AreaRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisLineFormatRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AxisLineFormatRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestAxisLineFormatRecord extends TestCase {
+public final class TestAxisLineFormatRecord {
byte[] data = new byte[] {
(byte)0x01,(byte)0x00
};
+ @Test
public void testLoad() {
AxisLineFormatRecord record = new AxisLineFormatRecord(TestcaseRecordInputStream.create(0x1021, data));
assertEquals( AxisLineFormatRecord.AXIS_TYPE_MAJOR_GRID_LINE, record.getAxisType());
@@ -42,15 +42,12 @@ public final class TestAxisLineFormatRec
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AxisLineFormatRecord record = new AxisLineFormatRecord();
record.setAxisType( AxisLineFormatRecord.AXIS_TYPE_MAJOR_GRID_LINE );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(AxisLineFormatRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisOptionsRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,20 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AxisOptionsRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Andrew C. Oliver(acoliver at apache.org)
*/
-public final class TestAxisOptionsRecord extends TestCase {
+public final class TestAxisOptionsRecord {
private static final byte[] data = {
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x00,
@@ -38,6 +39,7 @@ public final class TestAxisOptionsRecord
(byte)0x00,(byte)0xEF,(byte)0x00
};
+ @Test
public void testLoad() {
AxisOptionsRecord record = new AxisOptionsRecord(TestcaseRecordInputStream.create(0x1062, data));
assertEquals( 0, record.getMinimumCategory());
@@ -61,8 +63,8 @@ public final class TestAxisOptionsRecord
assertEquals( 22, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AxisOptionsRecord record = new AxisOptionsRecord();
record.setMinimumCategory( (short)0 );
record.setMaximumCategory( (short)0 );
@@ -84,8 +86,6 @@ public final class TestAxisOptionsRecord
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(AxisOptionsRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisParentRecord.java Fri Dec 27 23:00:13 2019
@@ -18,18 +18,18 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AxisParentRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestAxisParentRecord extends TestCase {
+public final class TestAxisParentRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00, // axis type
(byte)0x1D,(byte)0x02,(byte)0x00,(byte)0x00, // x
@@ -38,6 +38,7 @@ public final class TestAxisParentRecord
(byte)0x56,(byte)0x0B,(byte)0x00,(byte)0x00 // height
};
+ @Test
public void testLoad() {
AxisParentRecord record = new AxisParentRecord(TestcaseRecordInputStream.create(0x1041, data));
assertEquals( AxisParentRecord.AXIS_TYPE_MAIN, record.getAxisType());
@@ -49,8 +50,8 @@ public final class TestAxisParentRecord
assertEquals( 22, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AxisParentRecord record = new AxisParentRecord();
record.setAxisType( AxisParentRecord.AXIS_TYPE_MAIN );
record.setX( 0x021d );
@@ -60,8 +61,6 @@ public final class TestAxisParentRecord
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(AxisParentRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,18 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AxisRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestAxisRecord extends TestCase {
+public final class TestAxisRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00, // type
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
@@ -39,8 +38,8 @@ public final class TestAxisRecord extend
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00
};
+ @Test
public void testLoad() {
-
AxisRecord record = new AxisRecord(TestcaseRecordInputStream.create(0x101d, data));
assertEquals( AxisRecord.AXIS_TYPE_CATEGORY_OR_X_AXIS, record.getAxisType());
assertEquals( 0, record.getReserved1());
@@ -51,8 +50,8 @@ public final class TestAxisRecord extend
assertEquals( 4 + 18, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AxisRecord record = new AxisRecord();
record.setAxisType( AxisRecord.AXIS_TYPE_CATEGORY_OR_X_AXIS );
record.setReserved1( 0 );
@@ -60,10 +59,7 @@ public final class TestAxisRecord extend
record.setReserved3( 0 );
record.setReserved4( 0 );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(AxisRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestAxisUsedRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the AxisUsedRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestAxisUsedRecord extends TestCase {
+public final class TestAxisUsedRecord {
byte[] data = new byte[] {
(byte)0x01,(byte)0x00,
};
+ @Test
public void testLoad() {
AxisUsedRecord record = new AxisUsedRecord(TestcaseRecordInputStream.create(0x1046, data));
assertEquals( 1, record.getNumAxis());
@@ -42,15 +42,12 @@ public final class TestAxisUsedRecord ex
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
AxisUsedRecord record = new AxisUsedRecord();
record.setNumAxis( (short)1 );
-
- byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ byte[] recordBytes = record.serialize();
+ confirmRecordEncoding(AxisUsedRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestBarRecord.java Fri Dec 27 23:00:13 2019
@@ -18,27 +18,27 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the BarRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestBarRecord extends TestCase {
+public final class TestBarRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00, // bar space
(byte)0x96,(byte)0x00, // category space
(byte)0x00,(byte)0x00 // format flags
};
+ @Test
public void testLoad() {
-
BarRecord record = new BarRecord(TestcaseRecordInputStream.create(0x1017, data));
assertEquals( 0, record.getBarSpace());
assertEquals( 0x96, record.getCategorySpace());
@@ -51,8 +51,8 @@ public final class TestBarRecord extends
assertEquals( 10, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
BarRecord record = new BarRecord();
record.setBarSpace( (short)0 );
record.setCategorySpace( (short)0x96 );
@@ -63,8 +63,6 @@ public final class TestBarRecord extends
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(BarRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestCategorySeriesAxisRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,20 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the CategorySeriesAxisRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestCategorySeriesAxisRecord extends TestCase {
+public final class TestCategorySeriesAxisRecord {
byte[] data = new byte[] {
(byte)0x01,(byte)0x00, // crossing point
(byte)0x01,(byte)0x00, // label frequency
@@ -38,8 +39,8 @@ public final class TestCategorySeriesAxi
(byte)0x01,(byte)0x00 // options
};
+ @Test
public void testLoad() {
-
CategorySeriesAxisRecord record = new CategorySeriesAxisRecord(TestcaseRecordInputStream.create(0x1020, data));
assertEquals( 1, record.getCrossingPoint());
assertEquals( 1, record.getLabelFrequency());
@@ -52,8 +53,8 @@ public final class TestCategorySeriesAxi
assertEquals( 4 + 8, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
CategorySeriesAxisRecord record = new CategorySeriesAxisRecord();
record.setCrossingPoint( (short)1 );
record.setLabelFrequency( (short)1 );
@@ -64,8 +65,6 @@ public final class TestCategorySeriesAxi
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(CategorySeriesAxisRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartFormatRecord.java Fri Dec 27 23:00:13 2019
@@ -18,20 +18,19 @@
package org.apache.poi.hssf.record.chart;
import static org.junit.Assert.assertArrayEquals;
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.util.HexRead;
+import org.junit.Test;
/**
* Tests for {@link ChartFormatRecord} Test data taken directly from a real
* Excel file.
- *
- * @author Josh Micich
*/
-public final class TestChartFormatRecord extends TestCase {
+public final class TestChartFormatRecord {
/**
* This rather uninteresting data came from attachment 23347 of bug 46693 at
* offsets 0x6BB2 and 0x7BAF
@@ -45,12 +44,11 @@ public final class TestChartFormatRecord
/**
* The correct size of a {@link ChartFormatRecord} is 20 bytes (not including header).
*/
+ @Test
public void testLoad() {
RecordInputStream in = TestcaseRecordInputStream.create(data);
ChartFormatRecord record = new ChartFormatRecord(in);
- if (in.remaining() == 2) {
- throw new AssertionFailedError("Identified bug 44693d");
- }
+ assertNotEquals("Identified bug 44693d", 2, in.remaining());
assertEquals(0, in.remaining());
assertEquals(24, record.getRecordSize());
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestChartRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,18 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the ChartRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestChartRecord extends TestCase {
+public final class TestChartRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,
@@ -38,8 +37,8 @@ public final class TestChartRecord exten
(byte)0xC8,(byte)0xCC,(byte)0xE5,(byte)0x00
};
+ @Test
public void testLoad() {
-
ChartRecord record = new ChartRecord(TestcaseRecordInputStream.create(0x1002, data));
assertEquals( 0, record.getX());
assertEquals( 0, record.getY());
@@ -49,8 +48,8 @@ public final class TestChartRecord exten
assertEquals( 20, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
ChartRecord record = new ChartRecord();
record.setX( 0 );
record.setY( 0 );
@@ -59,8 +58,6 @@ public final class TestChartRecord exten
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(ChartRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDatRecord.java Fri Dec 27 23:00:13 2019
@@ -18,25 +18,26 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the DatRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestDatRecord extends TestCase {
+public final class TestDatRecord {
byte[] data = new byte[] {
(byte)0x0D,(byte)0x00 // options
};
+ @Test
public void testLoad() {
-
DatRecord record = new DatRecord(TestcaseRecordInputStream.create(0x1063, data));
assertEquals( 0xD, record.getOptions());
assertTrue(record.isHorizontalBorder());
@@ -47,8 +48,8 @@ public final class TestDatRecord extends
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
DatRecord record = new DatRecord();
record.setHorizontalBorder( true );
record.setVerticalBorder( false );
@@ -57,8 +58,6 @@ public final class TestDatRecord extends
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(DatRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDataFormatRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,19 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the DataFormatRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestDataFormatRecord extends TestCase {
+public final class TestDataFormatRecord {
byte[] data = new byte[] {
(byte)0xFF,(byte)0xFF, // point number
(byte)0x00,(byte)0x00, // series index
@@ -38,8 +38,8 @@ public final class TestDataFormatRecord
(byte)0x00,(byte)0x00 // format flags
};
+ @Test
public void testLoad() {
-
DataFormatRecord record = new DataFormatRecord(TestcaseRecordInputStream.create(0x1006, data));
assertEquals( (short)0xFFFF, record.getPointNumber());
assertEquals( 0, record.getSeriesIndex());
@@ -50,8 +50,8 @@ public final class TestDataFormatRecord
assertEquals( 12, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
DataFormatRecord record = new DataFormatRecord();
record.setPointNumber( (short)0xFFFF );
record.setSeriesIndex( (short)0 );
@@ -61,8 +61,6 @@ public final class TestDataFormatRecord
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(DataFormatRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestDefaultDataLabelTextPropertiesRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the DefaultDataLabelTextPropertiesRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestDefaultDataLabelTextPropertiesRecord extends TestCase {
+public final class TestDefaultDataLabelTextPropertiesRecord {
byte[] data = new byte[] {
(byte)0x02,(byte)0x00
};
+ @Test
public void testLoad() {
DefaultDataLabelTextPropertiesRecord record = new DefaultDataLabelTextPropertiesRecord(TestcaseRecordInputStream.create(0x1024, data));
@@ -43,15 +43,12 @@ public final class TestDefaultDataLabelT
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
DefaultDataLabelTextPropertiesRecord record = new DefaultDataLabelTextPropertiesRecord();
record.setCategoryDataType( (short)2 );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(DefaultDataLabelTextPropertiesRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontBasisRecord.java Fri Dec 27 23:00:13 2019
@@ -14,23 +14,22 @@
See the License for the specific language governing permissions and
limitations under the License.
==================================================================== */
-
+
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the FontBasisRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestFontBasisRecord extends TestCase {
+public final class TestFontBasisRecord {
byte[] data = new byte[] {
(byte)0x28,(byte)0x1A, // x basis
(byte)0x9C,(byte)0x0F, // y basis
@@ -39,8 +38,8 @@ public final class TestFontBasisRecord e
(byte)0x05,(byte)0x00 // index to font table
};
+ @Test
public void testLoad() {
-
FontBasisRecord record = new FontBasisRecord(TestcaseRecordInputStream.create(0x1060, data));
assertEquals( 0x1a28, record.getXBasis());
assertEquals( 0x0f9c, record.getYBasis());
@@ -51,8 +50,8 @@ public final class TestFontBasisRecord e
assertEquals( 14, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
FontBasisRecord record = new FontBasisRecord();
record.setXBasis( (short)0x1a28 );
record.setYBasis( (short)0x0f9c );
@@ -61,8 +60,6 @@ public final class TestFontBasisRecord e
record.setIndexToFontTable( (short)0x05 );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(FontBasisRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFontIndexRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the FontIndexRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestFontIndexRecord extends TestCase {
+public final class TestFontIndexRecord {
byte[] data = new byte[] {
(byte)0x05,(byte)0x00
};
+ @Test
public void testLoad() {
FontIndexRecord record = new FontIndexRecord(TestcaseRecordInputStream.create(0x1026, data));
@@ -43,15 +43,12 @@ public final class TestFontIndexRecord e
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
FontIndexRecord record = new FontIndexRecord();
record.setFontIndex( (short)5 );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(FontIndexRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestFrameRecord.java Fri Dec 27 23:00:13 2019
@@ -18,26 +18,27 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the FrameRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestFrameRecord extends TestCase {
+public final class TestFrameRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00, // border type
(byte)0x02,(byte)0x00 // options
};
+ @Test
public void testLoad() {
-
FrameRecord record = new FrameRecord(TestcaseRecordInputStream.create(0x1032, data));
assertEquals( FrameRecord.BORDER_TYPE_REGULAR, record.getBorderType());
assertEquals( 2, record.getOptions());
@@ -47,8 +48,8 @@ public final class TestFrameRecord exten
assertEquals( 8, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
FrameRecord record = new FrameRecord();
record.setBorderType( FrameRecord.BORDER_TYPE_REGULAR );
record.setOptions( (short)2 );
@@ -57,8 +58,6 @@ public final class TestFrameRecord exten
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(FrameRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLegendRecord.java Fri Dec 27 23:00:13 2019
@@ -17,23 +17,25 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the LegendRecord class works
* correctly. Test data taken directly from a real Excel file.
- *
- *
- * @author Andrew C. Oliver (acoliver at apache.org)
*/
-public final class TestLegendRecord extends TestCase {
+public final class TestLegendRecord {
byte[] data = new byte[] { (byte) 0x76, (byte) 0x0E, (byte) 0x00, (byte) 0x00, (byte) 0x86,
(byte) 0x07, (byte) 0x00, (byte) 0x00, (byte) 0x19, (byte) 0x01, (byte) 0x00,
(byte) 0x00, (byte) 0x8B, (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0x03,
(byte) 0x01, (byte) 0x1F, (byte) 0x00 };
+ @Test
public void testLoad() {
LegendRecord record = new LegendRecord(TestcaseRecordInputStream.create(0x1015, data));
@@ -60,6 +62,7 @@ public final class TestLegendRecord exte
assertEquals(24, record.getRecordSize());
}
+ @Test
public void testStore() {
LegendRecord record = new LegendRecord();
@@ -84,8 +87,6 @@ public final class TestLegendRecord exte
record.setDataTable(false);
byte[] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i + 4]);
+ confirmRecordEncoding(LegendRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLineFormatRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,20 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the LineFormatRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestLineFormatRecord extends TestCase {
+public final class TestLineFormatRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00, // colour
(byte)0x00,(byte)0x00, // pattern
@@ -39,6 +40,7 @@ public final class TestLineFormatRecord
(byte)0x4D,(byte)0x00 // index
};
+ @Test
public void testLoad() {
LineFormatRecord record = new LineFormatRecord(TestcaseRecordInputStream.create(0x1007, data));
assertEquals( 0, record.getLineColor());
@@ -52,8 +54,8 @@ public final class TestLineFormatRecord
assertEquals( 16, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
LineFormatRecord record = new LineFormatRecord();
record.setLineColor( 0 );
record.setLinePattern( (short)0 );
@@ -64,8 +66,6 @@ public final class TestLineFormatRecord
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(LineFormatRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestLinkedDataRecord.java Fri Dec 27 23:00:13 2019
@@ -18,20 +18,21 @@
package org.apache.poi.hssf.record.chart;
-import junit.framework.TestCase;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.ss.formula.ptg.Area3DPtg;
import org.apache.poi.ss.formula.ptg.Ptg;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the LinkedDataRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestLinkedDataRecord extends TestCase {
+public final class TestLinkedDataRecord {
/*
The records below are records that would appear in a simple bar chart
@@ -156,8 +157,8 @@ recordid = 0x1051, size =8
(byte)0x00,(byte)0x00, // index to last column and relative flags
};
+ @Test
public void testLoad() {
-
LinkedDataRecord record = new LinkedDataRecord(TestcaseRecordInputStream.create(0x1051, data));
assertEquals( LinkedDataRecord.LINK_TYPE_VALUES, record.getLinkType());
assertEquals( LinkedDataRecord.REFERENCE_TYPE_WORKSHEET, record.getReferenceType());
@@ -167,13 +168,14 @@ recordid = 0x1051, size =8
Area3DPtg ptgExpected = new Area3DPtg(0, 7936, 0, 0,
false, false, false, false, 0);
-
+
Ptg ptgActual = record.getFormulaOfLink()[0];
assertEquals(ptgExpected.toString(), ptgActual.toString());
assertEquals( data.length + 4, record.getRecordSize() );
}
+ @Test
public void testStore() {
LinkedDataRecord record = new LinkedDataRecord();
record.setLinkType( LinkedDataRecord.LINK_TYPE_VALUES );
@@ -186,8 +188,6 @@ recordid = 0x1051, size =8
record.setFormulaOfLink(new Ptg[] { ptg, } );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(LinkedDataRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestNumberFormatIndexRecord.java Fri Dec 27 23:00:13 2019
@@ -18,40 +18,36 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the NumberFormatIndexRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestNumberFormatIndexRecord extends TestCase {
+public final class TestNumberFormatIndexRecord {
byte[] data = new byte[] {
0x05,0x00
};
+ @Test
public void testLoad() {
-
NumberFormatIndexRecord record = new NumberFormatIndexRecord(TestcaseRecordInputStream.create(0x104e, data));
assertEquals( 5, record.getFormatIndex());
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
NumberFormatIndexRecord record = new NumberFormatIndexRecord();
record.setFormatIndex( (short)5 );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(NumberFormatIndexRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestObjectLinkRecord.java Fri Dec 27 23:00:13 2019
@@ -18,26 +18,26 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the ObjectLinkRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
*/
-public final class TestObjectLinkRecord extends TestCase {
+public final class TestObjectLinkRecord {
byte[] data = new byte[] {
(byte)0x03,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00
};
+ @Test
public void testLoad() {
ObjectLinkRecord record = new ObjectLinkRecord(TestcaseRecordInputStream.create(0x1027, data));
-
+
assertEquals( (short)3, record.getAnchorId());
assertEquals( (short)0x00, record.getLink1());
assertEquals( (short)0x00, record.getLink2());
@@ -45,6 +45,7 @@ public final class TestObjectLinkRecord
assertEquals( 10, record.getRecordSize() );
}
+ @Test
public void testStore() {
ObjectLinkRecord record = new ObjectLinkRecord();
@@ -54,8 +55,6 @@ public final class TestObjectLinkRecord
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(ObjectLinkRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotAreaRecord.java Fri Dec 27 23:00:13 2019
@@ -18,35 +18,33 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the PlotAreaRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
*/
-public final class TestPlotAreaRecord extends TestCase {
+public final class TestPlotAreaRecord {
byte[] data = new byte[] {
-
+
};
+ @Test
public void testLoad() {
PlotAreaRecord record = new PlotAreaRecord(TestcaseRecordInputStream.create(0x1035, data));
assertEquals( 4, record.getRecordSize() );
}
+ @Test
public void testStore() {
PlotAreaRecord record = new PlotAreaRecord();
byte [] recordBytes = record.serialize();
assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestPlotGrowthRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,24 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the PlotGrowthRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestPlotGrowthRecord extends TestCase {
+public final class TestPlotGrowthRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x00, // horizontal
(byte)0x00,(byte)0x00,(byte)0x01,(byte)0x00 // vertical
};
+ @Test
public void testLoad() {
PlotGrowthRecord record = new PlotGrowthRecord(TestcaseRecordInputStream.create(0x1064, data));
@@ -44,16 +45,14 @@ public final class TestPlotGrowthRecord
assertEquals( 12, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
PlotGrowthRecord record = new PlotGrowthRecord();
record.setHorizontalScale( 65536 );
record.setVerticalScale( 65536 );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(PlotGrowthRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesChartGroupIndexRecord.java Fri Dec 27 23:00:13 2019
@@ -18,22 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesChartGroupIndexRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestSeriesChartGroupIndexRecord extends TestCase {
+public final class TestSeriesChartGroupIndexRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00
};
+ @Test
public void testLoad() {
SeriesChartGroupIndexRecord record = new SeriesChartGroupIndexRecord(TestcaseRecordInputStream.create(0x1045, data));
assertEquals( 0, record.getChartGroupIndex());
@@ -41,15 +42,13 @@ public final class TestSeriesChartGroupI
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
SeriesChartGroupIndexRecord record = new SeriesChartGroupIndexRecord();
record.setChartGroupIndex( (short)0 );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(SeriesChartGroupIndexRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesIndexRecord.java Fri Dec 27 23:00:13 2019
@@ -18,42 +18,37 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesIndexRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
*/
-public final class TestSeriesIndexRecord extends TestCase {
+public final class TestSeriesIndexRecord {
byte[] data = new byte[] {
(byte)0x03,(byte)0x00
};
+ @Test
public void testLoad() {
SeriesIndexRecord record = new SeriesIndexRecord(TestcaseRecordInputStream.create(0x1065, data));
-
+
assertEquals( (short)3, record.getIndex());
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
SeriesIndexRecord record = new SeriesIndexRecord();
-
-
-
record.setIndex( (short)3 );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(SeriesIndexRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesLabelsRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,25 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesLabelsRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestSeriesLabelsRecord extends TestCase {
+public final class TestSeriesLabelsRecord {
byte[] data = new byte[] {
(byte)0x03,(byte)0x00
};
+ @Test
public void testLoad() {
SeriesLabelsRecord record = new SeriesLabelsRecord(TestcaseRecordInputStream.create(0x100c, data));
assertEquals( 3, record.getFormatFlags());
@@ -45,12 +47,11 @@ public final class TestSeriesLabelsRecor
assertFalse(record.isShowLabel());
assertFalse(record.isShowBubbleSizes());
-
assertEquals( 2+4, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
SeriesLabelsRecord record = new SeriesLabelsRecord();
record.setShowActual( true );
record.setShowPercent( true );
@@ -61,8 +62,6 @@ public final class TestSeriesLabelsRecor
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(SeriesLabelsRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesListRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesListRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestSeriesListRecord extends TestCase {
+public final class TestSeriesListRecord {
private static final byte[] data = {
(byte)0x02,(byte)0x00,(byte)0x01,(byte)0x20,(byte)0xff,(byte)0xf0
};
+ @Test
public void testLoad() {
SeriesListRecord record = new SeriesListRecord(TestcaseRecordInputStream.create(0x1016, data));
@@ -45,12 +45,11 @@ public final class TestSeriesListRecord
assertEquals( 4 + 6, record.getRecordSize() );
}
+ @Test
public void testStore() {
SeriesListRecord record = new SeriesListRecord(new short[] { (short)0x2001, (short)0xf0ff } );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(SeriesListRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesRecord.java Fri Dec 27 23:00:13 2019
@@ -18,18 +18,18 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestSeriesRecord extends TestCase {
+public final class TestSeriesRecord {
byte[] data = new byte[] {
(byte)0x01,(byte)0x00, // category data type
(byte)0x01,(byte)0x00, // values data type
@@ -39,8 +39,8 @@ public final class TestSeriesRecord exte
(byte)0x00,(byte)0x00 // num bubble values
};
+ @Test
public void testLoad() {
-
SeriesRecord record = new SeriesRecord(TestcaseRecordInputStream.create(0x1003, data));
assertEquals( SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC, record.getCategoryDataType());
assertEquals( SeriesRecord.VALUES_DATA_TYPE_NUMERIC, record.getValuesDataType());
@@ -53,8 +53,8 @@ public final class TestSeriesRecord exte
assertEquals( 16, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
SeriesRecord record = new SeriesRecord();
record.setCategoryDataType( SeriesRecord.CATEGORY_DATA_TYPE_NUMERIC );
record.setValuesDataType( SeriesRecord.VALUES_DATA_TYPE_NUMERIC );
@@ -64,8 +64,6 @@ public final class TestSeriesRecord exte
record.setNumBubbleValues( (short)0 );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(SeriesRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesTextRecord.java Fri Dec 27 23:00:13 2019
@@ -17,25 +17,23 @@
package org.apache.poi.hssf.record.chart;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
import org.apache.poi.util.HexRead;
-import org.apache.poi.util.RecordFormatException;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesTextRecord class
* works correctly. Test data taken directly from a real Excel file.
- *
- *
- * @author Andrew C. Oliver (acoliver at apache.org)
*/
-public final class TestSeriesTextRecord extends TestCase {
+public final class TestSeriesTextRecord {
private static final byte[] SIMPLE_DATA = HexRead
.readFromString("00 00 0C 00 56 61 6C 75 65 20 4E 75 6D 62 65 72");
+ @Test
public void testLoad() {
SeriesTextRecord record = new SeriesTextRecord(TestcaseRecordInputStream.create(0x100d, SIMPLE_DATA));
@@ -45,6 +43,7 @@ public final class TestSeriesTextRecord
assertEquals(SIMPLE_DATA.length + 4, record.getRecordSize());
}
+ @Test
public void testStore() {
SeriesTextRecord record = new SeriesTextRecord();
@@ -52,10 +51,10 @@ public final class TestSeriesTextRecord
record.setText("Value Number");
byte[] recordBytes = record.serialize();
- TestcaseRecordInputStream.confirmRecordEncoding(SeriesTextRecord.sid, SIMPLE_DATA,
- recordBytes);
+ TestcaseRecordInputStream.confirmRecordEncoding(SeriesTextRecord.sid, SIMPLE_DATA, recordBytes);
}
+ @Test
public void testReserializeLongTitle() {
// Hex dump from bug 45784 attachment 22560 streamOffset=0x0CD1
byte[] data = HexRead.readFromString(
@@ -81,28 +80,14 @@ public final class TestSeriesTextRecord
+ "62 00 63 00");
RecordInputStream in = TestcaseRecordInputStream.create(SeriesTextRecord.sid, data);
- SeriesTextRecord str;
- try {
- str = new SeriesTextRecord(in);
- } catch (RecordFormatException e) {
- if (e.getCause() instanceof IllegalArgumentException) {
- // 'would be' error msg changed at svn r703620
- // "Illegal length - asked for -126 but only 130 left!"
- // "Bad requested string length (-126)"
- throw new AssertionFailedError("Identified bug 45784a");
- }
- throw e;
- }
-
- if (str.getRecordSize() < 0) {
- throw new AssertionFailedError("Identified bug 45784b");
- }
- byte[] ser;
- try {
- ser = str.serialize();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
+ // Identified bug 45784a
+ // 'would be' error msg changed at svn r703620
+ // "Illegal length - asked for -126 but only 130 left!"
+ // "Bad requested string length (-126)"
+ SeriesTextRecord str = new SeriesTextRecord(in);
+
+ assertTrue("Identified bug 45784b", str.getRecordSize() >= 0);
+ byte[] ser = str.serialize();
TestcaseRecordInputStream.confirmRecordEncoding(SeriesTextRecord.sid, data, ser);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSeriesToChartGroupRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the SeriesToChartGroupRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Andrew C. Oliver (acoliver at apache.org)
*/
-public final class TestSeriesToChartGroupRecord extends TestCase {
+public final class TestSeriesToChartGroupRecord {
byte[] data = new byte[] {
(byte)0x0, (byte)0x0
};
+ @Test
public void testLoad() {
SeriesToChartGroupRecord record = new SeriesToChartGroupRecord(TestcaseRecordInputStream.create(0x1045, data));
assertEquals( 0x0, record.getChartGroupIndex());
@@ -42,15 +42,12 @@ public final class TestSeriesToChartGrou
assertEquals( 0x6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
SeriesToChartGroupRecord record = new SeriesToChartGroupRecord();
record.setChartGroupIndex( (short)0x0 );
-
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(SeriesToChartGroupRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestSheetPropertiesRecord.java Fri Dec 27 23:00:13 2019
@@ -18,31 +18,32 @@
package org.apache.poi.hssf.record.chart;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertTrue;
+
import org.apache.poi.hssf.record.RecordInputStream;
import org.apache.poi.hssf.record.TestcaseRecordInputStream;
-
-import junit.framework.AssertionFailedError;
-import junit.framework.TestCase;
+import org.junit.Test;
/**
* Tests for {@link SheetPropertiesRecord}
* Test data taken directly from a real Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestSheetPropertiesRecord extends TestCase {
+public final class TestSheetPropertiesRecord {
private static final byte[] data = {
(byte)0x0A,(byte)0x00,
(byte)0x00,
(byte)0x00, // not sure where that last byte comes from
};
+ @Test
public void testLoad() {
RecordInputStream in = TestcaseRecordInputStream.create(0x1044, data);
SheetPropertiesRecord record = new SheetPropertiesRecord(in);
- if (in.remaining() == 1) {
- throw new AssertionFailedError("Identified bug 44693c");
- }
+ assertNotEquals("Identified bug 44693c", 1, in.remaining());
assertEquals(0, in.remaining());
assertEquals( 10, record.getFlags());
assertFalse(record.isChartTypeManuallyFormatted());
@@ -55,6 +56,7 @@ public final class TestSheetPropertiesRe
assertEquals( 8, record.getRecordSize() );
}
+ @Test
public void testStore() {
SheetPropertiesRecord record = new SheetPropertiesRecord();
record.setChartTypeManuallyFormatted( false );
@@ -66,6 +68,6 @@ public final class TestSheetPropertiesRe
byte [] recordBytes = record.serialize();
- TestcaseRecordInputStream.confirmRecordEncoding(SheetPropertiesRecord.sid, data, recordBytes);
+ confirmRecordEncoding(SheetPropertiesRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTextRecord.java Fri Dec 27 23:00:13 2019
@@ -18,18 +18,20 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the TextRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestTextRecord extends TestCase {
+public final class TestTextRecord {
byte[] data = new byte[] {
(byte)0x02, // horiz align
(byte)0x02, // vert align
@@ -45,8 +47,8 @@ public final class TestTextRecord extend
(byte)0x00,(byte)0x00 // text rotation
};
+ @Test
public void testLoad() {
-
TextRecord record = new TextRecord(TestcaseRecordInputStream.create(0x1025, data));
assertEquals( TextRecord.HORIZONTAL_ALIGNMENT_CENTER, record.getHorizontalAlignment());
assertEquals( TextRecord.VERTICAL_ALIGNMENT_CENTER, record.getVerticalAlignment());
@@ -79,8 +81,8 @@ public final class TestTextRecord extend
assertEquals( 36, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
TextRecord record = new TextRecord();
record.setHorizontalAlignment( TextRecord.HORIZONTAL_ALIGNMENT_CENTER );
record.setVerticalAlignment( TextRecord.VERTICAL_ALIGNMENT_CENTER );
@@ -110,8 +112,6 @@ public final class TestTextRecord extend
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(TextRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestTickRecord.java Fri Dec 27 23:00:13 2019
@@ -18,18 +18,19 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the TickRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- * @author Andrew C. Oliver(acoliver at apache.org)
*/
-public final class TestTickRecord extends TestCase {
+public final class TestTickRecord {
private static final byte[] data = {
(byte)0x02, (byte)0x00, (byte)0x03, (byte)0x01,
(byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00, (byte)0x00,
@@ -40,6 +41,7 @@ public final class TestTickRecord extend
(byte)0x4D, (byte)0x00, (byte)0x00, (byte)0x00
};
+ @Test
public void testLoad() {
TickRecord record = new TickRecord(TestcaseRecordInputStream.create(0x101e, data));
assertEquals( (byte)2, record.getMajorTickType());
@@ -61,6 +63,7 @@ public final class TestTickRecord extend
assertEquals( 34, record.getRecordSize() );
}
+ @Test
public void testStore() {
TickRecord record = new TickRecord();
record.setMajorTickType( (byte)2 );
@@ -80,8 +83,6 @@ public final class TestTickRecord extend
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(TickRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestUnitsRecord.java Fri Dec 27 23:00:13 2019
@@ -18,23 +18,23 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the UnitsRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
-
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestUnitsRecord extends TestCase {
+public final class TestUnitsRecord {
byte[] data = new byte[] {
(byte)0x00, (byte)0x00
};
+ @Test
public void testLoad() {
UnitsRecord record = new UnitsRecord(TestcaseRecordInputStream.create(0x1001, data));
@@ -43,15 +43,13 @@ public final class TestUnitsRecord exten
assertEquals( 6, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
UnitsRecord record = new UnitsRecord();
record.setUnits( (short)0 );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(UnitsRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/chart/TestValueRangeRecord.java Fri Dec 27 23:00:13 2019
@@ -18,19 +18,20 @@
package org.apache.poi.hssf.record.chart;
-import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import static org.apache.poi.hssf.record.TestcaseRecordInputStream.confirmRecordEncoding;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
-import junit.framework.TestCase;
+import org.apache.poi.hssf.record.TestcaseRecordInputStream;
+import org.junit.Test;
/**
* Tests the serialization and deserialization of the ValueRangeRecord
* class works correctly. Test data taken directly from a real
* Excel file.
- *
- *
- * @author Glen Stampoultzis (glens at apache.org)
*/
-public final class TestValueRangeRecord extends TestCase {
+public final class TestValueRangeRecord {
byte[] data = new byte[] {
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00, // min axis value
(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00,(byte)0x00, // max axis value
@@ -40,6 +41,7 @@ public final class TestValueRangeRecord
(byte)0x1F,(byte)0x01 // options
};
+ @Test
public void testLoad() {
ValueRangeRecord record = new ValueRangeRecord(TestcaseRecordInputStream.create(0x101f, data));
@@ -62,8 +64,8 @@ public final class TestValueRangeRecord
assertEquals( 42+4, record.getRecordSize() );
}
- public void testStore()
- {
+ @Test
+ public void testStore() {
ValueRangeRecord record = new ValueRangeRecord();
record.setMinimumAxisValue( 0 );
record.setMaximumAxisValue( 0 );
@@ -81,8 +83,6 @@ public final class TestValueRangeRecord
record.setReserved( true );
byte [] recordBytes = record.serialize();
- assertEquals(recordBytes.length - 4, data.length);
- for (int i = 0; i < data.length; i++)
- assertEquals("At offset " + i, data[i], recordBytes[i+4]);
+ confirmRecordEncoding(ValueRangeRecord.sid, data, recordBytes);
}
}
Modified: poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java
URL: http://svn.apache.org/viewvc/poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java?rev=1872041&r1=1872040&r2=1872041&view=diff
==============================================================================
--- poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java (original)
+++ poi/trunk/src/testcases/org/apache/poi/hssf/record/pivot/AllPivotRecordTests.java Fri Dec 27 23:00:13 2019
@@ -17,22 +17,17 @@
package org.apache.poi.hssf.record.pivot;
-import junit.framework.Test;
-import junit.framework.TestSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
/**
* Collects all tests for <tt>org.apache.poi.hssf.record.pivot</tt>.
- *
- * @author Josh Micich
*/
+@RunWith(Suite.class)
+@Suite.SuiteClasses({
+ TestExtendedPivotTableViewFieldsRecord.class,
+ TestPageItemRecord.class,
+ TestViewFieldsRecord.class
+})
public final class AllPivotRecordTests {
-
- public static Test suite() {
- TestSuite result = new TestSuite(AllPivotRecordTests.class.getName());
-
- result.addTestSuite(TestExtendedPivotTableViewFieldsRecord.class);
- result.addTestSuite(TestPageItemRecord.class);
- result.addTestSuite(TestViewFieldsRecord.class);
- return result;
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@poi.apache.org
For additional commands, e-mail: commits-help@poi.apache.org