Skip to content

Commit a4c41c5

Browse files
committed
add back benzene fixture loading form SMILES
1 parent 4c26a60 commit a4c41c5

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

mbuild/tests/base_test.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,12 @@ def benzene(self):
121121
compound.name = "Benzene"
122122
return compound
123123

124+
@pytest.fixture
125+
def benzene_from_SMILES(self):
126+
compound = mb.load("c1ccccc1", smiles=True)
127+
compound.name = "Benzene"
128+
return compound
129+
124130
@pytest.fixture
125131
def benzene_from_parts(self):
126132
ch = mb.load(get_fn("ch.mol2"))

mbuild/tests/test_compound.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1452,7 +1452,7 @@ def test_resnames_parmed(self, h2o, ethane):
14521452
struct.atoms
14531453
)
14541454

1455-
def test_resnames_parmed_cg(self, benzene, hexane, propyl):
1455+
def test_resnames_parmed_cg(self, benzene_from_SMILES, hexane, propyl):
14561456
particles = [propyl.__class__]
14571457
cg = mb.coarse_grain(hexane, particle_classes=particles)
14581458

@@ -1507,7 +1507,11 @@ def test_resnames_parmed_cg(self, benzene, hexane, propyl):
15071507

15081508
# test mixed cg atomistic systems
15091509
mixed_molecules_box = mb.Compound(
1510-
[mb.clone(bonded_beads), mb.clone(bonded_beads), benzene]
1510+
[
1511+
mb.clone(bonded_beads),
1512+
mb.clone(bonded_beads),
1513+
benzene_from_SMILES,
1514+
]
15111515
)
15121516
struct = mixed_molecules_box.to_parmed(
15131517
infer_residues=True,
@@ -1520,8 +1524,8 @@ def test_resnames_parmed_cg(self, benzene, hexane, propyl):
15201524
[
15211525
mb.clone(two_bonded_beads),
15221526
mb.clone(two_bonded_beads),
1523-
mb.clone(benzene),
1524-
mb.clone(benzene),
1527+
mb.clone(benzene_from_SMILES),
1528+
mb.clone(benzene_from_SMILES),
15251529
mb.fill_box(hexane, 2, box=mb.Box([5, 5, 5])),
15261530
]
15271531
)
@@ -1551,7 +1555,7 @@ def test_resnames_parmed_cg(self, benzene, hexane, propyl):
15511555
# hexane is goes from polymer down to monomer level. Made from two propyl groups which gives two monomers (4 total)
15521556
assert len(
15531557
struct.residues
1554-
) == 2 * two_bonded_beads.n_particles + 2 * benzene.n_particles + 2 * len(
1558+
) == 2 * two_bonded_beads.n_particles + 2 * benzene_from_SMILES.n_particles + 2 * len(
15551559
hexane.children
15561560
)
15571561

0 commit comments

Comments
 (0)