Skip to content

Commit

Permalink
updated unit test assertions to match the fingerprinter that was chan…
Browse files Browse the repository at this point in the history 
…ged in b27ee12

Change-Id: I304de86d0425314e5ff64383b950979863a9a980
Signed-off-by: Egon Willighagen <egonw@users.sourceforge.net>
  • Loading branch information
@johnmay @egonw
johnmay authored and egonw committed Mar 24, 2013
1 parent 7fa4a3a commit 15ecad1
Showing 1 changed file with 18 additions and 13 deletions.
31 changes: 18 additions & 13 deletions src/test/org/openscience/cdk/modeling/builder3d/TemplateHandler3DTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,19 +57,24 @@ public void testGetInstance() throws Exception {
Assert.assertEquals(10751, th3d.getTemplateCount());
}

private static BitSet parseBitSet(String str) throws Exception {
return TemplateHandler3D.getBitSetFromFile(new StringTokenizer(str, "\t ;{, }"));
}

@Test
public void testFingerprints() throws Exception{
BitSet[] bsmb=new BitSet[10];
bsmb[0]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{18, 37, 61, 74, 105, 110, 115, 149, 187, 227, 249, 302, 307, 337, 343, 346, 356, 395, 409, 444, 478, 514, 527, 552, 567, 569, 576, 580, 683, 689, 710, 717, 747, 800, 810, 830, 837, 867, 873, 916, 929, 932, 935, 971, 983}", "\t ;{, }"));
bsmb[1]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{18, 37, 61, 74, 105, 110, 115, 149, 187, 227, 249, 302, 307, 337, 343, 346, 356, 395, 409, 444, 478, 514, 527, 552, 567, 569, 576, 580, 683, 689, 710, 717, 747, 800, 810, 830, 837, 867, 873, 916, 929, 932, 935, 971, 983}", "\t ;{, }"));
bsmb[2]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{18, 42, 72, 92, 175, 184, 225, 227, 231, 246, 252, 271, 278, 280, 289, 298, 307, 308, 322, 349, 356, 360, 391, 395, 415, 424, 444, 467, 498, 500, 502, 520, 532, 541, 543, 552, 563, 567, 569, 571, 610, 614, 629, 654, 673, 692, 697, 700, 711, 717, 731, 747, 761, 778, 783, 800, 810, 818, 830, 837, 842, 863, 867, 873, 879, 882, 883, 913, 916, 932, 935, 971, 983, 1011, 1019, 1020}", "\t ;{, }"));
bsmb[3]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{110, 187, 409, 444, 689, 747, 873, 916, 983}", "\t ;{, }"));
bsmb[4]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{18, 37, 42, 61, 72, 74, 92, 105, 110, 115, 140, 149, 162, 184, 187, 195, 199, 207, 225, 227, 231, 234, 249, 252, 264, 278, 280, 289, 302, 307, 308, 322, 331, 337, 343, 346, 349, 350, 356, 360, 391, 395, 409, 415, 435, 444, 467, 478, 500, 502, 514, 520, 527, 532, 541, 543, 552, 563, 567, 569, 571, 576, 580, 610, 613, 614, 629, 640, 673, 683, 689, 692, 710, 711, 717, 731, 747, 761, 778, 783, 798, 800, 810, 818, 830, 837, 842, 855, 863, 867, 873, 879, 882, 883, 887, 892, 913, 916, 929, 932, 935, 971, 983, 1016, 1019, 1020}", "\t ;{, }"));
bsmb[5]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{110, 187, 409, 444, 689, 747, 873, 916, 983}", "\t ;{, }"));
bsmb[6]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{110, 187, 409, 444, 689, 747, 873, 916, 983}", "\t ;{, }"));
bsmb[7]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{110, 409, 444, 689, 747, 873, 916, 983}", "\t ;{, }"));
bsmb[8]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{18, 42, 72, 92, 175, 184, 225, 227, 231, 246, 252, 271, 278, 280, 289, 298, 307, 308, 322, 349, 356, 360, 391, 395, 415, 424, 444, 467, 498, 500, 502, 520, 532, 541, 543, 552, 563, 567, 569, 571, 610, 614, 629, 654, 673, 692, 697, 700, 711, 717, 731, 747, 761, 778, 783, 800, 810, 818, 830, 837, 842, 863, 867, 873, 879, 882, 883, 913, 916, 932, 935, 971, 983, 1011, 1019, 1020}", "\t ;{, }"));
bsmb[9]=(BitSet) TemplateHandler3D.getBitSetFromFile(new StringTokenizer("{110, 187, 409, 444, 689, 747, 873, 916, 983}", "\t ;{, }"));
BitSet[] expected = new BitSet[]{
parseBitSet("{1, 4, 10, 14, 24, 28, 37, 40, 41, 44, 50, 53, 54, 59, 61, 65, 67, 73, 74, 77, 86, 94, 103, 104, 112, 117, 119, 120, 125, 127, 131, 134, 154, 155, 160, 162, 166, 182, 186, 187, 189, 196, 198, 205, 221, 222, 223, 224, 228, 232, 234, 248, 249, 253, 255, 262, 286, 287, 293, 296, 299, 300, 303, 305, 308, 309, 317, 320, 325, 331, 335, 337, 339, 342, 344, 354, 357, 371, 374, 376, 385, 386, 388, 395, 398, 408, 424, 429, 432, 438, 443, 447, 454, 463, 464, 473, 482, 489, 490, 492, 506, 510, 511, 515, 522, 523, 533, 534, 544, 548, 555, 557, 561, 562, 568, 571, 573, 576, 588, 590, 602, 606, 608, 612, 628, 652, 665, 670, 671, 672, 678, 680, 681, 709, 711, 714, 729, 730, 741, 742, 747, 752, 753, 760, 766, 769, 770, 773, 794, 798, 800, 808, 816, 832, 833, 834, 839, 841, 843, 847, 850, 859, 868, 873, 876, 879, 881, 882, 884, 887, 905, 911, 921, 922, 924, 925, 930, 936, 939, 944, 946, 949, 952, 953, 954, 955, 960, 963, 986, 987, 995, 998, 1003, 1006, 1009, 1010, 1017, 1020}"),
parseBitSet("{1, 4, 10, 14, 24, 28, 44, 50, 54, 59, 61, 65, 67, 73, 77, 79, 86, 94, 103, 104, 112, 119, 120, 134, 153, 154, 155, 160, 162, 166, 182, 186, 187, 189, 196, 222, 223, 224, 228, 234, 236, 239, 242, 253, 262, 264, 287, 291, 293, 296, 300, 303, 305, 308, 309, 317, 320, 323, 325, 335, 337, 339, 354, 356, 357, 371, 376, 381, 383, 385, 386, 395, 398, 422, 424, 432, 443, 464, 473, 482, 489, 490, 492, 506, 510, 515, 522, 523, 533, 544, 548, 561, 562, 573, 578, 588, 597, 602, 609, 645, 652, 653, 665, 671, 672, 678, 709, 711, 714, 726, 730, 740, 741, 742, 747, 752, 760, 766, 769, 770, 773, 781, 792, 793, 798, 801, 808, 816, 825, 832, 833, 834, 841, 843, 850, 851, 856, 876, 884, 885, 888, 914, 921, 922, 924, 925, 933, 936, 944, 949, 952, 955, 963, 977, 980, 981, 986, 987, 993, 995, 998, 1001, 1003, 1010, 1020}"),
parseBitSet("{4, 17, 51, 52, 58, 110, 114, 162, 177, 182, 208, 224, 230, 231, 242, 259, 262, 266, 270, 277, 289, 307, 309, 325, 335, 339, 349, 351, 354, 363, 371, 376, 387, 406, 433, 437, 489, 491, 500, 504, 513, 522, 533, 539, 545, 561, 573, 588, 601, 603, 611, 614, 618, 665, 686, 735, 746, 747, 752, 755, 764, 776, 777, 784, 795, 798, 801, 808, 822, 823, 851, 876, 882, 886, 944, 969, 987}"),
parseBitSet("{4, 10, 77, 162, 522, 714, 747, 752, 816}"),
parseBitSet("{4, 14, 16, 17, 18, 27, 30, 37, 40, 44, 50, 51, 52, 54, 55, 58, 61, 65, 67, 73, 75, 78, 79, 86, 103, 104, 106, 110, 112, 114, 120, 125, 127, 141, 142, 144, 151, 153, 154, 158, 162, 177, 178, 182, 189, 196, 199, 204, 205, 208, 210, 215, 216, 220, 222, 224, 228, 230, 231, 236, 239, 245, 253, 255, 259, 262, 264, 266, 280, 286, 287, 289, 291, 296, 297, 300, 303, 305, 308, 309, 311, 317, 320, 321, 322, 323, 325, 329, 334, 335, 337, 339, 342, 344, 347, 349, 351, 354, 356, 359, 363, 370, 371, 376, 377, 378, 381, 382, 383, 385, 386, 387, 395, 398, 400, 406, 412, 415, 425, 432, 433, 437, 439, 467, 473, 475, 485, 489, 490, 491, 492, 495, 500, 502, 504, 506, 510, 512, 515, 522, 523, 526, 531, 534, 536, 539, 544, 545, 548, 550, 555, 557, 561, 562, 566, 568, 572, 573, 575, 578, 588, 592, 597, 601, 602, 603, 609, 611, 614, 615, 616, 618, 624, 626, 638, 644, 645, 646, 651, 653, 654, 655, 658, 665, 666, 671, 674, 680, 686, 691, 700, 733, 735, 740, 742, 745, 746, 747, 752, 755, 764, 766, 768, 770, 773, 777, 781, 792, 793, 795, 798, 800, 801, 822, 825, 830, 832, 834, 843, 845, 851, 856, 857, 874, 876, 882, 884, 885, 886, 888, 896, 905, 910, 912, 914, 921, 922, 924, 925, 930, 931, 933, 939, 944, 946, 952, 955, 957, 961, 963, 977, 978, 979, 980, 987, 998, 999, 1001, 1003, 1008, 1010, 1017, 1020}"),
parseBitSet("{4, 10, 14, 16, 24, 28, 40, 50, 61, 65, 67, 77, 86, 92, 103, 104, 108, 117, 120, 132, 136, 154, 155, 158, 160, 162, 182, 185, 189, 196, 198, 222, 223, 228, 231, 255, 275, 280, 287, 295, 299, 300, 303, 308, 317, 320, 328, 339, 352, 357, 369, 385, 386, 395, 398, 401, 424, 429, 432, 443, 449, 464, 473, 481, 488, 490, 505, 506, 507, 510, 513, 515, 522, 527, 533, 544, 546, 548, 561, 562, 566, 596, 598, 599, 613, 628, 645, 652, 671, 672, 678, 680, 683, 686, 696, 709, 714, 729, 730, 736, 747, 752, 760, 770, 773, 777, 779, 794, 797, 808, 816, 829, 834, 843, 868, 886, 889, 910, 911, 921, 922, 923, 925, 936, 944, 946, 952, 955, 958, 963, 971, 988, 995, 998, 1003, 1010, 1020, 1022}"),
parseBitSet("{4, 10, 77, 162, 522, 714, 747, 752, 816}"),
parseBitSet("{4, 10, 162, 522, 714, 747, 752, 816}"),
parseBitSet("{4, 17, 51, 52, 58, 110, 114, 162, 177, 182, 208, 224, 230, 231, 242, 259, 262, 266, 270, 277, 289, 307, 309, 325, 335, 339, 349, 351, 354, 363, 371, 376, 387, 406, 433, 437, 489, 491, 500, 504, 513, 522, 533, 539, 545, 561, 573, 588, 601, 603, 611, 614, 618, 665, 686, 735, 746, 747, 752, 755, 764, 776, 777, 784, 795, 798, 801, 808, 822, 823, 851, 876, 882, 886, 944, 969, 987}"),
parseBitSet("{4, 14, 50, 61, 65, 67, 83, 86, 91, 103, 104, 120, 133, 154, 162, 166, 188, 192, 222, 300, 308, 317, 320, 398, 426, 429, 432, 465, 468, 473, 475, 490, 505, 506, 510, 515, 522, 671, 682, 689, 704, 739, 747, 770, 782, 834, 921, 922, 925, 944, 952, 953, 960, 963, 998, 1020}")
};

String filename = "data/mdl/fingerprints_from_modelbuilder3d.sdf";
InputStream ins = this.getClass().getClassLoader().getResourceAsStream(filename);
Expand All @@ -82,8 +87,8 @@ public void testFingerprints() throws Exception{
obj.getBuilder();
for(int i=0; i<data.size(); i++){
IBitFingerprint bs = data.get(i);
Assert.assertEquals(bsmb[i], bs.asBitSet());
}
Assert.assertEquals(expected[i], bs.asBitSet());
}
}

@Test
Expand Down

0 comments on commit 15ecad1

Please sign in to comment.