Revision: 5876
http://jnode.svn.sourceforge.net/jnode/?rev=5876&view=rev
Author: galatnm
Date: 2011-12-12 16:09:48 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
FS : improve test for IDEDriveDescriptor.
Modified Paths:
--------------
trunk/fs/src/test/org/jnode/driver/bus/ide/IDEDriveDescriptorTest.java
Modified: trunk/fs/src/test/org/jnode/driver/bus/ide/IDEDriveDescriptorTest.java
===================================================================
--- trunk/fs/src/test/org/jnode/driver/bus/ide/IDEDriveDescriptorTest.java 2011-12-12 15:10:06 UTC (rev 5875)
+++ trunk/fs/src/test/org/jnode/driver/bus/ide/IDEDriveDescriptorTest.java 2011-12-12 16:09:48 UTC (rev 5876)
@@ -8,6 +8,7 @@
public class IDEDriveDescriptorTest {
// The ide descriptor.
private IDEDriveDescriptor ideDescriptor;
+ private IDEDriveDescriptor cdromIdeDescriptor;
// IDE Descriptor datas obtain from command 'hdparm --Istdout /dev/sda' on a linux machine.
private int[] ide = new int[] { 0x0c5a, 0x3fff, 0xc837, 0x0010, 0x0000,
0x0000, 0x003f, 0x0000, 0x0000, 0x0000, 0x2020, 0x2020, 0x2020,
@@ -42,10 +43,45 @@
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
0x0000, 0x0000, 0x8aa5 };
+
+ private int[] cdrom = new int[]{0x8580,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x2020,0x2020,0x2020,0x2020,0x2020,0x2020,
+ 0x2020,0x2020,0x2020,0x2020,0x0000,0x0000,0x0000,0x3130,
+ 0x3543,0x2020,0x2020,0x5f4e,0x4543,0x2044,0x5644,0x2b2f,
+ 0x2d52,0x5720,0x4e44,0x2d33,0x3635,0x3041,0x2020,0x2020,
+ 0x2020,0x2020,0x2020,0x2020,0x2020,0x2020,0x2020,0x0000,
+ 0x0000,0x0b00,0x0000,0x0200,0x0200,0x0006,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0007,
+ 0x0003,0x0078,0x0078,0x0078,0x0078,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0602,0x0000,0x0000,0x0000,
+ 0x0080,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0407,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000};
+
@Before
public void setUp(){
ideDescriptor = new IDEDriveDescriptor(ide, true);
+ cdromIdeDescriptor = new IDEDriveDescriptor(cdrom, true);
}
@Test(expected = IllegalArgumentException.class)
@@ -79,6 +115,36 @@
assertEquals(312500000,result);
}
+ @Test
+ public void testSupports48bitAddressing() {
+ boolean result = ideDescriptor.supports48bitAddressing();
+ assertTrue("Must support 48bits addressing",result);
+ }
+ @Test
+ public void testSupportsLBA() {
+ boolean result = ideDescriptor.supportsLBA();
+ assertTrue("Must support LBA",result);
+ }
+
+ @Test
+ public void testDMA() {
+ boolean result = ideDescriptor.supportsDMA();
+ assertTrue("Must support DMA",result);
+ }
+
+ @Test
+ public void testIsATA() {
+ boolean result = ideDescriptor.isAta();
+ assertTrue("Must be ATA drive",result);
+ }
+
+ @Test
+ public void testIsRemovable() {
+ boolean result = ideDescriptor.isRemovable();
+ assertFalse("Must not be a removable device",result);
+ result = cdromIdeDescriptor.isRemovable();
+ assertTrue("Must be a removable device",result);
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
