From c816e7d4c4f13145fff178be6286aff2d8b28846 Mon Sep 17 00:00:00 2001 From: Martin Kim Dung-Pham Date: Fri, 28 Sep 2018 08:59:06 +0200 Subject: [PATCH] Update tests and cleanup pull request --- mogenerator.m | 1 - test/Rakefile | 15 +++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mogenerator.m b/mogenerator.m index 64af375a..a83b3de1 100644 --- a/mogenerator.m +++ b/mogenerator.m @@ -428,7 +428,6 @@ - (NSArray*)prettyFetchRequests { } return result; } - @end @implementation NSAttributeDescription (typing) diff --git a/test/Rakefile b/test/Rakefile index e9d21922..5898b5f5 100644 --- a/test/Rakefile +++ b/test/Rakefile @@ -45,11 +45,17 @@ def gen_and_compile_swift(mogenPath, extra_mogen_args) puts run_or_die './testbin' end +def assert_entity_user_info_respected + # mogenerator.ignore + includes_uncle = Dir.entries('./MOs').any? { |file| file.include?('Uncle') } + raise 'Failed: Ignored entities should not be generated' if includes_uncle +end desc 'Generate, Compile and Run Objective-C' task :objc do Rake::Task[:clean].execute gen_and_compile_objc(MOGENERATOR_PATH, '', '') + assert_entity_user_info_respected Rake::Task[:clean].execute end @@ -57,17 +63,10 @@ desc 'Generate, Compile and Run Swift' task :swift do Rake::Task[:clean].execute gen_and_compile_swift(MOGENERATOR_PATH, '') + assert_entity_user_info_respected Rake::Task[:clean].execute end -desc 'Generate, Compile and test ignored entities' -task :objc do - Rake::Task[:clean].execute - gen_and_compile_objc(MOGENERATOR_PATH, '', '') - includes_uncle = Dir.entries('./MOs').any? { |file| file.include?('Uncle') } - raise 'Failed: Ignored entities should not be generated' if includes_uncle - Rake::Task[:clean].execute -end desc 'Clean output' task :clean do