Mxx_ru 1.2.1 → 1.3.0

data/tests/cpp/rucodegen.embedded/host_config.cpp

@@ -0,0 +1,32 @@
+#include <string>
+
+#include "impl/h/conn_params.hpp"
+
+/* RuCodeGen::Embedded::begin
+cpp_value_incapsulator :host_config_t do |c|
+	c.decl_file :script_relative => "h/host_config.impl.hpp"
+	c.impl_file :script_relative => "host_config.impl.cpp"
+
+	c.attr_suffix "_"
+
+	c.attr :host, "std::string", :default => "localhost"
+	c.attr :port, "short", :default => 8080
+	c.attr :conn_params, "impl::conn_params_t", :getter_returns_value => true
+end
+RuCodeGen::Embedded::end */
+
+#include "h/host_config.impl.hpp"
+#include "host_config.impl.cpp"
+
+int
+main()
+	{
+		impl::conn_params_t params;
+		params.attempts( 8 );
+
+		host_config_t cfg;
+
+		cfg.host( "eao197.narod.ru" );
+		cfg.port( 80 );
+		cfg.conn_params( params );
+	}

data/tests/cpp/rucodegen.embedded/impl/conn_params.cpp

@@ -0,0 +1,7 @@
+#include "h/conn_params.hpp"
+
+namespace impl
+{
+#include "conn_params.impl.cpp"
+}
+

data/tests/cpp/rucodegen.embedded/impl/conn_params.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require_gem 'RuCodeGen'
+
+cpp_value_incapsulator :conn_params_t do |c|
+	c.decl_file :script_relative => "h/conn_params.impl.hpp"
+	c.impl_file :script_relative => "conn_params.impl.cpp"
+
+	c.attr_suffix "_"
+
+	c.attr :attempts, "int", :default => 3
+	c.attr :reconnect_timeout, "int", :default => 10
+	c.attr :restore_timeout, "int", :default => 5
+end
+

data/tests/cpp/rucodegen.embedded/impl/h/conn_params.hpp

@@ -0,0 +1,10 @@
+#if !defined( IMPL__CONN_PARAMS_HPP )
+#define IMPL_CONN_PARAMS_HPP
+
+namespace impl
+{
+#include "conn_params.impl.hpp"
+}
+
+#endif
+

data/tests/cpp/rucodegen.embedded/prj.rb

@@ -0,0 +1,16 @@
+require 'mxx_ru/cpp'
+require 'mxx_ru/cpp/rucodegen'
+
+Mxx_ru::Cpp::exe_target {
+	target "host_config"
+
+	rucodegen = generator Mxx_ru::Cpp::RuCodeGen.new( self )
+
+	cpp_source "host_config.cpp"
+	rucodegen.add_embedded "host_config.cpp"
+
+	sources_root( "impl" ) {
+		cpp_source "conn_params.cpp"
+		rucodegen.add "conn_params.rb"
+	}
+}

data/tests/cpp/rucodegen.embedded/tc_rucodegen.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_RuCodeGenEmbedded < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/cpp/rucodegen'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'prj.rb' )
+      clean( 'prj.rb' )
+    }
+  end
+
+end
+

data/tests/cpp/textfile_unittest/tc_textfile_unittest.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_TextFileUnitTest < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/cpp/textfile_unittest'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'build.rb' )
+      clean( 'build.rb' )
+    }
+  end
+
+end
+

data/tests/cpp/vc_cleanup/tc_vc_cleanup.rb

@@ -1,31 +1,17 @@
 require 'test/unit'
 
-class TC_VcCleanup < Test::Unit::TestCase
-  TEST_FOLDER = 'tests/cpp/vc_cleanup'
-  RUBYLIB_FOLDER = '../../../lib'
-
-  def initialize( test_case_name )
-    super( test_case_name )
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
 
-    # We can be started from tests/cpp/vc_cleanup folder or from
-    # root project folder. If we are in test folder already then
-    # we need no change current work directory.
-    @need_change_cwd = !File.exists?( File.basename( __FILE__ ) )
-  end
+class TC_VcCleanup < Test::Unit::TestCase
+  include TestWithCompilation
 
-  def test_cleanup
-    if @need_change_cwd
-      Dir.chdir( TEST_FOLDER ) do do_test end
-    else
-      do_test
-    end
-  end
+  test_path 'tests/cpp/vc_cleanup'
 
-  def do_test
+  test_case :build_and_clean do
     project_files = Dir[ 'prj_*.rb' ]
     
-    build_all_targets( project_files )
-    clean_all_targets( project_files )
+    build( *project_files )
+    clean( *project_files )
 
     garbage_files = Dir.glob( "**/*.{ilk,pdb,lib,exp}" )
 
@@ -33,28 +19,5 @@ class TC_VcCleanup < Test::Unit::TestCase
     assert_equal( 0, garbage_files.size )
   end
 
-  def build_all_targets( project_files )
-    # Running all projects to build targets.
-    project_files.each do |prj|
-      command = "ruby -I#{RUBYLIB_FOLDER} #{prj} --mxx-cpp-debug"
-      run_and_check_command( command )
-    end
-  end
-
-  def clean_all_targets( project_files )
-    # Running all projects to clean up targets.
-    project_files.each do |prj|
-      command = "ruby -I#{RUBYLIB_FOLDER} #{prj} --mxx-clean"
-      run_and_check_command( command )
-    end
-  end
-
-  def run_and_check_command( command )
-    started = system( command )
-    assert(
-      started && $? == 0,
-      "some problems in running #{command}: " +
-        "started: #{started}, exit status: #{$?}" )
-  end
 end
 

data/tests/mxx_ru/binary_library/tc_binary_library.rb

@@ -0,0 +1,57 @@
+require 'test/unit'
+
+require 'mxx_ru/binary_library'
+
+class TC_BinaryLibrary < Test::Unit::TestCase
+
+  def test_creation
+    static = Mxx_ru::BinaryLibrary.new(
+        'static', Mxx_ru::BinaryLibrary::STATIC )
+    assert_equal( 'static', static.name )
+    assert_equal( Mxx_ru::BinaryLibrary::STATIC, static.type )
+
+    shared = Mxx_ru::BinaryLibrary.new(
+        'shared', Mxx_ru::BinaryLibrary::SHARED )
+    assert_equal( 'shared', shared.name )
+    assert_equal( Mxx_ru::BinaryLibrary::SHARED, shared.type )
+
+    any = Mxx_ru::BinaryLibrary.new(
+        'any', Mxx_ru::BinaryLibrary::ANY )
+    assert_equal( 'any', any.name )
+    assert_equal( Mxx_ru::BinaryLibrary::ANY, any.type )
+  end
+
+  def test_incorrect_type
+    assert_nothing_raised {
+      b = Mxx_ru::BinaryLibrary.new( 'a', Mxx_ru::BinaryLibrary::STATIC )
+    }
+
+    assert_raise( Mxx_ru::InvalidValueEx ) {
+      b = Mxx_ru::BinaryLibrary.new( 'b', :dynamic )
+    }
+  end
+
+  def test_array_of_lib_equality
+    a = [
+          Mxx_ru::BinaryLibrary.new( 'A', Mxx_ru::BinaryLibrary::STATIC ),
+          Mxx_ru::BinaryLibrary.new( 'B', Mxx_ru::BinaryLibrary::SHARED ),
+          Mxx_ru::BinaryLibrary.new( 'C', Mxx_ru::BinaryLibrary::ANY ) ]
+    b = [
+          Mxx_ru::BinaryLibrary.new( 'A', Mxx_ru::BinaryLibrary::STATIC ),
+          Mxx_ru::BinaryLibrary.new( 'B', Mxx_ru::BinaryLibrary::SHARED ),
+          Mxx_ru::BinaryLibrary.new( 'C', Mxx_ru::BinaryLibrary::ANY ) ]
+
+    assert_equal( a, b )
+  end
+
+  def test_array_of_lib_uniq
+    a = [
+          Mxx_ru::BinaryLibrary.new( 'A', Mxx_ru::BinaryLibrary::STATIC ),
+          Mxx_ru::BinaryLibrary.new( 'B', Mxx_ru::BinaryLibrary::SHARED ),
+          Mxx_ru::BinaryLibrary.new( 'C', Mxx_ru::BinaryLibrary::ANY ) ]
+    b = a.uniq
+
+    assert_equal( a, b )
+  end
+end
+

data/tests/mxx_ru/binary_library/tc_binary_target_lib_methods.rb

@@ -0,0 +1,114 @@
+require 'test/unit'
+
+require 'mxx_ru/binary_target'
+
+class TC_BinaryTargetLibMethods < Test::Unit::TestCase
+  def make_static_lib( name )
+    Mxx_ru::BinaryLibrary.new( name, Mxx_ru::BinaryLibrary::STATIC )
+  end
+
+  def make_shared_lib( name )
+    Mxx_ru::BinaryLibrary.new( name, Mxx_ru::BinaryLibrary::SHARED )
+  end
+
+  def make_any_lib( name )
+    Mxx_ru::BinaryLibrary.new( name, Mxx_ru::BinaryLibrary::ANY )
+  end
+
+  def test_add_libs
+    target = Mxx_ru::BinaryTarget.new( 'test_add_libs' )
+
+    target.lib( 'A' )
+    target.lib_static( 'B' )
+    target.lib_shared( 'C' )
+
+    assert_equal(
+        [ make_any_lib( 'A' ),
+          make_static_lib( 'B' ),
+          make_shared_lib( 'C' ) ],
+        target.mxx_required_libs )
+    assert_equal( [], target.mxx_required_lib_paths )
+  end
+
+  def test_add_libs_with_paths
+    target = Mxx_ru::BinaryTarget.new( 'test_add_libs_with_paths' )
+
+    target.lib( 'A', 'lib' )
+    target.lib_static( 'B', '/usr/lib' )
+    target.lib_shared( 'C', '/usr/local/lib' )
+
+    assert_equal(
+        [ make_any_lib( 'A' ),
+          make_static_lib( 'B' ),
+          make_shared_lib( 'C' ) ],
+        target.mxx_required_libs )
+    assert_equal(
+        [ 'lib',
+          '/usr/lib',
+          '/usr/local/lib' ],
+        target.mxx_required_lib_paths )
+  end
+
+  def test_lib_no_conflict
+    target = Mxx_ru::BinaryTarget.new( 'test_lib_no_conflict' )
+    
+    target.lib( 'A' )
+    target.lib_static( 'A' )
+    target.lib( 'A' )
+
+    assert_nothing_raised {
+      target.mxx_required_libs
+    }
+
+    target.lib_shared( 'B' )
+    target.lib( 'B' )
+
+    assert_nothing_raised {
+      target.mxx_required_libs
+    }
+  end
+
+  def test_lib_conflict
+    target = Mxx_ru::BinaryTarget.new( 'test_lib_conflict' )
+
+    target.lib_static( 'C' )
+    target.lib( 'C' )
+    target.lib_shared( 'C' )
+    target.lib( 'C' )
+
+    assert_raise( Mxx_ru::BinaryLibraryTypeConflictEx ) {
+      target.mxx_required_libs
+    }
+  end
+
+  def test_lib_conflict_ex_data
+    target = Mxx_ru::BinaryTarget.new( 'test_lib_conflict_ex_data' )
+
+    target.lib( 'A' )
+    target.lib_static( 'A' )
+    target.lib( 'A' )
+
+    target.lib_static( 'C' )
+    target.lib( 'C' )
+    target.lib_shared( 'C' )
+    target.lib( 'C' )
+
+    target.lib_shared( 'B' )
+    target.lib( 'B' )
+
+    exception_raised = false
+
+    begin
+      target.mxx_required_libs
+    rescue Mxx_ru::BinaryLibraryTypeConflictEx => x
+      exception_raised = true
+
+      # Name of conflicted library must be in message.
+      assert( x.message =~ /'C'/ )
+    end
+
+    assert_equal( true, exception_raised )
+  end
+
+end
+

data/tests/mxx_ru/lib_path/build.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::composite_target {
+  required_prj 'hi.rb'
+  required_prj 'bye.rb'
+
+  required_prj 'main.rb'
+}

data/tests/mxx_ru/lib_path/bye.c

@@ -0,0 +1,3 @@
+#include <stdio.h>
+
+void bye() { printf( "bye\n" ); }

data/tests/mxx_ru/lib_path/bye.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::lib_target {
+  target_root 'bye_lib'
+  target 'bye'
+
+  c_source 'bye.c'
+}

data/tests/mxx_ru/lib_path/hi.c

@@ -0,0 +1,3 @@
+#include <stdio.h>
+
+void hi() { printf( "hi\n" ); }

data/tests/mxx_ru/lib_path/hi.rb

@@ -0,0 +1,8 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::lib_target {
+  target_root 'hi_lib'
+  target 'hi'
+
+  c_source 'hi.c'
+}

data/tests/mxx_ru/lib_path/main.c

@@ -0,0 +1,9 @@
+void hi();
+void bye();
+
+int main()
+  {
+    hi();
+    bye();
+    return 0;
+  }

data/tests/mxx_ru/lib_path/main.rb

@@ -0,0 +1,12 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::exe_target {
+  target 'main'
+
+  lib_paths [ 'hi_lib', 'bye_lib' ]
+
+  lib 'hi'
+  lib 'bye'
+
+  c_source 'main.c'
+}

data/tests/mxx_ru/lib_path/tc_lib_path.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_LibPath < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/mxx_ru/lib_path'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'build.rb' )
+      clean( 'build.rb' )
+    }
+  end
+
+end
+

data/tests/mxx_ru/obj_placements/tc_custom_subdir.rb

@@ -0,0 +1,58 @@
+require 'test/unit'
+require 'fileutils'
+
+require 'mxx_ru/cpp/obj_placements/custom_subdir'
+
+class TC_CustomSubdirObjPlacement < Test::Unit::TestCase
+  FINAL_PATH = 'bin'
+  INTERMEDIATE_PATH = 'intermediate'
+
+  def teardown
+    FileUtils.rm_r( FINAL_PATH ) if File.directory?( FINAL_PATH )
+    FileUtils.rm_r( INTERMEDIATE_PATH ) if File.directory?( INTERMEDIATE_PATH )
+  end
+
+  def test_final_path
+    p = Mxx_ru::Cpp::CustomSubdirObjPlacement.new(
+        FINAL_PATH, INTERMEDIATE_PATH )
+
+    r = p.get_exe( '', nil, nil )
+    check_name_and_path( FINAL_PATH + '/', r )
+    r = p.get_exe( 'exe', nil, nil )
+    check_name_and_path( FINAL_PATH + '/exe', r )
+
+    r = p.get_dll( '', nil, nil )
+    check_name_and_path( FINAL_PATH + '/', r )
+    r = p.get_dll( 'dll', nil, nil )
+    check_name_and_path( FINAL_PATH + '/dll', r )
+
+    r = p.get_lib( '', nil, nil )
+    check_name_and_path( FINAL_PATH + '/', r )
+    r = p.get_lib( 'lib', nil, nil )
+    check_name_and_path( FINAL_PATH + '/lib', r )
+  end
+
+  def test_intermediate_path
+    p = Mxx_ru::Cpp::CustomSubdirObjPlacement.new(
+        FINAL_PATH, INTERMEDIATE_PATH )
+
+    r = p.get_obj( nil, nil, nil )
+    check_name_and_path( INTERMEDIATE_PATH, r )
+
+    r = p.get_obj( '', nil, nil )
+    check_name_and_path( INTERMEDIATE_PATH, r )
+
+    r = p.get_obj( '.', nil, nil )
+    check_name_and_path( INTERMEDIATE_PATH, r )
+
+    r = p.get_obj( 'prj_1/src', nil, nil )
+    check_name_and_path( File.join( INTERMEDIATE_PATH, 'prj_1/src' ), r )
+  end
+
+private
+  def check_name_and_path( expected, actual )
+    assert_equal( expected, actual )
+    assert( File.directory?( expected ) )
+  end
+end
+

data/tests/mxx_ru/opt_lib_ext/build.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::composite_target {
+  required_prj 'hi.rb'
+  required_prj 'test-with-ext.rb'
+  required_prj 'test-no-ext.rb'
+}

data/tests/mxx_ru/opt_lib_ext/hi.c

@@ -0,0 +1,3 @@
+#include <stdio.h>
+
+void hi() { printf( "hi\n" ); }

data/tests/mxx_ru/opt_lib_ext/hi.h

@@ -0,0 +1 @@
+void hi();

data/tests/mxx_ru/opt_lib_ext/hi.rb

@@ -0,0 +1,7 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::lib_target {
+  target 'hi'
+
+  c_source 'hi.c'
+}

data/tests/mxx_ru/opt_lib_ext/main.c

@@ -0,0 +1,7 @@
+#include "hi.h"
+
+int main()
+  {
+    hi();
+    return 0;
+  }

data/tests/mxx_ru/opt_lib_ext/tc_opt_lib_ext.rb

@@ -0,0 +1,18 @@
+require 'test/unit'
+
+require File.dirname( __FILE__ ) + '/../../test_with_compilation'
+
+class TC_OptLibPath < Test::Unit::TestCase
+  include TestWithCompilation
+
+  test_path 'tests/mxx_ru/opt_lib_ext'
+
+  test_case :successful_compile_and_link do
+    assert_nothing_raised {
+      build( 'build.rb' )
+      clean( 'build.rb' )
+    }
+  end
+
+end
+

data/tests/mxx_ru/opt_lib_ext/test-no-ext.rb

@@ -0,0 +1,9 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::exe_target {
+  target 'test-no-ext'
+
+  lib 'hi', '.'
+
+  c_source 'main.c'
+}

data/tests/mxx_ru/opt_lib_ext/test-with-ext.rb

@@ -0,0 +1,13 @@
+require 'mxx_ru/cpp'
+
+Mxx_ru::Cpp::exe_target {
+  target 'test-with-ext'
+
+  if 'mswin' == toolset.tag( 'target_os' )
+    lib 'hi.lib', '.'
+  else
+    lib 'hi', '.'
+  end
+
+  c_source 'main.c'
+}

data/tests/mxx_ru/qt_gen/tc_uic_result_subdir.rb

@@ -0,0 +1,76 @@
+require 'test/unit'
+
+require 'mxx_ru/cpp/qt'
+
+class CustomQtGen < Mxx_ru::Cpp::QtGen
+  public :names_from_ui
+end
+
+class TC_UicResultSubdir < Test::Unit::TestCase
+
+  def test_in_cwd_no_uic_result_subdir
+    target = create_target( 'no_uic_result_subdir.rb' )
+    qt = create_qt_gen( target )
+
+    ui_names = qt.names_from_ui( "dlg.ui", target )
+    assert_equal( "dlg.hpp", ui_names.header )
+    assert_equal( "dlg.cpp", ui_names.source )
+  end
+
+  def test_in_subdir_no_uic_result_subdir
+    target = create_target( 'some/path/no_uic_result_subdir.rb' )
+    qt = create_qt_gen( target )
+
+    path = 'some/path'
+
+    ui_names = qt.names_from_ui( "#{path}/dlg.ui", target )
+    assert_equal( "#{path}/dlg.hpp", ui_names.header )
+    assert_equal( "#{path}/dlg.cpp", ui_names.source )
+  end
+
+  def test_in_cwd_with_uic_result_subdir
+    target = create_target( 'with_uic_result_subdir.rb' )
+    qt = create_qt_gen( target )
+    qt.uic_result_subdir = 'uic'
+
+    ui_names = qt.names_from_ui( "dlg.ui", target )
+    assert_equal( "./uic/dlg.hpp", ui_names.header )
+    assert_equal( "./uic/dlg.cpp", ui_names.source )
+  end
+
+  def test_in_subdir_with_uic_result_subdir
+    target = create_target( 'some/path/with_uic_result_subdir.rb' )
+    qt = create_qt_gen( target )
+    qt.uic_result_subdir = 'uic'
+
+    path = 'some/path'
+
+    ui_names = qt.names_from_ui( "#{path}/dlg.ui", target )
+    assert_equal( "#{path}/uic/dlg.hpp", ui_names.header )
+    assert_equal( "#{path}/uic/dlg.cpp", ui_names.source )
+  end
+
+  def test_target_include_path
+    target = create_target( 'some/path/with_uic_result_subdir.rb' )
+    qt = create_qt_gen( target )
+    qt.uic_result_subdir = 'uic'
+    qt.ui( 'dlg.ui' )
+    qt.ui( 'mainwnd/mainwnd.ui' )
+
+    assert( target.mxx_all_include_paths.include?( 'some/path/uic' ) )
+    assert( target.mxx_all_include_paths.include?( 'some/path/mainwnd/uic' ) )
+  end
+
+private
+  def create_target( prj_alias )
+    Mxx_ru::Cpp::ExeTarget.new( prj_alias )
+  end
+
+  def create_qt_gen( target )
+    qt = CustomQtGen.new( target )
+    qt.hpp_ext = '.hpp'
+    qt.cpp_ext = '.cpp'
+    qt
+  end
+end
+

data/tests/mxx_ru/target_ext/dll_hi.cpp

@@ -0,0 +1 @@
+void hi() {}

data/tests/mxx_ru/target_ext/exe_hi.cpp

@@ -0,0 +1,4 @@
+void hi() {}
+
+int main() { hi(); }
+

data/tests/mxx_ru/target_ext/lib_hi.cpp

@@ -0,0 +1 @@
+void hi() {}