[Jnode-svn-commits] SF.net SVN: jnode:[5875] trunk/fs/src

[<ga...@us...>]

Revision: 5875
          http://jnode.svn.sourceforge.net/jnode/?rev=5875&view=rev
Author:   galatnm
Date:     2011-12-12 15:10:06 +0000 (Mon, 12 Dec 2011)
Log Message:
-----------
FS : Fix typo on the code, use '+' instead of '*'.

Modified Paths:
--------------
    trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEDriveDescriptor.java
    trunk/fs/src/test/org/jnode/driver/bus/ide/IDEDriveDescriptorTest.java

Modified: trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEDriveDescriptor.java
===================================================================
--- trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEDriveDescriptor.java	2011-12-12 15:01:46 UTC (rev 5874)
+++ trunk/fs/src/driver/org/jnode/driver/bus/ide/IDEDriveDescriptor.java	2011-12-12 15:10:06 UTC (rev 5875)
@@ -57,7 +57,7 @@
         char[] str = new char[20];
         for (int i = 0; i < 10; i++) {
             int v = data[10 + i];
-            str[i + 2 + 0] = (char) ((v >> 8) & 0xFF);
+            str[i * 2] = (char) ((v >> 8) & 0xFF);
             str[i * 2 + 1] = (char) (v & 0xFF);
         }
         return String.valueOf(str).trim();
@@ -72,7 +72,7 @@
         char[] str = new char[8];
         for (int i = 0; i < 4; i++) {
             int v = data[23 + i];
-            str[i + 2 + 0] = (char) ((v >> 8) & 0xFF);
+            str[i * 2] = (char) ((v >> 8) & 0xFF);
             str[i * 2 + 1] = (char) (v & 0xFF);
         }
         return String.valueOf(str).trim();
@@ -87,7 +87,7 @@
         char[] str = new char[40];
         for (int i = 0; i < 20; i++) {
             int v = data[27 + i];
-            str[i * 2 + 0] = (char) ((v >> 8) & 0xFF);
+            str[i * 2] = (char) ((v >> 8) & 0xFF);
             str[i * 2 + 1] = (char) (v & 0xFF);
         }
         return String.valueOf(str).trim();

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:01:46 UTC (rev 5874)
+++ trunk/fs/src/test/org/jnode/driver/bus/ide/IDEDriveDescriptorTest.java	2011-12-12 15:10:06 UTC (rev 5875)
@@ -54,7 +54,7 @@
 		IDEDriveDescriptor wrongIdeDescriptor = new IDEDriveDescriptor(data, true);
 	}
 
-	//@Test TODO return value is incorrect
+	@Test
 	public void testGetSerialNumber() {
 		String result = ideDescriptor.getSerialNumber();
 		assertEquals("5LS9K7CF",result);
@@ -66,7 +66,7 @@
 		assertEquals("ST3160812AS",result);
 	}
 	
-	//@Test TODO return value is incorrect
+	@Test
 	public void testGetFirmware() {
 		String result = ideDescriptor.getFirmware();
 		assertEquals("3.ADJ",result);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.