Changeset 557 for Tests

Timestamp:

07/23/12 18:23:18 (10 years ago)

Author:

BegemoT

Message:

 

File:

• Tests/JAVA/test/src/main/java/test/ivan/FileParser.java (modified) (4 diffs)

Tests/JAVA/test/src/main/java/test/ivan/FileParser.java

@@ -19 +19 @@
 public class FileParser {
         private static final Log log = LogFactory.getLog( FileParser.class );
-        protected static final int HASH_LENGTH = 16;
+
+        private static final boolean PRINT_PACKETS = Boolean.getBoolean( "print-packets" );
+
+        protected static final int HASH_LENGTH = 20;
         protected static final long MAGIC_NUMBER = 0xa1b2c3d4L;
 
@@ -106 +109 @@
                                 throw new IOException( "Unexpected EOF: actualBufferLength=" + actualBufferLength + ", but only " + read + " actually read" );
                         }
+                        if( PRINT_PACKETS ) {
+                                log.info( toHexString( buffer, actualBufferLength ) );
+                        }
 
                         final byte packetType = buffer[12];
@@ -133 +139 @@
                         final byte[] hash = Arrays.copyOfRange(
                                         buffer,
-                                        54,
-                                        54 + HASH_LENGTH
+                                        50,
+                                        50 + HASH_LENGTH
                         );
 
@@ -176 +182 @@
                 return signedShort & 0xFFFF;
         }
+
+        private static String toHexString( final byte[] bytes,
+                                           final int length ) {
+                final StringBuilder sb = new StringBuilder( 1024 );
+                final Formatter fmt = new Formatter( sb );
+                for( int i = 0; i < length; i++ ) {
+                        if( i % 16 == 0 ) {
+                                fmt.format( "\n%04x: ", i );
+                        }
+                        final byte b = bytes[i];
+                        fmt.format( "%02x", b );
+                }
+                fmt.flush();
+                return sb.toString();
+        }
 }