Mxx_ru 1.3.1 → 1.3.2

data/tests/mxx_ru/obj_placements/tc_custom_subdir.rb

@@ -1,58 +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
-
+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

@@ -1,7 +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'
-}
+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.rb

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

data/tests/mxx_ru/opt_lib_ext/tc_opt_lib_ext.rb

@@ -1,18 +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
-
+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

@@ -1,9 +1,9 @@
-require 'mxx_ru/cpp'
-
-Mxx_ru::Cpp::exe_target {
-  target 'test-no-ext'
-
-  lib 'hi', '.'
-
-  c_source 'main.c'
-}
+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

@@ -1,13 +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'
-}
+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/plural_form_methods/tc.rb

@@ -1,72 +1,72 @@
-require 'test/unit'
-
-require 'mxx_ru/cpp'
-
-class TC_PluralFormMethods < Test::Unit::TestCase
-  def test_required_prj
-    test_value = [ 'test_required_prj_sub1', 'test_required_prj_sub2' ]
-
-    test_value.each { |p| Mxx_ru::Cpp::composite_target( p ) {} }
-
-    t = Mxx_ru::Cpp::composite_target( 'test_required_prj' ) {
-        required_prjs test_value
-      }
-
-    assert_equal( test_value.size, t.mxx_required_prjs.size )
-    t.mxx_required_prjs.each { |p|
-      assert( test_value.member?( p.prj_alias ) )
-    }
-  end
-
-  def test_c_sources
-    test_files = [ 'hello.c', 'greeting.c' ]
-
-    t = Mxx_ru::setup_target(
-      Mxx_ru::Cpp::Exe_target.new( 'test_c_sources' ) {
-        target 'test_c_sources'
-
-        c_sources test_files
-      },
-      false )
-
-    defined_sources = t.mxx_c_files.inject( [] ) { |r, f| r << File.basename( f.name ) }
-
-    assert_equal( test_files, defined_sources )
-  end
-
-  def test_cpp_sources
-    test_files = [ 'hello.cpp', 'greeting.cpp' ]
-
-    path = 'some/test'
-    t = Mxx_ru::setup_target(
-      Mxx_ru::Cpp::Exe_target.new( "#{path}/test_cpp_sources" ) {
-        target 'test_cpp_sources'
-
-        cpp_sources test_files
-      },
-      false )
-
-    expected_sources = test_files.inject( [] ) { |r, f| r << "#{path}/#{f}" }
-    defined_sources = t.mxx_cpp_files.inject( [] ) { |r, f| r << f.name }
-
-    assert_equal( expected_sources, defined_sources )
-  end
-
-  def test_cpp_sources_with_special_prefix
-    path = 'some/test'
-    test_files = [ "#{path}/hello.cpp", "#{path}/greeting.cpp" ]
-
-    t = Mxx_ru::setup_target(
-      Mxx_ru::Cpp::Exe_target.new( "#{path}/test_cpp_sources" ) {
-        target 'test_cpp_sources'
-
-        cpp_sources test_files
-      },
-      false )
-
-    defined_sources = t.mxx_cpp_files.inject( [] ) { |r, f| r << f.name }
-
-    assert_equal( test_files, defined_sources )
-  end
-end
-
+require 'test/unit'
+
+require 'mxx_ru/cpp'
+
+class TC_PluralFormMethods < Test::Unit::TestCase
+  def test_required_prj
+    test_value = [ 'test_required_prj_sub1', 'test_required_prj_sub2' ]
+
+    test_value.each { |p| Mxx_ru::Cpp::composite_target( p ) {} }
+
+    t = Mxx_ru::Cpp::composite_target( 'test_required_prj' ) {
+        required_prjs test_value
+      }
+
+    assert_equal( test_value.size, t.mxx_required_prjs.size )
+    t.mxx_required_prjs.each { |p|
+      assert( test_value.member?( p.prj_alias ) )
+    }
+  end
+
+  def test_c_sources
+    test_files = [ 'hello.c', 'greeting.c' ]
+
+    t = Mxx_ru::setup_target(
+      Mxx_ru::Cpp::Exe_target.new( 'test_c_sources' ) {
+        target 'test_c_sources'
+
+        c_sources test_files
+      },
+      false )
+
+    defined_sources = t.mxx_c_files.inject( [] ) { |r, f| r << File.basename( f.name ) }
+
+    assert_equal( test_files, defined_sources )
+  end
+
+  def test_cpp_sources
+    test_files = [ 'hello.cpp', 'greeting.cpp' ]
+
+    path = 'some/test'
+    t = Mxx_ru::setup_target(
+      Mxx_ru::Cpp::Exe_target.new( "#{path}/test_cpp_sources" ) {
+        target 'test_cpp_sources'
+
+        cpp_sources test_files
+      },
+      false )
+
+    expected_sources = test_files.inject( [] ) { |r, f| r << "#{path}/#{f}" }
+    defined_sources = t.mxx_cpp_files.inject( [] ) { |r, f| r << f.name }
+
+    assert_equal( expected_sources, defined_sources )
+  end
+
+  def test_cpp_sources_with_special_prefix
+    path = 'some/test'
+    test_files = [ "#{path}/hello.cpp", "#{path}/greeting.cpp" ]
+
+    t = Mxx_ru::setup_target(
+      Mxx_ru::Cpp::Exe_target.new( "#{path}/test_cpp_sources" ) {
+        target 'test_cpp_sources'
+
+        cpp_sources test_files
+      },
+      false )
+
+    defined_sources = t.mxx_cpp_files.inject( [] ) { |r, f| r << f.name }
+
+    assert_equal( test_files, defined_sources )
+  end
+end
+

data/tests/mxx_ru/qt_gen/tc_uic_result_subdir.rb

@@ -1,76 +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
-
+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
+