diff --git a/main/src/com/google/refine/importers/XmlImportUtilities.java b/main/src/com/google/refine/importers/XmlImportUtilities.java index 96738cc6b..35c573152 100644 --- a/main/src/com/google/refine/importers/XmlImportUtilities.java +++ b/main/src/com/google/refine/importers/XmlImportUtilities.java @@ -181,11 +181,6 @@ public class XmlImportUtilities extends TreeImportUtilities { // e.printStackTrace(); } - if (textNodeCount > 0 && childElementNodeCount > 0) { - // This is a mixed element - return null; - } - if (immediateChildCandidateMap.size() > 0) { List immediateChildCandidates = new ArrayList(immediateChildCandidateMap.size()); for (Entry entry : immediateChildCandidateMap.entrySet()) { diff --git a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java b/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java index dca46df2d..bd14f4af5 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java +++ b/main/tests/server/src/com/google/refine/tests/importers/XmlImporterTests.java @@ -84,7 +84,12 @@ public class XmlImporterTests extends RefineTest { RunTest(getMixedElementSample()); log(project); - assertProjectCreated(project, 0, 0); //nothing imported + assertProjectCreated(project, 4, 6); + + Row row = project.rows.get(0); + Assert.assertNotNull(row); + Assert.assertNotNull(row.getCell(2)); + Assert.assertEquals(row.getCell(2).value, "Author 1, The"); } @Test