Enhance rubocop and tests syntax

Signed-off-by: Florian Wininger <[email protected]>

Author: fwininger

.rubocop_todo.yml

@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2020-01-31 16:08:44 +0100 using RuboCop version 0.49.1.
+# on 2020-01-31 16:17:37 +0100 using RuboCop version 0.49.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -14,17 +14,6 @@ Layout/AlignArray:
     - 'lib/net/ldap/auth_adapter/sasl.rb'
     - 'lib/net/ldap/connection.rb'
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: with_first_parameter, with_fixed_indentation
-Layout/AlignParameters:
-  Exclude:
-    - 'test/ber/test_ber.rb'
-    - 'test/integration/test_ber.rb'
-    - 'test/integration/test_bind.rb'
-    - 'test/integration/test_password_modify.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, IndentOneStep, IndentationWidth.
@@ -33,69 +22,41 @@ Layout/CaseIndentation:
   Exclude:
     - 'lib/net/ldap/filter.rb'
 
-# Offense count: 19
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: leading, trailing
-Layout/DotPosition:
-  Exclude:
-    - 'test/test_ldap_connection.rb'
-    - 'test/test_ssl_ber.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
-Layout/ElseAlignment:
-  Exclude:
-    - 'testserver/ldapserver.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
 Layout/EmptyLineAfterMagicComment:
   Exclude:
     - 'net-ldap.gemspec'
-    - 'test/test_filter_parser.rb'
 
-# Offense count: 7
+# Offense count: 5
 # Cop supports --auto-correct.
 # Configuration parameters: AllowAdjacentOneLineDefs, NumberOfEmptyLines.
 Layout/EmptyLineBetweenDefs:
   Exclude:
     - 'lib/net/ldap.rb'
     - 'lib/net/ldap/dataset.rb'
     - 'lib/net/snmp.rb'
-    - 'testserver/ldapserver.rb'
 
-# Offense count: 8
+# Offense count: 1
 # Cop supports --auto-correct.
 Layout/EmptyLines:
   Exclude:
     - 'lib/net/snmp.rb'
-    - 'testserver/ldapserver.rb'
 
-# Offense count: 3
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
 Layout/EmptyLinesAroundClassBody:
   Exclude:
     - 'lib/net/ldap.rb'
-    - 'test/integration/test_bind.rb'
-    - 'test/test_snmp.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
 Layout/EmptyLinesAroundExceptionHandlingKeywords:
   Exclude:
     - 'lib/net/ldap/connection.rb'
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
-Layout/EmptyLinesAroundModuleBody:
-  Exclude:
-    - 'testserver/ldapserver.rb'
-
 # Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: SupportedStyles, IndentationWidth.
@@ -110,16 +71,14 @@ Layout/IndentArray:
 Layout/IndentHash:
   EnforcedStyle: consistent
 
-# Offense count: 10
+# Offense count: 6
 # Cop supports --auto-correct.
 # Configuration parameters: Width, IgnoredPatterns.
 Layout/IndentationWidth:
   Exclude:
     - 'lib/net/ber.rb'
     - 'lib/net/ldap/password.rb'
     - 'lib/net/snmp.rb'
-    - 'test/test_snmp.rb'
-    - 'testserver/ldapserver.rb'
 
 # Offense count: 3
 # Cop supports --auto-correct.
@@ -129,23 +88,13 @@ Layout/LeadingCommentSpace:
     - 'lib/net/ldap.rb'
     - 'lib/net/ldap/connection.rb'
 
-# Offense count: 4
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: symmetrical, new_line, same_line
 Layout/MultilineMethodCallBraceLayout:
   Exclude:
     - 'lib/net/ldap/filter.rb'
-    - 'test/test_entry.rb'
-    - 'test/test_ldap_connection.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, IndentationWidth.
-# SupportedStyles: aligned, indented, indented_relative_to_receiver
-Layout/MultilineMethodCallIndentation:
-  Exclude:
-    - 'test/test_ldap_connection.rb'
 
 # Offense count: 5
 # Cop supports --auto-correct.
@@ -163,7 +112,7 @@ Layout/SpaceAroundKeyword:
     - 'lib/net/ldap/entry.rb'
     - 'lib/net/snmp.rb'
 
-# Offense count: 9
+# Offense count: 7
 # Cop supports --auto-correct.
 # Configuration parameters: AllowForAlignment.
 Layout/SpaceAroundOperators:
@@ -172,39 +121,30 @@ Layout/SpaceAroundOperators:
     - 'lib/net/ldap/connection.rb'
     - 'lib/net/ldap/entry.rb'
     - 'lib/net/ldap/filter.rb'
-    - 'test/test_entry.rb'
-    - 'test/test_ldap_connection.rb'
 
-# Offense count: 5
+# Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces, SpaceBeforeBlockParameters.
 # SupportedStyles: space, no_space
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideBlockBraces:
   Exclude:
     - 'lib/net/ldap/dataset.rb'
-    - 'test/test_snmp.rb'
-    - 'testserver/ldapserver.rb'
 
-# Offense count: 15
+# Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
+# Configuration parameters: SupportedStyles, EnforcedStyleForEmptyBraces, SupportedStylesForEmptyBraces.
 # SupportedStyles: space, no_space, compact
 # SupportedStylesForEmptyBraces: space, no_space
 Layout/SpaceInsideHashLiteralBraces:
-  Exclude:
-    - 'lib/net/ldap/dataset.rb'
-    - 'test/integration/test_password_modify.rb'
-    - 'test/test_ldap.rb'
+  EnforcedStyle: space
 
-# Offense count: 20
+# Offense count: 8
 # Cop supports --auto-correct.
 Layout/SpaceInsideParens:
   Exclude:
     - 'lib/net/ldap/entry.rb'
     - 'lib/net/snmp.rb'
-    - 'test/test_password.rb'
-    - 'testserver/ldapserver.rb'
 
 # Offense count: 1
 Lint/AmbiguousBlockAssociation:
@@ -302,7 +242,7 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Max: 41
 
-# Offense count: 214
+# Offense count: 215
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
 # URISchemes: http, https
 Metrics/LineLength:
@@ -316,7 +256,7 @@ Metrics/MethodLength:
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 104
+  Max: 103
 
 # Offense count: 15
 Metrics/PerceivedComplexity:
@@ -339,7 +279,7 @@ Style/Alias:
     - 'lib/net/ldap/filter.rb'
     - 'lib/net/ldap/pdu.rb'
 
-# Offense count: 37
+# Offense count: 33
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: always, conditionals
@@ -351,7 +291,6 @@ Style/AndOr:
     - 'lib/net/ldap/dataset.rb'
     - 'lib/net/ldap/filter.rb'
     - 'lib/net/ldap/pdu.rb'
-    - 'testserver/ldapserver.rb'
 
 # Offense count: 1
 # Cop supports --auto-correct.
@@ -367,15 +306,14 @@ Style/BlockComments:
   Exclude:
     - 'test/test_rename.rb'
 
-# Offense count: 6
+# Offense count: 2
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SupportedStyles.
 # SupportedStyles: braces, no_braces, context_dependent
 Style/BracesAroundHashParameters:
   Exclude:
     - 'lib/net/ldap/auth_adapter/gss_spnego.rb'
     - 'lib/net/snmp.rb'
-    - 'test/test_ldap.rb'
 
 # Offense count: 4
 # Cop supports --auto-correct.
@@ -404,13 +342,6 @@ Style/ClassCheck:
     - 'lib/net/ber/core_ext/array.rb'
     - 'lib/net/ldap/error.rb'
 
-# Offense count: 13
-# Cop supports --auto-correct.
-Style/ColonMethodCall:
-  Exclude:
-    - 'test/test_ldif.rb'
-    - 'test/test_ssl_ber.rb'
-
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Keywords.

test/ber/test_ber.rb

@@ -95,7 +95,7 @@ def test_utf8_encodable_strings
     def test_encode_binary_data
       # This is used for searching for GUIDs in Active Directory
       assert_equal "\x04\x10" + "j1\xB4\xA1*\xA2zA\xAC\xA9`?'\xDDQ\x16".b,
-        ["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").to_ber_bin
+                   ["6a31b4a12aa27a41aca9603f27dd5116"].pack("H*").to_ber_bin
     end
 
     def test_non_utf8_encodable_strings

test/integration/test_ber.rb

@@ -25,6 +25,6 @@ def test_true_ber_encoding
     end
 
     assert_includes Net::LDAP::ResultCodesSearchSuccess,
-      @ldap.get_operation_result.code, "should be a successful search operation"
+                    @ldap.get_operation_result.code, "should be a successful search operation"
   end
 end

test/integration/test_bind.rb

@@ -1,7 +1,6 @@
 require_relative '../test_helper'
 
 class TestBindIntegration < LDAPIntegrationTestCase
-
   INTEGRATION_HOSTNAME = 'ldap.example.org'.freeze
 
   def test_bind_success
@@ -28,7 +27,7 @@ def test_bind_anonymous_fail
     assert_equal Net::LDAP::ResultCodeUnwillingToPerform, result.code
     assert_equal Net::LDAP::ResultStrings[Net::LDAP::ResultCodeUnwillingToPerform], result.message
     assert_equal "unauthenticated bind (DN with no password) disallowed",
-      result.error_message
+                 result.error_message
     assert_equal "", result.matched_dn
   end
 

test/integration/test_password_modify.rb

@@ -3,7 +3,7 @@
 class TestPasswordModifyIntegration < LDAPIntegrationTestCase
   def setup
     super
-    @admin_account = {dn: 'cn=admin,dc=example,dc=org', password: 'admin', method: :simple}
+    @admin_account = { dn: 'cn=admin,dc=example,dc=org', password: 'admin', method: :simple }
     @ldap.authenticate @admin_account[:dn], @admin_account[:password]
 
     @dn = 'uid=modify-password-user1,ou=People,dc=example,dc=org'
@@ -35,13 +35,13 @@ def test_password_modify
                                  new_password: 'passworD2')
 
     assert @ldap.get_operation_result.extended_response.nil?,
-      'Should not have generated a new password'
+           'Should not have generated a new password'
 
     refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
-      'Old password should no longer be valid'
+           'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: 'passworD2', method: :simple),
-      'New password should be valid'
+           'New password should be valid'
   end
 
   def test_password_modify_generate
@@ -54,10 +54,10 @@ def test_password_modify_generate
     assert generated_password, 'Should have generated a password'
 
     refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
-      'Old password should no longer be valid'
+           'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: generated_password, method: :simple),
-      'New password should be valid'
+           'New password should be valid'
   end
 
   def test_password_modify_generate_no_old_password
@@ -69,10 +69,10 @@ def test_password_modify_generate_no_old_password
     assert generated_password, 'Should have generated a password'
 
     refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
-      'Old password should no longer be valid'
+           'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: generated_password, method: :simple),
-      'New password should be valid'
+           'New password should be valid'
   end
 
   def test_password_modify_overwrite_old_password
@@ -81,10 +81,10 @@ def test_password_modify_overwrite_old_password
                                  new_password: 'passworD3')
 
     refute @ldap.bind(username: @dn, password: 'admin', method: :simple),
-      'Old password should no longer be valid'
+           'Old password should no longer be valid'
 
     assert @ldap.bind(username: @dn, password: 'passworD3', method: :simple),
-      'New password should be valid'
+           'New password should be valid'
   end
 
   def teardown

test/test_entry.rb

@@ -47,7 +47,8 @@ def setup
       %Q{dn: something
 foo: foo
 barAttribute: bar
-      })
+      },
+    )
   end
 
   def test_attribute
@@ -59,7 +60,7 @@ def test_modify_attribute
     @entry.foo = 'bar'
     assert_equal ['bar'], @entry.foo
 
-    @entry.fOo= 'baz'
+    @entry.fOo = 'baz'
     assert_equal ['baz'], @entry.foo
   end
 end

test/test_filter_parser.rb

@@ -1,4 +1,5 @@
 # encoding: utf-8
+
 require_relative 'test_helper'
 
 class TestFilterParser < Test::Unit::TestCase