From 9943abdaf45c7c2e7239a2cbdc90483508d00a1d Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Fri, 3 Nov 2017 09:28:31 +0100 Subject: [PATCH] #793 tests --- app/models/dmsf_file_revision.rb | 2 +- test/unit/dmsf_file_revision_test.rb | 39 ++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb index f14c02df..755f791c 100644 --- a/app/models/dmsf_file_revision.rb +++ b/app/models/dmsf_file_revision.rb @@ -239,7 +239,7 @@ class DmsfFileRevision < ActiveRecord::Base when 1 DmsfUploadHelper.increase_version(self.minor_version, 1) when 2 - 0 + (self.major_version < 0) ? -(' '.ord) : 0 else self.minor_version end diff --git a/test/unit/dmsf_file_revision_test.rb b/test/unit/dmsf_file_revision_test.rb index 550cc275..71c2b4f1 100644 --- a/test/unit/dmsf_file_revision_test.rb +++ b/test/unit/dmsf_file_revision_test.rb @@ -171,4 +171,43 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest assert_equal 'A.0', @revision1.version end + def test_increase_version + # 1.0 -> 1.1 + @revision1.major_version = 1 + @revision1.minor_version = 0 + @revision1.increase_version(1) + assert_equal 1, @revision1.major_version + assert_equal 1, @revision1.minor_version + # 1.0 -> 2.0 + @revision1.major_version = 1 + @revision1.minor_version = 0 + @revision1.increase_version(2) + assert_equal 2, @revision1.major_version + assert_equal 0, @revision1.minor_version + # 1.1 -> 2.0 + @revision1.major_version = 1 + @revision1.minor_version = 1 + @revision1.increase_version(2) + assert_equal 2, @revision1.major_version + assert_equal 0, @revision1.minor_version + # A -> A.1 + @revision1.major_version = -('A'.ord) + @revision1.minor_version = -(' '.ord) + @revision1.increase_version(1) + assert_equal -('A'.ord), @revision1.major_version + assert_equal 1, @revision1.minor_version + # A -> B + @revision1.major_version = -('A'.ord) + @revision1.minor_version = -(' '.ord) + @revision1.increase_version(2) + assert_equal -('B'.ord), @revision1.major_version + assert_equal -(' '.ord), @revision1.minor_version + # A.1 -> B + @revision1.major_version = -('A'.ord) + @revision1.minor_version = 1 + @revision1.increase_version(2) + assert_equal -('B'.ord), @revision1.major_version + assert_equal -(' '.ord), @revision1.minor_version + end + end \ No newline at end of file