GeomConverter/test/org/lcsim/detector/identifier
diff -u -r1.1 -r1.2
--- IdentifierHelperTest.java 2 May 2007 01:58:20 -0000 1.1
+++ IdentifierHelperTest.java 2 May 2007 23:45:43 -0000 1.2
@@ -7,7 +7,7 @@
* COMMENT
*
* @author Jeremy McCormick
- * @version $Id: IdentifierHelperTest.java,v 1.1 2007/05/02 01:58:20 jeremy Exp $
+ * @version $Id: IdentifierHelperTest.java,v 1.2 2007/05/02 23:45:43 jeremy Exp $
*/
public class IdentifierHelperTest
@@ -26,37 +26,28 @@
public void testIdHelper()
{
IIdentifierDictionary iddict = new IdentifierDictionary("test");
- iddict.addField(new IdentifierField("field1",32,0,false));
- iddict.addField(new IdentifierField("field2",32,32,true));
+ iddict.addField(new IdentifierField("field1",16,0,false));
+ iddict.addField(new IdentifierField("field2",16,32,true));
IIdentifierHelper helper = new IdentifierHelper( iddict );
IExpandedIdentifier expId = new ExpandedIdentifier();
- expId.addValue(1);
- expId.addValue(-1);
+ expId.addValue(10);
+ expId.addValue(-11);
IIdentifier compactId = helper.pack( expId );
IExpandedIdentifier expIdCheck = helper.unpack(compactId);
- assertTrue( expId.equals( expIdCheck ));
-
- System.out.println("compactId - " + compactId.toString());
- System.out.println("expId - " + expId.toString());
- System.out.println("expIdCheck - " + expIdCheck.toString());
- System.out.println();
-
+ assertTrue( "ExpandedIdentifiers do not match!", expId.equals( expIdCheck ));
+
expId.clear();
- expId.addValue(1);
- expId.addValue(1);
+ expId.addValue(10);
+ expId.addValue(11);
compactId = helper.pack(expId);
expIdCheck = helper.unpack( compactId );
- assertTrue( expId.equals( expIdCheck ));
-
- System.out.println("compactId - " + compactId.toString());
- System.out.println("expId - " + expId.toString());
- System.out.println("expIdCheck - " + expIdCheck.toString());
+ assertTrue( "ExpandedIdentifiers do not match!", expId.equals( expIdCheck ));
}
}
\ No newline at end of file