Stubbed version

Author: dcwhite

src/Modules/Legacy/Matlab/DataIO/CMakeLists.txt

@@ -45,24 +45,24 @@ ADD_LIBRARY(Modules_Legacy_Matlab_DataIO
 )
 
 TARGET_LINK_LIBRARIES(Modules_Legacy_Matlab_DataIO
-  Core_Persistent
+  #Core_Persistent
   #Core_Util
   #Core_Exceptions
-  Core_Thread
+  #Core_Thread
   #Dataflow_GuiInterface
   Core_Datatypes
-  Core_Geometry
+  #Core_Geometry
   #Core_GeomInterface
   #Dataflow_TkExtensions
-  #Dataflow_Network
+  Dataflow_Network
   #Core_XMLUtil
-  Core_Matlab
+  #Core_Matlab
   #Core_Services
   #Core_ICom
   #Core_SystemCall
   ${SCI_TEEM_LIBRARY}
   ${SCI_ZLIB_LIBRARY}
-#  ${M_LIBRARY}
+  #${M_LIBRARY}
   #${TK_LIBRARY}
   #${GL_LIBRARY}
 )

src/Modules/Legacy/Matlab/DataIO/ImportDatatypesFromMatlab.cc

@@ -26,12 +26,38 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-/* 
- * This module reads a matlab file and converts it to a SCIRun matrix
- *
- */
+#include <Modules/Legacy/Matlab/DataIO/ImportDatatypesFromMatlab.h>
+#include <Core/Algorithms/Base/AlgorithmVariableNames.h>
+#include <Core/Datatypes/Matrix.h>
+#include <Core/Datatypes/String.h>
+#include <Core/Datatypes/Legacy/Field/Field.h>
+
+using namespace SCIRun::Modules::Matlab::DataIO;
+//using namespace SCIRun::Core::Algorithms;
+using namespace SCIRun::Core::Datatypes;
+using namespace SCIRun::Dataflow::Networks;
+
+const ModuleLookupInfo ImportDatatypesFromMatlab::staticInfo_("ImportDatatypesFromMatlab", "DataIO", "Matlab");
+
+ImportDatatypesFromMatlab::ImportDatatypesFromMatlab() : Module(staticInfo_)
+{
+  INITIALIZE_PORT(Filename);
+  INITIALIZE_PORT(OutputField);
+  INITIALIZE_PORT(OutputMatrix);
+  INITIALIZE_PORT(FilenameOut);
+}
+
+void ImportDatatypesFromMatlab::setStateDefaults()
+{
+
+}
+
+void ImportDatatypesFromMatlab::execute()
+{
+}
 
 
+#if 0
 #include <sstream>
 #include <string>
 #include <vector>
@@ -508,3 +534,5 @@ void ImportDatatypesFromMatlab::displayerror(std::string str)
 
 
 } // End namespace MatlabIO
+
+#endif

src/Modules/Legacy/Matlab/DataIO/ImportDatatypesFromMatlab.h

@@ -51,6 +51,8 @@ namespace DataIO {
     OUTPUT_PORT(0, OutputField, LegacyField);
     OUTPUT_PORT(1, OutputMatrix, Matrix);
     OUTPUT_PORT(2, FilenameOut, String);
+
+    static const Dataflow::Networks::ModuleLookupInfo staticInfo_;
   };
 
 }}}}

src/Modules/Legacy/Matlab/DataIO/Tests/CMakeLists.txt

@@ -44,6 +44,7 @@ TARGET_LINK_LIBRARIES(Modules_Legacy_Matlab_DataIO_Tests
   Modules_Factory
   Dataflow_State
   Testing_Utils
+  Testing_ModuleTestBase
   Algorithms_Factory
   gtest_main
   gtest

src/Modules/Legacy/Matlab/DataIO/Tests/ImportDatatypesFromMatlabTests.cc

@@ -26,22 +26,37 @@
    DEALINGS IN THE SOFTWARE.
 */
 
-#include <gtest/gtest.h>
-#include <gmock/gmock.h>
-#include <Dataflow/Network/Network.h>
-#include <Dataflow/Network/ModuleInterface.h>
-#include <Dataflow/Network/ConnectionId.h>
-#include <Dataflow/Network/Tests/MockNetwork.h>
-#include <Modules/Basic/ReceiveScalar.h>
-#include <Modules/Basic/SendScalar.h>
+#include <Modules/Legacy/Matlab/DataIO/ImportDatatypesFromMatlab.h>
+#include <Core/Datatypes/Legacy/Field/Field.h>
+#include <Core/Datatypes/String.h>
+#include <Testing/ModuleTestBase/ModuleTestBase.h>
 
 using namespace SCIRun;
-using namespace SCIRun::Modules::Basic;
+using namespace SCIRun::Testing;
+using namespace SCIRun::Modules::Matlab::DataIO;
+using namespace SCIRun::Core::Datatypes;
+using namespace SCIRun::Core::Algorithms;
 using namespace SCIRun::Dataflow::Networks;
-using namespace SCIRun::Dataflow::Networks::Mocks;
-using ::testing::_;
-using ::testing::NiceMock;
-using ::testing::DefaultValue;
-using ::testing::Return;
+// using ::testing::_;
+// using ::testing::NiceMock;
+// using ::testing::DefaultValue;
+// using ::testing::Return;
 
-/// @todo 
+class ImportDatatypesFromMatlabModuleTest : public ModuleTest
+{
+
+};
+
+TEST_F(ImportDatatypesFromMatlabModuleTest, ThrowsForNullInput)
+{
+  auto csdf = makeModule("ImportDatatypesFromMatlab");
+  StringHandle nullField;
+  stubPortNWithThisData(csdf, 0, nullField);
+
+  EXPECT_THROW(csdf->execute(), NullHandleOnPortException);
+}
+
+TEST_F(ImportDatatypesFromMatlabModuleTest, DISABLED_Foo)
+{
+  FAIL() << "TODO";
+}