From 0530d468e2ff0b65814a373375f88c94788ad506 Mon Sep 17 00:00:00 2001
From: Kazuya Ujihara <ujihara.kazuya@gmail.com>
Date: Sun, 23 Jan 2022 15:06:36 +0900
Subject: [PATCH] Fix i-files for RDK_USE_BOOST_IOSTREAMS=OFF (#4933)

* fix i-files for RDK_USE_BOOST_IOSTREAMS=OFF

* separate gzstream test

Co-authored-by: Kazuya Ujihara <ujihara@preferred.jp>
---
 Code/JavaWrappers/MolSupplier.i               |  2 +
 Code/JavaWrappers/Streams.i                   |  2 +
 Code/JavaWrappers/gmwrapper/CMakeLists.txt    |  4 ++
 .../src-test/org/RDKit/GzStreamTests.java     | 37 +++++++++++++++++++
 .../src-test/org/RDKit/SuppliersTests.java    | 22 -----------
 5 files changed, 45 insertions(+), 22 deletions(-)
 create mode 100644 Code/JavaWrappers/gmwrapper/src-test/org/RDKit/GzStreamTests.java

diff --git a/Code/JavaWrappers/MolSupplier.i b/Code/JavaWrappers/MolSupplier.i
index dd9a1bd68..4025e0f25 100644
--- a/Code/JavaWrappers/MolSupplier.i
+++ b/Code/JavaWrappers/MolSupplier.i
@@ -54,6 +54,7 @@
 
 %include <GraphMol/FileParsers/MolSupplier.h>
 
+#ifdef RDK_USE_BOOST_IOSTREAMS
 %extend RDKit::ForwardSDMolSupplier {
     ForwardSDMolSupplier(RDKit::gzstream *strm, bool sanitize=true, bool removeHs = true,
                   bool strictParsing = true) {
@@ -66,6 +67,7 @@
     return foo;
   }
 };
+#endif
 
 %include <GraphMol/Resonance.h>
 
diff --git a/Code/JavaWrappers/Streams.i b/Code/JavaWrappers/Streams.i
index 4d5de27f4..5c47cf158 100644
--- a/Code/JavaWrappers/Streams.i
+++ b/Code/JavaWrappers/Streams.i
@@ -49,6 +49,7 @@ namespace std {
 class istream;
 }
 
+#ifdef RDK_USE_BOOST_IOSTREAMS
 %extend RDKit::gzstream {
     std::istream* _GetStream() { return (std::istream*)$self; }
     std::string Dump() {
@@ -68,6 +69,7 @@ class istream;
      return streamRef;
   }
 %}
+#endif
 
 %include <../RDStreams/streams.h>
 
diff --git a/Code/JavaWrappers/gmwrapper/CMakeLists.txt b/Code/JavaWrappers/gmwrapper/CMakeLists.txt
index 132fbfd7e..2b6f66ac7 100644
--- a/Code/JavaWrappers/gmwrapper/CMakeLists.txt
+++ b/Code/JavaWrappers/gmwrapper/CMakeLists.txt
@@ -173,6 +173,10 @@ if(NOT RDK_BUILD_INCHI_SUPPORT)
 LIST(REMOVE_ITEM JAVA_TEST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src-test/org/RDKit/InchiTests.java")
 endif()
 
+if(NOT RDK_USE_BOOST_IOSTREAMS)
+LIST(REMOVE_ITEM JAVA_TEST_FILES "${CMAKE_CURRENT_SOURCE_DIR}/src-test/org/RDKit/GzStreamTests.java")
+endif()
+
 ADD_CUSTOM_COMMAND(
   OUTPUT ${CMAKE_JAVA_TEST_OUTDIR}/org/RDKit/WrapperTests.class
   COMMAND ${JAVA_COMPILE} ${DOCLINT_FLAGS} -d ${CMAKE_JAVA_TEST_OUTDIR} -cp "\"${CMAKE_CURRENT_SOURCE_DIR}/org.RDKit.jar${PATH_SEP}${JUNIT_JAR}\"" ${JAVA_TEST_FILES}
diff --git a/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/GzStreamTests.java b/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/GzStreamTests.java
new file mode 100644
index 000000000..ce1ec0268
--- /dev/null
+++ b/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/GzStreamTests.java
@@ -0,0 +1,37 @@
+package org.RDKit;
+
+import static org.junit.Assert.*;
+
+import java.io.*;
+import java.util.ArrayList;
+
+import org.junit.*;
+
+public class GzStreamTests extends GraphMolTest {
+
+	@Test
+	public void test11GZstream() {
+		// NCI_aids_few.sdf.gz
+		File base = getRdBase();
+		File gzpath  = new File(base, "Code" + File.separator + "GraphMol" + File.separator +
+								"FileParsers" + File.separator + "test_data");
+		File fileN = new File(gzpath, "NCI_aids_few.sdf.gz");
+		assertTrue(fileN.exists());
+		gzstream stream = new gzstream(fileN.getPath());
+		ForwardSDMolSupplier suppl = new ForwardSDMolSupplier(stream);
+		assertFalse(suppl.atEnd());
+		ArrayList<ROMol> ms = new ArrayList<ROMol>();
+		ROMol m;
+		do {
+		m = suppl.next();
+		if (m != null)
+			ms.add(m);
+		} while (!suppl.atEnd());
+		assertEquals(16, ms.size());
+	}
+
+	public static void main(String args[]) {
+		org.junit.runner.JUnitCore.main("org.RDKit.GzStreamTests");
+	}
+
+}
diff --git a/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/SuppliersTests.java b/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/SuppliersTests.java
index b75a2c36b..2bd20c857 100644
--- a/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/SuppliersTests.java
+++ b/Code/JavaWrappers/gmwrapper/src-test/org/RDKit/SuppliersTests.java
@@ -167,28 +167,6 @@ public class SuppliersTests extends GraphMolTest {
                 if((i%1000)==0) System.err.printf("Done: %s\n",i);
             }
 	}
-  
-        @Test
-        public void test11GZstream() {
-          // NCI_aids_few.sdf.gz
-          File base = getRdBase();
-          File gzpath  = new File(base, "Code" + File.separator + "GraphMol" + File.separator +
-                                  "FileParsers" + File.separator + "test_data");
-          File fileN = new File(gzpath, "NCI_aids_few.sdf.gz");
-          assertTrue(fileN.exists());
-          gzstream stream = new gzstream(fileN.getPath());
-          ForwardSDMolSupplier suppl = new ForwardSDMolSupplier(stream);
-          assertFalse(suppl.atEnd());
-          ArrayList<ROMol> ms = new ArrayList<ROMol>();
-          ROMol m;
-          do {
-            m = suppl.next();
-            if (m != null)
-              ms.add(m);
-          } while (!suppl.atEnd());
-          assertEquals(16, ms.size());
-
-        }
 
 	public static void main(String args[]) {
 		org.junit.runner.JUnitCore.main("org.RDKit.SuppliersTests");