content_server 1.5.0 → 1.6.0

data/spec/content_server/content_server_spec.rb

@@ -1,3 +1,8 @@
+# NOTE Code Coverage block must be issued before any of your application code is required
+if ENV['BBFS_COVERAGE']
+  require_relative '../spec_helper.rb'
+  SimpleCov.command_name 'content_server'
+end
 require 'rspec'
 
 require_relative '../../lib/file_copy/copy.rb'

data/spec/content_server/file_streamer_spec.rb

@@ -1,3 +1,8 @@
+# NOTE Code Coverage block must be issued before any of your application code is required
+if ENV['BBFS_COVERAGE']
+  require_relative '../spec_helper.rb'
+  SimpleCov.command_name 'content_server'
+end
 require 'log'
 require 'rspec'
 require 'stringio'

data/spec/file_copy/copy_spec.rb

@@ -1,3 +1,8 @@
+# NOTE Code Coverage block must be issued before any of your application code is required
+if ENV['BBFS_COVERAGE']
+  require_relative '../spec_helper.rb'
+  SimpleCov.command_name 'file_copy'
+end
 require 'rspec'
 
 require_relative '../../lib/file_copy/copy.rb'

data/spec/file_indexing/index_agent_spec.rb

@@ -1,3 +1,8 @@
+# NOTE Code Coverage block must be issued before any of your application code is required
+if ENV['BBFS_COVERAGE']
+  require_relative '../spec_helper.rb'
+  SimpleCov.command_name 'file_indexing'
+end
 require 'rspec'
 require 'tempfile'
 

data/spec/networking/tcp_spec.rb

@@ -1,3 +1,8 @@
+# NOTE Code Coverage block must be issued before any of your application code is required
+if ENV['BBFS_COVERAGE']
+  require_relative '../spec_helper.rb'
+  SimpleCov.command_name 'networking'
+end
 require 'log'
 require 'rspec'
 require 'socket'

data/spec/validations/index_validations_spec.rb

@@ -1,3 +1,8 @@
+# NOTE Code Coverage block must be issued before any of your application code is required
+if ENV['BBFS_COVERAGE']
+  require_relative '../spec_helper.rb'
+  SimpleCov.command_name 'validations'
+end
 require 'rspec'
 require_relative '../../lib/validations.rb'
 

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: content_server
 version: !ruby/object:Gem::Version
-  version: 1.5.0
-  prerelease: 
+  version: 1.6.0
 platform: ruby
 authors:
 - BBFS Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-14 00:00:00.000000000 Z
+date: 2014-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: algorithms
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -110,7 +97,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,7 +104,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,7 +111,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -134,7 +118,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -142,7 +125,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: algorithms
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -150,7 +132,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -158,7 +139,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: log4r
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -174,7 +153,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -182,7 +160,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -190,7 +167,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -198,7 +174,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -206,7 +181,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -214,7 +188,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -222,7 +195,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -230,7 +202,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -240,6 +211,7 @@ email: bbfsdev@gmail.com
 executables:
 - content_server
 - backup_server
+- file_utils
 - testing_server
 - testing_memory
 extensions:
@@ -299,33 +271,7 @@ files:
 - lib/validations.rb
 - lib/validations/index_validations.rb
 - lib/validations/version.rb
-- test/content_data/content_data_test.rb
-- test/file_generator/file_generator_spec.rb
-- test/file_monitoring/monitor_path_test/test_file.500.0
-- test/file_monitoring/monitor_path_test/dir1000/test_file.1000.1
-- test/file_monitoring/monitor_path_test/dir1000/test_file.1000.0
-- test/file_monitoring/monitor_path_test/dir1000/test_file.1000
-- test/file_monitoring/monitor_path_test/test_file.500.1
-- test/file_monitoring/monitor_path_test/test_file.500
-- test/file_monitoring/monitor_path_test/dir1500/test_file.1500
-- test/file_monitoring/monitor_path_test/dir1500/test_file.1500.0
-- test/file_monitoring/monitor_path_test/dir1500/test_file.1500.1
-- test/file_monitoring/monitor_path_test.rb
-- test/file_utils/fileutil_mksymlink_test/test_file.500.0
-- test/file_utils/fileutil_mksymlink_test/dir1000/test_file.1000.1
-- test/file_utils/fileutil_mksymlink_test/dir1000/test_file.1000.0
-- test/file_utils/fileutil_mksymlink_test/dir1000/test_file.1000
-- test/file_utils/fileutil_mksymlink_test/dir1000/dir1500/test_file.1500
-- test/file_utils/fileutil_mksymlink_test/dir1000/dir1500/test_file.1500.0
-- test/file_utils/fileutil_mksymlink_test/dir1000/dir1500/test_file.1500.1
-- test/file_utils/fileutil_mksymlink_test/test_file.500.1
-- test/file_utils/fileutil_mksymlink_test/test_file.500
-- test/file_utils/fileutil_mksymlink_test.rb
-- test/file_utils/time_modification_test.rb
-- test/params/params_spec.rb
-- test/params/params_test.rb
-- test/run_in_background/test_app
-- test/run_in_background/run_in_background_test.rb
+- spec/content_data/content_data_spec.rb
 - spec/content_data/validations_spec.rb
 - spec/content_server/content_server_spec.rb
 - spec/content_server/file_streamer_spec.rb
@@ -335,61 +281,35 @@ files:
 - spec/validations/index_validations_spec.rb
 - bin/content_server
 - bin/backup_server
+- bin/file_utils
 - bin/testing_server
 - bin/testing_memory
 - ext/run_in_background/mkrf_conf.rb
 homepage: http://github.com/bbfsdev/bbfs
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Servers for backing up content.
 test_files:
-- test/content_data/content_data_test.rb
-- test/file_generator/file_generator_spec.rb
-- test/file_monitoring/monitor_path_test/test_file.500.0
-- test/file_monitoring/monitor_path_test/dir1000/test_file.1000.1
-- test/file_monitoring/monitor_path_test/dir1000/test_file.1000.0
-- test/file_monitoring/monitor_path_test/dir1000/test_file.1000
-- test/file_monitoring/monitor_path_test/test_file.500.1
-- test/file_monitoring/monitor_path_test/test_file.500
-- test/file_monitoring/monitor_path_test/dir1500/test_file.1500
-- test/file_monitoring/monitor_path_test/dir1500/test_file.1500.0
-- test/file_monitoring/monitor_path_test/dir1500/test_file.1500.1
-- test/file_monitoring/monitor_path_test.rb
-- test/file_utils/fileutil_mksymlink_test/test_file.500.0
-- test/file_utils/fileutil_mksymlink_test/dir1000/test_file.1000.1
-- test/file_utils/fileutil_mksymlink_test/dir1000/test_file.1000.0
-- test/file_utils/fileutil_mksymlink_test/dir1000/test_file.1000
-- test/file_utils/fileutil_mksymlink_test/dir1000/dir1500/test_file.1500
-- test/file_utils/fileutil_mksymlink_test/dir1000/dir1500/test_file.1500.0
-- test/file_utils/fileutil_mksymlink_test/dir1000/dir1500/test_file.1500.1
-- test/file_utils/fileutil_mksymlink_test/test_file.500.1
-- test/file_utils/fileutil_mksymlink_test/test_file.500
-- test/file_utils/fileutil_mksymlink_test.rb
-- test/file_utils/time_modification_test.rb
-- test/params/params_spec.rb
-- test/params/params_test.rb
-- test/run_in_background/test_app
-- test/run_in_background/run_in_background_test.rb
+- spec/content_data/content_data_spec.rb
 - spec/content_data/validations_spec.rb
 - spec/content_server/content_server_spec.rb
 - spec/content_server/file_streamer_spec.rb

data/test/content_data/content_data_test.rb

@@ -1,291 +0,0 @@
-require 'time.rb'
-require 'test/unit'
-require 'content_server/server'
-require_relative '../../lib/content_data/content_data.rb'
-
-class TestContentData < Test::Unit::TestCase
-
-  def setup
-        Params.init Array.new
-        # must preced Log.init, otherwise log containing default values will be created
-        Params['log_write_to_file'] = false
-        Log.init
-  end
-
-  def test_cloning_db_1
-    content_data = ContentData::ContentData.new
-    content_data.add_instance("A1", 1242, "server_1",
-                              "/home/file_1", 2222222222)
-
-    content_data_cloned = ContentData::ContentData.new(content_data)
-    #check that DBs are equal
-    assert_equal(content_data, content_data_cloned)
-
-    content_data_cloned.add_instance("A1", 1242, "server_1",
-                                     "/home/file_2", 3333333333)
-    #change orig DB - size
-    assert_not_equal(content_data, content_data_cloned)
-  end
-
-  def test_cloning_db_2
-    content_data = ContentData::ContentData.new
-    content_data.add_instance("A1", 1242, "server_1",
-                              "/home/file_1", 2222222222)
-
-    content_data_cloned = ContentData::ContentData.new(content_data)
-    #check that DBs are equal
-    assert_equal(content_data, content_data_cloned)
-
-    content_data_cloned.add_instance("A2", 1243, "server_1",
-                                     "/home/file_2", 3333333333)
-    #change orig DB - size
-    assert_not_equal(content_data, content_data_cloned)
-  end
-
-
-  def test_add_instance
-    #create first content with instance
-    content_data = ContentData::ContentData.new
-    content_data.add_instance("A1", 50, "server_1",
-                              "/home/file_1", 2222222222)
-
-    #Add new instance - different size
-    # size would be overriden should not be added
-    content_data.add_instance("A1", 60, "server_1",
-                              "/home/file_2", 2222222222)
-    assert_equal("1\nA1,60,2222222222\n2\nA1,60,server_1,/home/file_1,2222222222\nA1,60,server_1,/home/file_2,2222222222\n", content_data.to_s)
-
-    #Add new instance - new content
-    #both new content and new instances are created in DB
-    content_data.add_instance("A2", 60, "server_1",
-                              "/home/file_2", 3333333333)
-    assert_equal("2\nA1,60,2222222222\nA2,60,3333333333\n2\n" +
-                     "A1,60,server_1,/home/file_1,2222222222\n" +
-                     "A2,60,server_1,/home/file_2,3333333333\n", content_data.to_s)
-
-        #Add new instance - same content
-    content_data.add_instance("A2", 60, "server_1",
-                              "/home/file_3", 4444444444)
-    assert_equal("2\nA1,60,2222222222\nA2,60,3333333333\n3\n" +
-        "A1,60,server_1,/home/file_1,2222222222\n" +
-        "A2,60,server_1,/home/file_2,3333333333\n" +
-        "A2,60,server_1,/home/file_3,4444444444\n", content_data.to_s)
-        end
-
-  def test_instance_exists
-    content_data = ContentData::ContentData.new
-    content_data.add_instance("A129", 50, "server_1",
-                              "/home/file_1", 2222222222)
-    assert_equal(true, content_data.instance_exists('/home/file_1', 'server_1'))
-    assert_equal(false, content_data.instance_exists('/home/file_1', 'stum'))
-  end
-
-  def test_remove_instance
-    #remove instance also removes content
-    content_data = ContentData::ContentData.new
-    content_data.add_instance("A1", 50, "server_1",
-                              "/home/file_1", 2222222222)
-    assert_equal(true, content_data.content_exists('A1'))
-    assert_equal(true, content_data.instance_exists('/home/file_1', 'server_1'))
-    content_data.remove_instance('server_1', '/home/file_1')
-    assert_equal(false, content_data.instance_exists('/home/file_1', 'server_1'))
-    assert_equal(false, content_data.content_exists('A1'))
-
-    #remove instance does not remove content
-    content_data.add_instance("A1", 50, "server_1",
-                              "/home/file_1", 2222222222)
-    content_data.add_instance("A1", 50, "server_1",
-                              "/home/file_2", 3333333333)
-    assert_equal(true, content_data.content_exists('A1'))
-    assert_equal(true, content_data.instance_exists('/home/file_1', 'server_1'))
-    content_data.remove_instance('server_1', '/home/file_1')
-    assert_equal(false, content_data.instance_exists('/home/file_1', 'server_1'))
-    assert_equal(true, content_data.content_exists('A1'))
-
-    #remove also removes content
-    content_data.remove_instance('server_1', '/home/file_2')
-    assert_equal(false, content_data.instance_exists('/home/file_1', 'server_1'))
-    assert_equal(false, content_data.content_exists('A1'))
-  end
-
-  def test_to_file_from_file
-    content_data = ContentData::ContentData.new
-    content_data.add_instance("A1", 50, "server_1",
-                              "/home/file_1", 22222222222)
-    content_data.add_instance("B1", 60, "server_1",
-                              "/home/file_2", 44444444444)
-    content_data.add_instance("B1", 60, "server_1",
-                              "/home/file_3", 55555555555)
-    file_moc_object = StringIO.new
-    file_moc_object.write(content_data.to_s)
-    test_file = __FILE__ + 'test'
-    content_data.to_file(test_file)
-    content_data_2 = ContentData::ContentData.new
-    content_data_2.from_file(test_file)
-    assert_equal(true, content_data == content_data_2)
-  end
-
-  def test_merge
-    content_data_a = ContentData::ContentData.new
-    content_data_a.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-
-    content_data_b = ContentData::ContentData.new
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_2", 44444444444)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_3", 55555555555)
-    content_data_merged = ContentData.merge(content_data_a, content_data_b)
-    assert_equal(content_data_merged.to_s, "2\nB1,60,44444444444\nA1,50,22222222222\n3\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\nA1,50,server_1,/home/file_1,22222222222\n")
-    content_data_a.remove_instance('server_1', '/home/file_1')
-    assert_equal(content_data_merged.to_s, "2\nB1,60,44444444444\nA1,50,22222222222\n3\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\nA1,50,server_1,/home/file_1,22222222222\n")
-    content_data_b.remove_instance('server_1', '/home/file_2')
-    assert_equal(content_data_merged.to_s, "2\nB1,60,44444444444\nA1,50,22222222222\n3\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\nA1,50,server_1,/home/file_1,22222222222\n")
-
-  end
-
-  def test_merge_override_b
-    content_data_a = ContentData::ContentData.new
-    content_data_a.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-
-    content_data_b = ContentData::ContentData.new
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_2", 44444444444)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_3", 55555555555)
-    content_data_merged = ContentData.merge_override_b(content_data_a, content_data_b)
-    assert_equal("2\nA1,50,22222222222\nB1,60,44444444444\n3\nA1,50,server_1,/home/file_1,22222222222\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n",
-                 content_data_merged.to_s)
-
-    content_data_a.remove_instance('server_1', '/home/file_1')
-    assert_equal("2\nA1,50,22222222222\nB1,60,44444444444\n3\nA1,50,server_1,/home/file_1,22222222222\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n",
-                 content_data_merged.to_s)
-    content_data_b.remove_instance('server_1', '/home/file_2')
-    assert_equal("2\nA1,50,22222222222\nB1,60,44444444444\n2\nA1,50,server_1,/home/file_1,22222222222\nB1,60,server_1,/home/file_3,55555555555\n",
-                 content_data_b.to_s)
-
-    assert_equal(true, content_data_merged == content_data_b)
-  end
-
-  def test_remove
-    content_data_a = ContentData::ContentData.new
-    content_data_a.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-
-    content_data_b = ContentData::ContentData.new
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "extra_inst", 66666666666)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_2", 44444444444)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_3", 55555555555)
-    content_data_removed = ContentData.remove(content_data_a, content_data_b)
-    assert_equal(content_data_removed.to_s, "1\nB1,60,44444444444\n2\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n")
-    content_data_a.remove_instance('server_1', '/home/file_1')
-    assert_equal(content_data_removed.to_s, "1\nB1,60,44444444444\n2\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n")
-    content_data_b.remove_instance('server_1', '/home/file_2')
-    assert_equal(content_data_removed.to_s, "1\nB1,60,44444444444\n2\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n")
-
-    #check nil
-    content_data_removed = ContentData.remove(nil, content_data_b)
-    assert_equal(content_data_removed.to_s, content_data_b.to_s)
-    content_data_removed = ContentData.remove(content_data_b, nil)
-    assert_equal(content_data_removed, nil)
-  end
-
-  def test_remove_instances
-    content_data_a = ContentData::ContentData.new
-    content_data_a.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-
-    content_data_b = ContentData::ContentData.new
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "extra_inst", 66666666666)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_2", 44444444444)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_3", 55555555555)
-    content_data_removed = ContentData.remove_instances(content_data_a, content_data_b)
-    assert_equal(content_data_removed.to_s,"2\nA1,50,22222222222\nB1,60,44444444444\n3\nA1,50,server_1,extra_inst,66666666666\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n")
-    content_data_a.remove_instance('server_1', '/home/file_1')
-    assert_equal(content_data_removed.to_s,"2\nA1,50,22222222222\nB1,60,44444444444\n3\nA1,50,server_1,extra_inst,66666666666\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n")
-    content_data_b.remove_instance('server_1', '/home/file_2')
-    assert_equal(content_data_removed.to_s,"2\nA1,50,22222222222\nB1,60,44444444444\n3\nA1,50,server_1,extra_inst,66666666666\nB1,60,server_1,/home/file_2,44444444444\nB1,60,server_1,/home/file_3,55555555555\n")
-
-    #assert_equal(content_data_b, nil)
-
-    #check nil
-    content_data_removed = ContentData.remove_instances(nil, content_data_b)
-    assert_equal(content_data_removed.to_s, content_data_b.to_s)
-    content_data_removed = ContentData.remove_instances(content_data_b, nil)
-    assert_equal(content_data_removed, nil)
-  end
-
-  def test_remove_directory
-
-    content_data_b = ContentData::ContentData.new
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "extra_inst", 66666666666)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_2", 44444444444)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_3", 55555555555)
-    content_data_removed = ContentData.remove_directory(content_data_b, 'home', "server_1")
-    assert_equal("1\nA1,50,22222222222\n1\nA1,50,server_1,extra_inst,66666666666\n",
-                 content_data_removed.to_s)
-
-    content_data_b.remove_instance('server_1', '/home/file_2')
-    assert_equal("1\nA1,50,22222222222\n1\nA1,50,server_1,extra_inst,66666666666\n",
-                 content_data_removed.to_s)
-
-    assert_equal("2\nA1,50,22222222222\nB1,60,44444444444\n3\nA1,50,server_1,/home/file_1,22222222222\nA1,50,server_1,extra_inst,66666666666\nB1,60,server_1,/home/file_3,55555555555\n",
-                 content_data_b.to_s)
-
-    content_data_b = ContentData::ContentData.new
-    content_data_removed = ContentData.remove_directory(content_data_b, 'home', "server_1")
-    assert_equal(0, content_data_removed.contents_size)
-    content_data_removed = ContentData.remove_directory(nil, 'home', "server_1")
-    assert_equal(content_data_removed, nil)
-  end
-
-  def test_intersect
-    content_data_a = ContentData::ContentData.new
-    content_data_a.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_a.add_instance("C1", 70, "server_1",
-                                "/home/file_4", 77777777777)
-    content_data_b = ContentData::ContentData.new
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_b.add_instance("A1", 50, "server_1",
-                                "/home/file_5", 55555555555)
-    content_data_b.add_instance("B1", 60, "server_1",
-                                "/home/file_2", 44444444444)
-
-    content_data_intersect = ContentData.intersect(content_data_a, content_data_b)
-    assert_equal(content_data_intersect.to_s, "1\nA1,50,22222222222\n2\nA1,50,server_1,/home/file_1,22222222222\nA1,50,server_1,/home/file_5,55555555555\n")
-  end
-
-  def test_unify_time
-    content_data_a = ContentData::ContentData.new
-    content_data_a.add_instance("A1", 50, "server_1",
-                                "/home/file_1", 22222222222)
-    content_data_a.add_instance("C1", 70, "server_1",
-                                "/home/file_4", 77777777777)
-    content_data_a.add_instance("C1", 70, "server_1",
-                                "/home/file_5", 33333333333)
-    content_data_a.unify_time
-    assert_equal(content_data_a.to_s, "2\nA1,50,22222222222\nC1,70,33333333333\n3\nA1,50,server_1,/home/file_1,22222222222\nC1,70,server_1,/home/file_4,33333333333\nC1,70,server_1,/home/file_5,33333333333\n")
-  end
-end
-
-