Merge branch 'WORDSCLOUD-911' into 'master'

range and WNP tests

See merge request words-cloud/words-cloud-ruby!1

Author: YaroslawEkimov

.gitignore

@@ -113,3 +113,5 @@ hs_err_pid*
 .idea/*
 vendor/*
 testReports/*
+Gemfile.lock
+servercreds.json

Jenkinsfile

@@ -9,7 +9,7 @@ def runtests(dockerImageVersion)
         try {
             stage('checkout'){
 				checkout([$class: 'GitSCM', branches: [[name: params.branch]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'LocalBranch', localBranch: "**"]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: '361885ba-9425-4230-950e-0af201d90547', url: 'https://git.auckland.dynabic.com/words-cloud/words-cloud-ruby.git']]])
-                withCredentials([usernamePassword(credentialsId: '361885ba-9425-4230-950e-0af201d90547', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
+                withCredentials([usernamePassword(credentialsId: '6839cbe8-39fa-40c0-86ce-90706f0bae5d', passwordVariable: 'AppKey', usernameVariable: 'AppSid')]) {
 					sh 'mkdir -p Settings'
                     sh 'echo "{\\"AppSid\\": \\"$AppSid\\",\\"AppKey\\": \\"$AppKey\\", \\"BaseUrl\\": \\"${testServerUrl}\\"}" > Settings/servercreds.json'
                 }

Settings/servercreds.json

@@ -1,7 +1,7 @@
 #
 # --------------------------------------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="api_coverage_tests.rb">
-#   Copyright (c) 2018 Aspose.Words for Cloud
+#   Copyright (c) 2019 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -35,12 +35,14 @@ def test_api_coverage
       require_all '../Common'
       require_all '../DocumentActions'
       require_all '../DocumentElements'
+      require_all '../Storage'
+      require_all '../Range'
       arr = [BookmarksTests, AppendDocumentTests, CommentsTests, CompareDocumentTests, ConvertDocumentTests,
               DocumentStatisticsTests, DocumentTests, LoadWebDocumentTests, RevisionsTests,
               SplitDocumentTests, DocumentPropertiesTests, DocumentProtectionTests, DrawingObjectsTests, FieldsTests,
               FormFieldTests, MailMergeFieldsTests, FootnoteTests, HeaderFootersTests, HyperlinksTests, MacrosTests,
-              ExecuteMailMergeTests, ExecuteTemplateTests, MathObjectsTests, PagesTests, ParagraphsTests, RunsTests,
-              SectionsTests, TablesTests, TextTests, WatermarkTests, FontCacheTests, ClassificationTests]
+              ExecuteMailMergeTests, MathObjectsTests, PagesTests, ParagraphsTests, RunsTests,
+              SectionsTests, TablesTests, TextTests, WatermarkTests, FontCacheTests, ClassificationTests, FileTests, FolderTests, RangeTests]
       test_methods = []
       arr.each {|el| (test_methods << el.instance_methods(false).select{ |m| /test_folder/ !~ m}).flatten! }
       methods = @words_api.public_methods(false).select {|m| /api_client/ !~ m }.map {|m| m.to_s}

TestData/DocumentElements/Range/RangeGet.doc

@@ -1,7 +1,7 @@
 #
 # --------------------------------------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="error_handling_tests.rb">
-#   Copyright (c) 2018 Aspose.Words for Cloud
+#   Copyright (c) 2019 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -37,9 +37,10 @@ def test_handle_server_errors
       begin
         @words_api.get_section request
         assert_throws 'FAILED'
+      rescue ApiError => e
+        assert_equal 404, e.code
+      rescue
       end
-    rescue ApiError => e
-      assert_equal 400, e.code
     end
   end
 end

tests/Common/api_coverage_tests.rb

@@ -1,7 +1,7 @@
 #
 # --------------------------------------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="reset_cache_tests.rb">
-#   Copyright (c) 2018 Aspose.Words for Cloud
+#   Copyright (c) 2019 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -34,7 +34,6 @@ class FontCacheTests < BaseTestContext
     def test_reset_cache
       request = ResetCacheRequest.new
       result = @words_api.reset_cache request
-      assert_equal 200, result.code
     end
 
     #
@@ -43,7 +42,7 @@ def test_reset_cache
     def test_get_available_fonts
       request = GetAvailableFontsRequest.new
       result = @words_api.get_available_fonts request
-      assert_equal 200, result.code
+      assert_equal FALSE, result.nil?
     end
   end
 end

tests/Common/error_handling_tests.rb

@@ -0,0 +1,53 @@
+#
+# --------------------------------------------------------------------------------------------------------------------
+# <copyright company="Aspose" file="missing_credentials_tests.rb">
+#   Copyright (c) 2019 Aspose.Words for Cloud
+# </copyright>
+# <summary>
+#   Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in all
+#  copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+# </summary>
+# --------------------------------------------------------------------------------------------------------------------
+#
+module AsposeWordsCloud
+    require_relative '../base_test_context'
+    class MissingCredentialsTests < BaseTestContext
+        alias :super_setup :setup
+        def setup
+            File.rename('Settings/servercreds.json', 'Settings/servercreds1.json');
+        end
+
+        def teardown
+            File.rename('Settings/servercreds1.json', 'Settings/servercreds.json');
+        end
+
+        #
+        # Test for base class throwing exception if credentials file is missing
+        def test_missing_credentials
+            begin
+                super_setup()
+                assert_throws 'FAILED'
+            rescue ArgumentError => e
+                puts e.inspect
+            else 
+                assert_throws 'FAILED'
+            end
+        end
+    end
+  end
+  

tests/Common/font_cache_tests.rb

@@ -0,0 +1,43 @@
+#
+# --------------------------------------------------------------------------------------------------------------------
+# <copyright company="Aspose" file="token_expires_tests.rb">
+#   Copyright (c) 2019 Aspose.Words for Cloud
+# </copyright>
+# <summary>
+#   Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in all
+#  copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+#  SOFTWARE.
+# </summary>
+# --------------------------------------------------------------------------------------------------------------------
+#
+module AsposeWordsCloud
+    require_relative '../base_test_context'
+    class TokenExpiresTests < BaseTestContext
+
+      #
+      # Test for client automatically updates token if expired
+      #
+      def test_token_expires
+        @words_api.api_client.config.access_token = 'eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJuYmYiOjE1Njc1ODg2OTksImV4cCI6MTU2NzY3NTA5OSwiaXNzIjoiaHR0cHM6Ly9hcGktcWEuYXNwb3NlLmNsb3VkIiwiYXVkIjpbImh0dHBzOi8vYXBpLXFhLmFzcG9zZS5jbG91ZC9yZXNvdXJjZXMiLCJhcGkucGxhdGZvcm0iLCJhcGkucHJvZHVjdHMiXSwiY2xpZW50X2lkIjoiNzhCNjM3RjYtQjRDQy00MURFLUE2MTktRDhCRDlGQzJCNkI2IiwiY2xpZW50X2lkU3J2SWQiOiIiLCJzY29wZSI6WyJhcGkucGxhdGZvcm0iLCJhcGkucHJvZHVjdHMiXX0.NcsvIWr8zpHIGKTtVQIevRUJchTc2NqwgjNIVg3J9uXowr6lbsLgV6v4KsVlR6yssjkfjZEsRNOExaxdga7Mrv6RvXhgZDs5-_6HrtMdIHUe_1F5kbS5Cz1evyOeQhfdeRnZWHR-BZOAzyB__1gXBo2MObPF3NIt6j6vPWbHU9DSLrjEWPCULVdmLtl6-NDYHvNR4AbiaH-qfU8j1bMLdBfyzK2uX376EpbinSZHeNeFp4dOOhAOpDR-p_kCt4O4z5Tjrcuyw9PrCBmyHWwMSa-8g95Jy-_d89VAZvS1xEFHNX_hZilEPseGPUzDMwg_oOIBfIVcRS3NxqWvEWof7A';
+        request = ClassifyRequest.new "Try text classification", "3"
+        result = @words_api.classify request
+      
+        assert_equal false, result.nil?
+      end
+    end
+  end
+  

tests/Common/missing_credentials_tests.rb

@@ -1,7 +1,7 @@
 #
 # --------------------------------------------------------------------------------------------------------------------
 # <copyright company="Aspose" file="document_tests.rb">
-#   Copyright (c) 2018 Aspose.Words for Cloud
+#   Copyright (c) 2019 Aspose.Words for Cloud
 # </copyright>
 # <summary>
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -37,28 +37,26 @@ def test_folder
     def test_get_document
       filename = 'test_multi_pages.docx'
       remote_name = 'TestGetDocument.docx'
+      remote_path = File.join(test_folder, remote_name)
+      upload_file File.join(local_common_folder, filename), remote_path
 
-      st_request = PutCreateRequest.new remote_test_folder + test_folder + '/' + remote_name, File.open(local_common_folder + filename, "r").read
-      @storage_api.put_create st_request
-
-      request = GetDocumentRequest.new remote_name, remote_test_folder + test_folder
+      request = GetDocumentRequest.new remote_name, test_folder
       result = @words_api.get_document request
-      assert_equal 200, result.code
+      assert_equal false, result.document.nil?
     end
 
     #
     # Test for creating document
     #
-    def test_put_create_document
+    def test_create_document
       filename = 'test_multi_pages.docx'
-      remote_name = 'TestPutCreateDocument.docx'
+      remote_name = 'TestCreateDocument.docx'
 
-      st_request = PutCreateRequest.new remote_test_folder + test_folder + '/' + remote_name, File.open(local_common_folder + filename, "r").read
-      @storage_api.put_create st_request
+      upload_file(local_common_folder + filename, remote_test_folder + test_folder + '/' + remote_name)
 
-      request = PutCreateDocumentRequest.new nil, remote_name, remote_test_folder + test_folder
-      result = @words_api.put_create_document request
-      assert_equal 200, result.code
+      request = CreateDocumentRequest.new nil, remote_name, remote_test_folder + test_folder
+      result = @words_api.create_document request
+      assert_equal false, result.document.nil?
     end
   end
 end