]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'cassandra-host-data-source-stress-test' of https://github.com/andreipav...
authorAndrei Pavel <andrei.pavel@qualitance.com>
Wed, 11 Jan 2017 12:42:47 +0000 (14:42 +0200)
committerAndrei Pavel <andrei.pavel@qualitance.com>
Wed, 11 Jan 2017 12:42:47 +0000 (14:42 +0200)
1  2 
src/lib/dhcpsrv/tests/cql_lease_mgr_unittest.cc

index a556b9959bb8aa8018a86cef2d9c445d1709816a,fa2edfa3a88e4741df35face089ecca546d343c1..da6cd571969d42dab9e5a2884c4e36e552e43528
@@@ -361,25 -344,24 +361,50 @@@ TEST(CqlOpenTest, OpenDatabase) 
      // Check that wrong specification of backend throws an exception.
      // (This is really a check on LeaseMgrFactory, but is convenient to
      // perform here.)
 -    EXPECT_THROW(LeaseMgrFactory::create(connectionString(
 -        NULL, VALID_NAME, VALID_HOST, INVALID_USER, VALID_PASSWORD)),
 +    EXPECT_THROW(
 +        LeaseMgrFactory::create(connectionString(NULL, VALID_NAME, VALID_HOST,
 +                                                 INVALID_USER, VALID_PASSWORD)),
          InvalidParameter);
 -        INVALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)),
 -        InvalidType);
 +    EXPECT_THROW(
 +        LeaseMgrFactory::create(connectionString(
 +            INVALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)),
 +        InvalidType);
 +
 +    // Check that invalid login data does not cause an exception, CQL should use
 +    // default values.
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, INVALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)));
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, VALID_NAME, INVALID_HOST, VALID_USER, VALID_PASSWORD)));
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, VALID_NAME, VALID_HOST, INVALID_USER, VALID_PASSWORD)));
 +    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
 +        CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, INVALID_PASSWORD)));
++    // Check that invalid timeouts throw DbOperationError.
+     EXPECT_THROW(LeaseMgrFactory::create(connectionString(
++                     CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER,
++                     VALID_PASSWORD, INVALID_TIMEOUT_1)),
++                 DbOperationError);
++    EXPECT_THROW(LeaseMgrFactory::create(connectionString(
++                     CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER,
++                     VALID_PASSWORD, INVALID_TIMEOUT_2)),
++                 DbOperationError);
++
++    // Check that CQL allows the hostname to not be specified.
++    EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
++        CQL_VALID_TYPE, NULL, VALID_HOST, INVALID_USER, VALID_PASSWORD)));
+     // Check that invalid login data does not cause an exception, CQL should use
+     // default values.
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, INVALID_NAME, VALID_HOST, VALID_USER, VALID_PASSWORD)));
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, VALID_NAME, INVALID_HOST, VALID_USER, VALID_PASSWORD)));
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, VALID_NAME, VALID_HOST, INVALID_USER, VALID_PASSWORD)));
+     EXPECT_NO_THROW(LeaseMgrFactory::create(connectionString(
+         CQL_VALID_TYPE, VALID_NAME, VALID_HOST, VALID_USER, INVALID_PASSWORD)));
  
      // Check that invalid timeouts throw DbOperationError.
      EXPECT_THROW(LeaseMgrFactory::create(connectionString(