Merge pull request #64 from glennsarti/add-tests

Add more tests and fix minor errors in the message router

Author: jpogran

server/lib/puppet-languageserver/message_router.rb

@@ -11,7 +11,12 @@ def self.remove_document(uri)
       @documents[uri] = nil
     end
 
+    def self.clear
+      @documents.clear
+    end
+
     def self.document(uri)
+      return nil if @documents[uri].nil?
       @documents[uri].clone
     end
   end
@@ -42,7 +47,10 @@ def receive_request(request)
       when 'puppet/getResource'
         type_name = request.params['typename']
         title = request.params['title']
-        request.reply_result(LanguageServer::PuppetCompilation.create('error' => 'Missing Typename')) if type_name.nil?
+        if type_name.nil?
+          request.reply_result(LanguageServer::PuppetCompilation.create('error' => 'Missing Typename'))
+          return
+        end
         resources = nil
 
         if title.nil?
@@ -51,8 +59,10 @@ def receive_request(request)
           resources = PuppetLanguageServer::PuppetHelper.resource_face_get_by_typename_and_title(type_name, title)
           resources = [resources] unless resources.nil?
         end
-        request.reply_result(LanguageServer::PuppetCompilation.create('data' => '')) if resources.nil? || resources.length.zero?
-
+        if resources.nil? || resources.length.zero?
+          request.reply_result(LanguageServer::PuppetCompilation.create('data' => '')) 
+          return
+        end
         # TODO: Should probably move this to a helper?
         content = resources.map(&:to_manifest).join("\n\n") + "\n"
         request.reply_result(LanguageServer::PuppetCompilation.create('data' => content))

server/spec/integration/puppet-languageserver/hover_provider_spec.rb

@@ -40,6 +40,85 @@
       end
     end
 
+    context "Given a class definition in the manifest" do
+      let(:content) { <<-EOT
+class Test::NoParams {
+  user { 'Alice':
+    ensure => 'present',
+    name   => 'name',
+  }
+}
+
+class Test::WithParams (String $version = 'Bob') {
+  user { $version:
+    ensure => 'present',
+    name   => 'name',
+  }
+}
+EOT
+      }
+
+      describe 'when cursor is on the class keyword' do
+        let(:line_num) { 0 }
+        let(:char_num) { 3 }
+
+        it 'should return class description' do
+          pending('Not implemented')
+          result = subject.resolve(content, line_num, char_num)
+
+          expect(result['contents']).to start_with("**class** keyword\n")
+        end
+      end
+
+      describe 'when cursor is on the class name' do
+        let(:line_num) { 0 }
+        let(:char_num) { 14 }
+
+        it 'should return class description' do
+          pending('Not implemented')
+          result = subject.resolve(content, line_num, char_num)
+
+          expect(result['contents']).to start_with("**class** keyword\n")
+        end
+      end
+
+      describe 'when cursor is on the property type in a class definition' do
+        let(:line_num) { 7 }
+        let(:char_num) { 27 }
+
+        it 'should return type information' do
+          pending('Not implemented')
+          result = subject.resolve(content, line_num, char_num)
+
+          expect(result['contents']).to start_with("**String** keyword\n")
+        end
+      end
+
+      describe 'when cursor is on the property name in a class definition' do
+        let(:line_num) { 7 }
+        let(:char_num) { 36 }
+
+        it 'should not return any information' do
+          pending('Not implemented')
+          result = subject.resolve(content, line_num, char_num)
+
+          expect(result['contents']).to eq('')
+        end
+      end
+
+      describe 'when cursor is on the property default value in a class definition' do
+        let(:line_num) { 7 }
+        let(:char_num) { 44 }
+
+        it 'should not return any information' do
+          pending('Not implemented')
+          result = subject.resolve(content, line_num, char_num)
+
+          expect(result['contents']).to eq('')
+        end
+      end
+    end
+
     context "Given a resource in the manifest" do
       let(:content) { <<-EOT
 user { 'Bob':

server/spec/spec_helper.rb

@@ -10,7 +10,7 @@
 
 # Currently there is no way to re-initialize the puppet loader so for the moment
 # all tests must run off the single puppet config settings instead of per example setting
-server_options = PuppetLanguageServer::CommandLineParser.parse([])
+server_options = PuppetLanguageServer::CommandLineParser.parse(['--no-preload'])
 server_options[:puppet_settings] = ['--vardir',File.join(fixtures_dir,'cache'),
                                     '--confdir',File.join(fixtures_dir,'confdir')]
 PuppetLanguageServer::init_puppet(server_options)
@@ -25,3 +25,49 @@
     "be a Completion Item with a data type in the list of #{value}"
   end
 end
+
+# Mock ojects
+class MockJSONRPCHandler < PuppetLanguageServer::JSONRPCHandler
+  attr_accessor :socket
+  attr_accessor :simple_tcp_server
+
+  def post_init
+  end
+
+  def unbind
+  end
+
+  def receive_data(data)
+  end
+
+  def error?
+    false
+  end
+
+  def send_data(data)
+    true
+  end
+
+  def close_connection_after_writing
+  end
+
+  def close_connection
+  end
+end
+
+class MockResource
+  attr_accessor :title
+
+  def initialize(type_name = 'type' + rand(65536).to_s, title = 'resource' + rand(65536).to_s)
+    @title = title
+    @type = type_name
+  end
+
+  def to_manifest
+    <<-HEREDOC
+#{@type} { '#{@title}':
+  ensure => present
+}
+    HEREDOC
+  end
+end