GeomConverter/test/org/lcsim/detector/identifier
diff -u -r1.8 -r1.9
--- IdentifierHelperTest.java 1 Nov 2007 00:49:28 -0000 1.8
+++ IdentifierHelperTest.java 1 Nov 2007 01:11:09 -0000 1.9
@@ -10,7 +10,7 @@
* on {@link IIdentifierHelper}.
*
* @author Jeremy McCormick
- * @version $Id: IdentifierHelperTest.java,v 1.8 2007/11/01 00:49:28 jeremy Exp $
+ * @version $Id: IdentifierHelperTest.java,v 1.9 2007/11/01 01:11:09 jeremy Exp $
*/
public class IdentifierHelperTest
@@ -88,45 +88,7 @@
assertTrue(!c3.isValidIndex(3));
assertTrue(c3.getNumberOfIndices() == 3);
}
-
- public void testGetValue() throws Exception
- {
- IIdentifierDictionary iddict = new IdentifierDictionary("test1");
- iddict.addField(new IdentifierField("field1",8, 0, false, 0 ));
- iddict.addField(new IdentifierField("field2",8, 8, true, 1 ));
- iddict.addField(new IdentifierField("field3",8, 16, false, 2 ));
-
- IdentifierHelper helper = new IdentifierHelper( iddict );
-
- IExpandedIdentifier expId = new ExpandedIdentifier();
- expId.addValue(1);
- expId.addValue(-1);
- expId.addValue(2);
-
- IIdentifier id = helper.pack( expId );
-
- int val1 = helper.getValue(id, iddict.getField(0));
- assertEquals( "Got wrong value for field1.", val1, 1 );
- assertEquals( "Index and name values for field1 are different.",
- helper.getValue(id, "field1"),
- helper.getValue(id, 0) );
- assertEquals( "Index and IdentifierField values for field1 are different.",
- helper.getValue(id, iddict.getField(0)),
- helper.getValue(id, 0));
-
- int val2 = helper.getValue(id, iddict.getField(1));
- assertEquals( "Got wrong value for field2.", val2, -1 );
-
- int val3 = helper.getValue(id, iddict.getField(2));
- assertEquals( "Got wrong value for field3.", val3, 2 );
-
- assertEquals( "Got wrong value for field1 from IdentifierField.unpack().", iddict.getField(0).unpack( id ), 1 );
- assertEquals( "Got wrong value for field2 from IdentifierField.unpack().", iddict.getField(1).unpack( id ), -1 );
-
- assertEquals("ff", Long.toHexString(iddict.getField(0).getLongMask()));
- assertEquals("ff00", Long.toHexString(iddict.getField(1).getLongMask()));
- }
-
+
public void testUnpack() throws Exception
{
IIdentifierDictionary iddict = new IdentifierDictionary("test2");