beats 1.2.0 → 1.2.1

data/test/fixtures/invalid/bad_repeat_count.txt

@@ -1,7 +1,7 @@
 # Invalid song, since the number of repeats for pattern Verse is not a number
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse:  x2a
 
 Verse:

data/test/fixtures/invalid/bad_rhythm.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse: x1
 
 Verse:

data/test/fixtures/invalid/bad_tempo.txt

@@ -1,7 +1,7 @@
 # Invalid song, since the tempo is not a number
 Song:
   Tempo: 100a
-  Structure:
+  Flow:
     - Verse:  x2
 
 Verse:

data/test/fixtures/invalid/{no_structure.txt → no_flow.txt}

@@ -1,4 +1,4 @@
-# Invalid song, since it doesn't have a structure section in the header
+# Invalid song, since it doesn't have a Flow section in the header
 Song:
   Tempo: 100
 

data/test/fixtures/invalid/pattern_with_no_tracks.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse: x1
     - Chorus: x1
 

data/test/fixtures/invalid/sound_in_kit_not_found.txt

@@ -1,7 +1,7 @@
 # Invalid song, since the Kit references a non-existent sound
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse: x1
   Kit:
     - bad: test/sounds/i_do_not_exist.wav

data/test/fixtures/invalid/sound_in_kit_wrong_format.txt

@@ -0,0 +1,10 @@
+# Invalid song, since the Kit references a sound that is not a valid *.wav file.
+Song:
+  Tempo: 100
+  Flow:
+    - Verse: x1
+  Kit:
+    - bad: test/songparser_test.rb
+
+Verse:
+  - bad: X...X...

data/test/fixtures/invalid/sound_in_track_not_found.txt

@@ -1,7 +1,7 @@
 # Invalid song, since a track references a non-existent sound
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse: x1
 
 Verse:

data/test/fixtures/invalid/sound_in_track_wrong_format.txt

@@ -0,0 +1,8 @@
+# Invalid song, since a track references a sound that is not a valid *.wav file.
+Song:
+  Tempo: 100
+  Flow:
+    - Verse: x1
+
+Verse:
+  - test/songparser_test.rb: X...X...

data/test/fixtures/invalid/template.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 120
-  Structure:
+  Flow:
     - Verse:   x2
     - Chorus:  x4
     - Verse:   x2

data/test/fixtures/valid/example_mono_16.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 120
-  Structure:
+  Flow:
     - Verse:   x2
     - Chorus:  x4
     - Verse:   x2
@@ -16,13 +16,15 @@ Song:
 Verse:
   - bass:       X...X...X...X...
   - snare:      ..............X.
-  - hh_closed:  X.XXX.XXX.X.X.X.
+  - hh_closed:  X.XXX.XX........
+  - hh_closed:  ........X.X.X.X.
   - agogo:      ..............XX
 
 # Also including non-Kit sounds to test that they work as well:
 Chorus:
   - bass:                           X...X...XX..X...
   - snare:                          ....X.......X...
-  - hh_closed:                      X.XXX.XXX.XX..X.
+  - hh_closed:                      X.XXX.XX........
+  - hh_closed:                      ........X.XX..X.
   - ../../sounds/tom4_mono_16.wav:  ...........X....
   - ../../sounds/tom2_mono_16.wav:  ..............X.

data/test/fixtures/valid/example_mono_8.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 120
-  Structure:
+  Flow:
     - Verse:   x2
     - Chorus:  x4
     - Verse:   x2
@@ -16,13 +16,15 @@ Song:
 Verse:
   - bass:       X...X...X...X...
   - snare:      ..............X.
-  - hh_closed:  X.XXX.XXX.X.X.X.
+  - hh_closed:  X.XXX.XX........
+  - hh_closed:  ........X.X.X.X.
   - agogo:      ..............XX
 
 # Also including non-Kit sounds to test that they work as well:
 Chorus:
   - bass:                          X...X...XX..X...
   - snare:                         ....X.......X...
-  - hh_closed:                     X.XXX.XXX.XX..X.
+  - hh_closed:                     X.XXX.XX........
+  - hh_closed:                     ........X.XX..X.
   - ../../sounds/tom4_mono_8.wav:  ...........X....
   - ../../sounds/tom2_mono_8.wav:  ..............X.

data/test/fixtures/valid/example_no_kit.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 99
-  Structure:
+  Flow:
     - Verse:     x2
     - Chorus:    x2
     - Verse:     x2

data/test/fixtures/valid/example_stereo_16.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 120
-  Structure:
+  Flow:
     - Verse:   x2
     - Chorus:  x4
     - Verse:   x2
@@ -16,13 +16,16 @@ Song:
 Verse:
   - bass:       X...X...X...X...
   - snare:      ..............X.
-  - hh_closed:  X.XXX.XXX.X.X.X.
+  - hh_closed:  X.XXX.XX........
+  - hh_closed:  ........X.X.X.X.
   - agogo:      ..............XX
 
 # Also including non-Kit sounds to test that they work as well:
 Chorus:
   - bass:                             X...X...XX..X...
   - snare:                            ....X.......X...
-  - hh_closed:                        X.XXX.XXX.XX..X.
+  - hh_closed:                        X.XXX.XX........
+  - hh_closed:                        ........X.XX..X.
   - ../../sounds/tom4_stereo_16.wav:  ...........X....
-  - ../../sounds/tom2_stereo_16.wav:  ..............X.
+  - ../../sounds/tom2_stereo_16.wav:  ..............X.
+  

data/test/fixtures/valid/example_stereo_8.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 120
-  Structure:
+  Flow:
     - Verse:   x2
     - Chorus:  x4
     - Verse:   x2
@@ -16,13 +16,15 @@ Song:
 Verse:
   - bass:       X...X...X...X...
   - snare:      ..............X.
-  - hh_closed:  X.XXX.XXX.X.X.X.
+  - hh_closed:  X.XXX.XX........
+  - hh_closed:  ........X.X.X.X.
   - agogo:      ..............XX
 
 # Also including non-Kit sounds to test that they work as well:
 Chorus:
   - bass:                            X...X...XX..X...
   - snare:                           ....X.......X...
-  - hh_closed:                       X.XXX.XXX.XX..X.
+  - hh_closed:                       X.XXX.XX........
+  - hh_closed:                       ........X.XX..X.
   - ../../sounds/tom4_stereo_8.wav:  ...........X....
   - ../../sounds/tom2_stereo_8.wav:  ..............X.

data/test/fixtures/valid/example_with_empty_track.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 99
-  Structure:
+  Flow:
     - Verse:     x1
 
 Verse:

data/test/fixtures/valid/example_with_kit.txt

@@ -7,7 +7,7 @@ Song:
     - snare:    test/sounds/snare_mono_8.wav
     - hhclosed: test/sounds/hh_closed_mono_8.wav
     - hhopen:   test/sounds/hh_open_mono_8.wav
-  Structure:
+  Flow:
     - Verse:  x2
     - Chorus: x2
     - Verse:  x2

data/test/fixtures/valid/multiple_tracks_same_sound.txt

@@ -0,0 +1,33 @@
+# A song in which a pattern has multiple tracks that use the same sound
+# The output should be the same as example_mono_16.txt
+# TODO: Add integration tests to verify correct output
+
+Song:
+  Tempo: 120
+  Flow:
+    - Verse:   x2
+    - Chorus:  x4
+    - Verse:   x2
+    - Chorus:  x4
+  Kit:
+    - bass:       test/sounds/bass_mono_16.wav
+    - snare:      test/sounds/snare_mono_16.wav
+    - hh_closed:  test/sounds/hh_closed_mono_16.wav
+    - agogo:      test/sounds/agogo_high_mono_16.wav
+
+Verse:
+  - bass:       X...............
+  - bass:       ....X...........
+  - bass:       ........X.......
+  - bass:       ............X...
+  - snare:      ..............X.
+  - hh_closed:  X.XXX.XXX.X.X.X.
+  - agogo:      ..............XX
+
+# Also including non-Kit sounds to test that they work as well:
+Chorus:
+  - bass:                     X...X...XX..X...
+  - snare:                    ....X.......X...
+  - hh_closed:                X.XXX.XXX.XX..X.
+  - test/sounds/tom4_mono_16.wav:  ...........X....
+  - test/sounds/tom2_mono_16.wav:  ..............X.

data/test/fixtures/valid/no_tempo.txt

@@ -1,7 +1,7 @@
 # Valid song file, despite not having a tempo. Tempo will be set to a default value.
 
 Song:
-  Structure:
+  Flow:
     - Verse: x1
 
 Verse:

data/test/fixtures/valid/optimize_pattern_collision.txt

@@ -0,0 +1,28 @@
+# Test fixture to verify SongOptimizer bug fix.
+#
+# SongOptimizer.subdivide_song_patterns() breaks up patterns into smaller sub-patterns. The bug
+# was that when master patterns had numeric suffixes, new sub-patterns could be given names that
+# collided with other sub-patterns. If they had different rhythms, one sub-pattern would obliterate
+# the other one leading to incorrect song output.
+#
+# In the example below, when sub-dividing patterns with a max size of 4 steps, the new patterns
+# highlighted with !!!! would both be called Verse20, causing a collision. 
+
+
+Song:
+  Flow:
+    - Verse
+    - Verse2
+
+
+Verse:
+#                                 0    4    8    12   16   20
+#                                                          !!!!
+  - test/sounds/bass_mono_8.wav: |X...|X...|X...|X...|X...|X.XX|
+
+
+Verse2:                       
+#                                 0    4    8    12   16   20
+#                                 !!!!
+  - test/sounds/bass_mono_8.wav: |X..X|X..X|X..X|X..X|X..X|X..X|
+

data/test/fixtures/valid/pattern_with_overflow.txt

@@ -2,7 +2,7 @@
 
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse: x2
 
 Verse:

data/test/fixtures/valid/repeats_not_specified.txt

@@ -1,9 +1,9 @@
-# The pattern Verse in the structure doesn't specify how many times it should repeat.
+# The pattern Verse in the flow doesn't specify how many times it should repeat.
 # This is valid, it causes it to default to 1 repeat.
 
 Song:
   Tempo: 100
-  Structure:
+  Flow:
     - Verse
 
 Verse:

data/test/fixtures/valid/with_structure.txt

@@ -0,0 +1,10 @@
+# Header contains a "Structure" section instead of a "Flow" section.
+# This is valid for now, but is deprecated.
+
+Song:
+  Tempo: 100
+  Structure:
+    - Verse: x2
+
+Verse:
+  - test/sounds/bass_mono_8.wav: X...X...

data/test/fixtures/yaml/song_yaml.txt

@@ -1,6 +1,6 @@
 Song:
   Tempo: 99
-  Structure:
+  Flow:
     - Verse:   x2
     - Chorus:  x2
     - Verse:   x2
@@ -8,10 +8,10 @@ Song:
     - Bridge:  x1
     - Chorus:  x4
   Kit:
-    - bass:      test/sounds/bass_mono_8.wav
-    - hhclosed:  test/sounds/hh_closed_mono_8.wav
-    - hhopen:    test/sounds/hh_open_mono_8.wav
-    - snare:     test/sounds/snare_mono_8.wav
+    - bass:      bass_mono_8.wav
+    - hhclosed:  hh_closed_mono_8.wav
+    - hhopen:    hh_open_mono_8.wav
+    - snare:     snare_mono_8.wav
 
 Bridge:
   - hhclosed:  XX.XXX.XXX.XXX.XXX.XXX.XXX.XXX.X

data/test/includes.rb

@@ -5,12 +5,14 @@ require 'rubygems'
 require 'wavefile'
 
 # BEATS classes
+require 'audioengine'
+require 'audioutils'
 require 'beats'
 require 'kit'
 require 'pattern'
+require 'patternexpander'
 require 'song'
 require 'songparser'
 require 'songoptimizer'
-require 'songsplitter'
 require 'track'
-require 'beatswavefile'
+require 'beatswavefile'

data/test/integration.rb

@@ -3,15 +3,15 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 require 'test/includes'
 
 class SongParserTest < Test::Unit::TestCase
-  TRACK_NAMES =  ["bass", "snare", "hh_closed", "agogo", "tom4", "tom2"]
+  TRACK_NAMES =  ["bass", "snare", "hh_closed", "hh_closed2", "agogo", "tom4", "tom2"]
   OUTPUT_FOLDER = "test/integration_output"
   
   def test_bad_song_errors
     invalid_fixtures = ["bad_tempo.txt",
                         "bad_repeat_count.txt",
-                        "bad_structure.txt",
+                        "bad_flow.txt",
                         "no_header.txt",
-                        "no_structure.txt",
+                        "no_flow.txt",
                         "sound_in_kit_not_found.txt",
                         "sound_in_track_not_found.txt"]
         

data/test/kit_test.rb

@@ -2,125 +2,152 @@ $:.unshift File.join(File.dirname(__FILE__),'..','lib')
 
 require 'test/includes'
 
-class SongTest < Test::Unit::TestCase
+# Kit which allows directly changing the sound bank after initialization, to allows tests
+# to use fixture data directly in the test instead of loading it from the file system.
+class MutableKit < Kit
+  attr_accessor :sound_bank
+end
+
+class KitTest < Test::Unit::TestCase
   MIN_SAMPLE_8BIT = 0
   MAX_SAMPLE_8BIT = 255
   
-  def test_valid_add
-    # Test adding sounds with progressively higher bits per sample and num channels.
-    # Verify that kit.bits_per_sample and kit.num_channels is ratcheted up.
-    kit = Kit.new("test/sounds")
-    assert_equal(16,  kit.bits_per_sample)
-    assert_equal(1,  kit.num_channels)
-    assert_equal(0,  kit.size)
-    kit.add("mono8", "bass_mono_8.wav")
-    assert_equal(16,  kit.bits_per_sample)
-    assert_equal(1,  kit.num_channels)
-    assert_equal(1,  kit.size)
-    kit.add("mono16", "bass_mono_16.wav")
-    assert_equal(16, kit.bits_per_sample)
-    assert_equal(1,  kit.num_channels)
-    assert_equal(2,  kit.size)
-    kit.add("stereo16", "bass_stereo_16.wav")
-    assert_equal(16, kit.bits_per_sample)
-    assert_equal(2,  kit.num_channels)
-    assert_equal(3,  kit.size)
-    
-    # Test adding sounds with progressively lower bits per sample and num channels.
-    # Verify that kit.bits_per_sample and kit.num_channels doesn't change.
-    kit = Kit.new("test/sounds")
-    assert_equal(16,  kit.bits_per_sample)
-    assert_equal(1,  kit.num_channels)
-    kit.add("stereo16", "bass_stereo_16.wav")
-    assert_equal(16, kit.bits_per_sample)
-    assert_equal(2,  kit.num_channels)
-    kit.add("mono16", "bass_mono_16.wav")
-    assert_equal(16, kit.bits_per_sample)
-    assert_equal(2,  kit.num_channels)
-    kit.add("mono8", "bass_mono_8.wav")
-    assert_equal(16, kit.bits_per_sample)
-    assert_equal(2,  kit.num_channels)
+  def generate_test_data
+    kits = {}
+    
+    # Kit with no sounds
+    kits[:empty] = Kit.new("test/sounds", {})
+
+    # Kits which only has simple sounds
+    kits[:mono8]    = Kit.new("test/sounds", {"mono8" => "bass_mono_8.wav"})
+    kits[:mono16]   = Kit.new("test/sounds", {"mono8"  => "bass_mono_8.wav",
+                                              "mono16" => "bass_mono_16.wav"})
+    kits[:stereo8]  = Kit.new("test/sounds", {"mono8"   => "bass_mono_8.wav",
+                                              "stereo8" => "bass_stereo_8.wav"})
+    kits[:stereo16] = Kit.new("test/sounds", {"mono8"    => "bass_mono_8.wav",
+                                              "mono16"   => "bass_mono_16.wav",
+                                              "stereo16" => "bass_stereo_16.wav"})
+    
+    # Kits which contain a composite sound
+    #kits[:basic_composite] = Kit.new("test/sounds", {"mono8"  => "bass_mono_8.wav",
+    #                                                 "composite_mono8" => ["snare_mono_8.wav", "tom3_mono_8.wav"]})
+    #kits[:mismatched_bps_composite] = Kit.new("test/sounds", {"mono8"  => "bass_mono_8.wav",
+    #                                                          "composite_mono16" => ["snare_mono_8.wav", "tom3_mono_16.wav"]})
+    #kits[:mismatched_channels_composite] = Kit.new("test/sounds", {"mono8"  => "bass_mono_8.wav",
+    #                                                               "composite_stereo16" => ["snare_stereo_16.wav", "tom3_mono_16.wav"]})
+    #kits[:mismatched_everything_composite] = Kit.new("test/sounds", {"mono8"  => "bass_mono_8.wav",
+    #                                                                 "composite_stereo16" => ["snare_stereo_8.wav", "tom3_mono_16.wav"]})
+  
+    return kits
   end
   
-  def test_invalid_add
-    kit = Kit.new("test/sounds")
-    assert_raise(SoundNotFoundError) { kit.add("i_do_not_exist", "i_do_not_exist.wav") }
+  def test_valid_initialization
+    kits = generate_test_data()
+   
+    assert_equal(16, kits[:empty].bits_per_sample)
+    assert_equal(1, kits[:empty].num_channels)
+    
+    assert_equal(16, kits[:mono8].bits_per_sample)
+    assert_equal(1, kits[:mono8].num_channels)
+    
+    assert_equal(16, kits[:mono16].bits_per_sample)
+    assert_equal(1, kits[:mono16].num_channels)
+    
+    assert_equal(16, kits[:stereo8].bits_per_sample)
+    assert_equal(2, kits[:stereo8].num_channels)
+    
+    assert_equal(16, kits[:stereo16].bits_per_sample)
+    assert_equal(2, kits[:stereo16].num_channels)
+    
+    #assert_equal(16, kits[:basic_composite].bits_per_sample)
+    #assert_equal(1, kits[:basic_composite].num_channels)
+    
+    #assert_equal(16, kits[:mismatched_bps_composite].bits_per_sample)
+    #assert_equal(1, kits[:mismatched_bps_composite].num_channels)
+    
+    #assert_equal(16, kits[:mismatched_channels_composite].bits_per_sample)
+    #assert_equal(2, kits[:mismatched_channels_composite].num_channels)
+    
+    #assert_equal(16, kits[:mismatched_everything_composite].bits_per_sample)
+    #assert_equal(2, kits[:mismatched_everything_composite].num_channels)
   end
-
+  
+  def test_invalid_initialization
+    # Tests for adding non-existant sound file to Kit
+    assert_raise(SoundFileNotFoundError) { Kit.new("test/sounds", {"i_do_not_exist" => "i_do_not_exist.wav"}) }
+    
+    assert_raise(SoundFileNotFoundError) { Kit.new("test/sounds", {"mono16" => "bass_mono_16.wav",
+                                                                   "i_do_not_exist" => "i_do_not_exist.wav"}) }
+    
+    #assert_raise(SoundFileNotFoundError) { Kit.new("test/sounds", {"mono16" => "bass_mono_16.wav",
+    #                                                               "composite" => ["bass_mono_16.wav", "snare_mono_16.wav"],
+    #                                                               "i_do_not_exist" => "i_do_not_exist.wav"}) }
+    
+    # Tests for adding invalid sound files to Kit
+    assert_raise(InvalidSoundFormatError) { Kit.new("test", {"bad" => "kit_test.rb"}) }
+    
+    assert_raise(InvalidSoundFormatError) { Kit.new("test", {"mono16" => "sounds/bass_mono_16.wav",
+                                                             "bad" => "kit_test.rb"}) }
+    
+    #assert_raise(InvalidSoundFormatError) { Kit.new("test", {"mono16" => "sounds/bass_mono_16.wav",
+    #                                                         "composite" => ["sounds/bass_mono_16.wav", "sounds/snare_mono_16.wav"],
+    #                                                         "bad" => "kit_test.rb"}) }
+  end
+  
   def test_get_sample_data
-    kit = Kit.new("test/sounds")
-    
-    assert_raise(StandardError) { kit.get_sample_data("nonexistant") }
-    
-    # Test adding sounds with progressively higher bits per sample and num channels.
-    # Verify that sample data bits per sample and num channels is ratcheted up.
-    kit.add("mono8", "bass_mono_8.wav")
-    sample_data = kit.get_sample_data("mono8")
-    assert(sample_data.max > MAX_SAMPLE_8BIT)
-    assert(sample_data.min < 0)
-    all_are_fixnums = true
-    sample_data.each do |sample|
-      all_are_fixnums &&= sample.class == Fixnum
-    end
-    assert(all_are_fixnums)
-    
-    kit.add("mono16", "bass_mono_16.wav")
-    sample_data = kit.get_sample_data("mono8")
-    assert(sample_data.max > MAX_SAMPLE_8BIT)
-    assert(sample_data.min < 0)
-    all_are_fixnums = true
-    sample_data.each do |sample|
-      all_are_fixnums &&= sample.class == Fixnum
+    kits = generate_test_data()
+    # Should get an error when trying to get a non-existent sound
+    assert_raise(StandardError) { kits[:mono8].get_sample_data("nonexistant") }
+  
+    [:mono8, :mono16].each do |kit_name|
+      sample_data = kits[kit_name].get_sample_data("mono8")
+      # Assert sample data is 16-bit. If max and min samples are outside 0-255 bounds, then it is.
+      assert(sample_data.max > MAX_SAMPLE_8BIT)
+      assert(sample_data.min < MIN_SAMPLE_8BIT)
+      # Assert it has 1 channel. This is true if every item is a Fixnum.
+      assert_equal([], sample_data.select {|sample| sample.class != Fixnum})
     end
-    assert(all_are_fixnums)
-    
-    kit.add("stereo16", "bass_stereo_16.wav")
-    sample_data = kit.get_sample_data("stereo16")
-    assert(sample_data.flatten.max > MAX_SAMPLE_8BIT)
-    assert(sample_data.flatten.min < 0)
-    all_are_arrays = true
-    sample_data.each do |sample|
-      all_are_arrays &&= sample.class == Array
+    
+    [:stereo8, :stereo16].each do |kit_name|
+      sample_data = kits[kit_name].get_sample_data("mono8")
+      # Assert sample data is 16-bit. If max and min samples are outside 0-255 bounds, then it is.
+      assert(sample_data.flatten.max > MAX_SAMPLE_8BIT)
+      assert(sample_data.flatten.min < MIN_SAMPLE_8BIT)
+      # Assert it has 2 channels. This is true if every item is an Array.
+      assert_equal([], sample_data.select {|sample| sample.class != Array})
     end
-    assert(all_are_arrays)
-    assert(sample_data.first.length == 2)
     
+    #actual_sample_data = kits[:basic_composite].get_sample_data("composite_mono8")
+    #expected_sample_data = WaveFile.open("test/sounds/composite_snare_mono_8_tom3_mono_8_mono_16.wav").sample_data
+    #assert_equal(expected_sample_data, actual_sample_data)
     
-    # Test adding sounds with progressively lower bits per sample and num channels.
-    # Verify that sample data bits per sample and num channels doesn't go down.
-    kit = Kit.new("test/sounds")
+    #actual_sample_data = kits[:mismatched_bps_composite].get_sample_data("composite_mono16")
+    #expected_sample_data = WaveFile.open("test/sounds/composite_snare_mono_8_tom3_mono_16_mono_16.wav").sample_data
+    #assert_equal(expected_sample_data, actual_sample_data)
     
-    kit.add("stereo16", "bass_stereo_16.wav")
-    sample_data = kit.get_sample_data("stereo16")
-    assert(sample_data.flatten.max > MAX_SAMPLE_8BIT)
-    assert(sample_data.flatten.min < 0)
-    all_are_arrays = true
-    sample_data.each do |sample|
-      all_are_arrays &&= sample.class == Array
-    end
-    assert(all_are_arrays)
-    assert(sample_data.first.length == 2)
-    
-    kit.add("mono16", "bass_mono_16.wav")
-    sample_data = kit.get_sample_data("mono16")
-    assert(sample_data.flatten.max > MAX_SAMPLE_8BIT)
-    assert(sample_data.flatten.min < 0)
-    all_are_arrays = true
-    sample_data.each do |sample|
-      all_are_arrays &&= sample.class == Array
-    end
-    assert(all_are_arrays)
-    assert(sample_data.first.length == 2)
-    
-    kit.add("mono8", "bass_mono_8.wav")
-    sample_data = kit.get_sample_data("mono8")
-    assert(sample_data.flatten.max > MAX_SAMPLE_8BIT)
-    assert(sample_data.flatten.min < 0)
-    all_are_arrays = true
-    sample_data.each do |sample|
-      all_are_arrays &&= sample.class == Array
-    end
-    assert(all_are_arrays)
-    assert(sample_data.first.length == 2)
+    #actual_sample_data = kits[:mismatched_channels_composite].get_sample_data("composite_stereo16")
+    #expected_sample_data = WaveFile.open("test/sounds/composite_snare_stereo_16_tom3_mono_16_stereo_16.wav").sample_data
+    #assert_equal(expected_sample_data, actual_sample_data)
+    
+    #actual_sample_data = kits[:mismatched_everything_composite].get_sample_data("composite_stereo16")
+    #expected_sample_data = WaveFile.open("test/sounds/composite_snare_stereo_8_tom3_mono_16_stereo_16.wav").sample_data
+    #assert_equal(expected_sample_data[0..10], actual_sample_data[0..10])
+  end
+
+  def test_scale!
+    sound_bank = {"a" => [-10, 0, 20], "b" => [], "c" => [12346, 9999]}
+
+    kit = MutableKit.new(".", {})
+    kit.sound_bank = sound_bank
+
+    kit.scale!(5)
+    assert_equal([-2, 0, 4], kit.get_sample_data("a"))
+    assert_equal([], kit.get_sample_data("b"))
+    assert_equal([2469, 1999], kit.get_sample_data("c"))
+
+    kit.scale!(2)
+    assert_equal([-1, 0, 2], kit.get_sample_data("a"))
+    assert_equal([], kit.get_sample_data("b"))
+    assert_equal([1234, 999], kit.get_sample_data("c"))
   end
-end
+end