GeomConverter/test/org/lcsim/detector/identifier
diff -u -r1.7 -r1.8
--- IdentifierHelperTest.java 13 Oct 2007 00:36:45 -0000 1.7
+++ IdentifierHelperTest.java 1 Nov 2007 00:49:28 -0000 1.8
@@ -10,7 +10,7 @@
* on {@link IIdentifierHelper}.
*
* @author Jeremy McCormick
- * @version $Id: IdentifierHelperTest.java,v 1.7 2007/10/13 00:36:45 jeremy Exp $
+ * @version $Id: IdentifierHelperTest.java,v 1.8 2007/11/01 00:49:28 jeremy Exp $
*/
public class IdentifierHelperTest
@@ -24,6 +24,69 @@
public static junit.framework.Test suite()
{
return new TestSuite(IdentifierHelperTest.class);
+ }
+
+ public void testFieldPack() throws Exception
+ {
+ IIdentifierDictionary iddict = new IdentifierDictionary("test3");
+
+ iddict.addField(new IdentifierField("field1", 16, 0, false, 0 ));
+ //iddict.addField(new IdentifierField("field2", 16, 16, true, 1 ));
+ IdentifierHelper helper = new IdentifierHelper(iddict);
+ //IIdentifier check = helper.pack( new ExpandedIdentifier( "/10/-11" ) );
+ IIdentifier check = helper.pack( new ExpandedIdentifier( "/10" ) );
+
+ IIdentifier id = new Identifier();
+ iddict.getField(0).pack(10,id);
+ //iddict.getField(1).pack(-11,id);
+
+ assertEquals( "Field packed id does not match compact!", id, check);
+ }
+
+ public void testIdContext()
+ {
+ int i1[] = new int[3];
+ i1[0] = 2;
+ i1[1] = 3;
+ i1[2] = 4;
+
+ IdentifierContext c1 = new IdentifierContext(i1);
+ assertTrue(c1.isRange());
+ assertTrue(c1.getStartIndex() == 2);
+ assertTrue(c1.getEndIndex() == 4);
+ assertTrue(c1.isValidIndex(2));
+ assertTrue(c1.isValidIndex(3));
+ assertTrue(c1.isValidIndex(4));
+ assertTrue(!c1.isValidIndex(0));
+ assertTrue(!c1.isValidIndex(5));
+ assertTrue(c1.getNumberOfIndices() == 3);
+
+ IdentifierContext c2 = new IdentifierContext(2,4);
+ assertTrue(c2.isRange());
+ assertTrue(c2.getStartIndex() == 2);
+ assertTrue(c2.getEndIndex() == 4);
+ assertTrue(c2.isValidIndex(2));
+ assertTrue(c2.isValidIndex(3));
+ assertTrue(c2.isValidIndex(4));
+ assertTrue(!c2.isValidIndex(0));
+ assertTrue(!c2.isValidIndex(5));
+ assertTrue(c2.getNumberOfIndices() == 3);
+
+ int i2[] = new int[3];
+ i2[0] = 0;
+ i2[1] = 2;
+ i2[2] = 4;
+ IdentifierContext c3 = new IdentifierContext(i2);
+ assertTrue(!c3.isRange());
+ assertTrue(c3.getStartIndex() == 0);
+ assertTrue(c3.getEndIndex() == 4);
+ assertTrue(c3.isValidIndex(0));
+ assertTrue(c3.isValidIndex(2));
+ assertTrue(c3.isValidIndex(4));
+ assertTrue(!c3.isValidIndex(5));
+ assertTrue(!c3.isValidIndex(1));
+ assertTrue(!c3.isValidIndex(3));
+ assertTrue(c3.getNumberOfIndices() == 3);
}
public void testGetValue() throws Exception
@@ -60,11 +123,8 @@
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).getMaskOn()));
- assertEquals("ffffffffffffff00", Long.toHexString(iddict.getField(0).getMaskOff()));
-
- assertEquals("ff00", Long.toHexString(iddict.getField(1).getMaskOn()));
- assertEquals("ffffffffffff00ff", Long.toHexString(iddict.getField(1).getMaskOff()));
+ assertEquals("ff", Long.toHexString(iddict.getField(0).getLongMask()));
+ assertEquals("ff00", Long.toHexString(iddict.getField(1).getLongMask()));
}
public void testUnpack() throws Exception
@@ -121,66 +181,4 @@
assertTrue( "ExpandedIdentifiers do not match!", expId.equals( expIdCheck ));
}
-
- public void testFieldPack() throws Exception
- {
- IIdentifierDictionary iddict = new IdentifierDictionary("test3");
-
- iddict.addField(new IdentifierField("field1", 16, 0, false, 0 ));
- iddict.addField(new IdentifierField("field2", 16, 16, true, 1 ));
- IdentifierHelper helper = new IdentifierHelper(iddict);
- IIdentifier check = helper.pack( new ExpandedIdentifier( "/10/-11" ) );
-
- IIdentifier id = new Identifier();
- iddict.getField(0).pack(10,id);
- iddict.getField(1).pack(-11,id);
-
- assertEquals( "Field packed id does not match compact!", id, check);
- }
-
- public void testIdContext()
- {
- int i1[] = new int[3];
- i1[0] = 2;
- i1[1] = 3;
- i1[2] = 4;
-
- IdentifierContext c1 = new IdentifierContext(i1);
- assertTrue(c1.isRange());
- assertTrue(c1.getStartIndex() == 2);
- assertTrue(c1.getEndIndex() == 4);
- assertTrue(c1.isValidIndex(2));
- assertTrue(c1.isValidIndex(3));
- assertTrue(c1.isValidIndex(4));
- assertTrue(!c1.isValidIndex(0));
- assertTrue(!c1.isValidIndex(5));
- assertTrue(c1.getNumberOfIndices() == 3);
-
- IdentifierContext c2 = new IdentifierContext(2,4);
- assertTrue(c2.isRange());
- assertTrue(c2.getStartIndex() == 2);
- assertTrue(c2.getEndIndex() == 4);
- assertTrue(c2.isValidIndex(2));
- assertTrue(c2.isValidIndex(3));
- assertTrue(c2.isValidIndex(4));
- assertTrue(!c2.isValidIndex(0));
- assertTrue(!c2.isValidIndex(5));
- assertTrue(c2.getNumberOfIndices() == 3);
-
- int i2[] = new int[3];
- i2[0] = 0;
- i2[1] = 2;
- i2[2] = 4;
- IdentifierContext c3 = new IdentifierContext(i2);
- assertTrue(!c3.isRange());
- assertTrue(c3.getStartIndex() == 0);
- assertTrue(c3.getEndIndex() == 4);
- assertTrue(c3.isValidIndex(0));
- assertTrue(c3.isValidIndex(2));
- assertTrue(c3.isValidIndex(4));
- assertTrue(!c3.isValidIndex(5));
- assertTrue(!c3.isValidIndex(1));
- assertTrue(!c3.isValidIndex(3));
- assertTrue(c3.getNumberOfIndices() == 3);
- }
}
\ No newline at end of file
