1111import java .util .ArrayList ;
1212import java .util .Arrays ;
1313import java .util .List ;
14- import junit .framework .TestCase ;
1514import org .junit .Before ;
1615import org .junit .BeforeClass ;
1716import org .junit .ClassRule ;
1817import org .junit .Test ;
1918
20- import static junit .framework .TestCase .assertEquals ;
19+ import static org .junit .Assert .assertEquals ;
20+ import static org .junit .Assert .assertThrows ;
21+ import static org .junit .Assert .assertTrue ;
2122
2223/**
2324 * <p>Integration tests for the leases (i.e. "sys/leases") Vault API operations.</p>
@@ -38,6 +39,10 @@ public class LeasesTests {
3839
3940 private Vault vault ;
4041
42+ private DatabaseResponse credsResponse ;
43+
44+ private String prefix ;
45+
4146 @ BeforeClass
4247 public static void setupClass () throws IOException , InterruptedException {
4348 container .initAndUnsealVault ();
@@ -47,88 +52,43 @@ public static void setupClass() throws IOException, InterruptedException {
4752 @ Before
4853 public void setup () throws VaultException {
4954 vault = container .getRootVault ();
50- }
5155
52- @ Test (expected = VaultException .class )
53- public void testRevoke () throws VaultException {
5456 List <String > creationStatements = new ArrayList <>();
5557 creationStatements .add (
5658 "CREATE USER \" {{name}}\" WITH PASSWORD '{{password}}'; GRANT ALL PRIVILEGES ON DATABASE \" postgres\" to \" {{name}}\" ;" );
5759
5860 DatabaseResponse databaseResponse = vault .database ().createOrUpdateRole ("new-role" ,
5961 new DatabaseRoleOptions ().dbName ("postgres" )
6062 .creationStatements (creationStatements ));
61- TestCase . assertEquals (204 , databaseResponse .getRestResponse ().getStatus ());
63+ assertEquals (204 , databaseResponse .getRestResponse ().getStatus ());
6264
63- DatabaseResponse credsResponse = vault .database ().creds ("new-role" );
64- TestCase . assertEquals (200 , credsResponse .getRestResponse ().getStatus ());
65+ credsResponse = vault .database ().creds ("new-role" );
66+ assertEquals (200 , credsResponse .getRestResponse ().getStatus ());
6567
66- TestCase . assertTrue (credsResponse .getCredential ().getUsername ().contains ("new-role" ));
68+ assertTrue (credsResponse .getCredential ().getUsername ().contains ("new-role" ));
6769
68- final VaultResponse response = vault . leases (). revoke ( credsResponse .getLeaseId ());
69- assertEquals ( 204 , response . getRestResponse (). getStatus () );
70+ prefix = Arrays . stream ( credsResponse .getLeaseId (). split ( "([^/]+)$" ))
71+ . map ( str -> str . substring ( 0 , str . length () - 1 )). findFirst (). get ( );
7072 }
7173
72- @ Test (expected = VaultException .class )
73- public void testRevokePrefix () throws VaultException {
74- List <String > creationStatements = new ArrayList <>();
75- creationStatements .add (
76- "CREATE USER \" {{name}}\" WITH PASSWORD '{{password}}'; GRANT ALL PRIVILEGES ON DATABASE \" postgres\" to \" {{name}}\" ;" );
77-
78- DatabaseResponse databaseResponse = vault .database ().createOrUpdateRole ("new-role" ,
79- new DatabaseRoleOptions ().dbName ("postgres" )
80- .creationStatements (creationStatements ));
81- TestCase .assertEquals (204 , databaseResponse .getRestResponse ().getStatus ());
82-
83- DatabaseResponse credsResponse = vault .database ().creds ("new-role" );
84- TestCase .assertEquals (200 , credsResponse .getRestResponse ().getStatus ());
85-
86- TestCase .assertTrue (credsResponse .getCredential ().getUsername ().contains ("new-role" ));
87- String prefix = Arrays .stream (credsResponse .getLeaseId ().split ("([^/]+)$" ))
88- .map (str -> str .substring (0 , str .length () - 1 )).findFirst ().get ();
74+ @ Test
75+ public void testRevoke () {
76+ assertThrows (VaultException .class , () -> vault .leases ().revoke (credsResponse .getLeaseId ()));
77+ }
8978
90- final VaultResponse response = vault .leases ().revokePrefix (prefix );
91- assertEquals (204 , response .getRestResponse ().getStatus ());
79+ @ Test
80+ public void testRevokePrefix () {
81+ assertThrows (VaultException .class , () -> vault .leases ().revokePrefix (prefix ));
9282 }
9383
9484 @ Test
9585 public void testRevokeForce () throws VaultException {
96- List <String > creationStatements = new ArrayList <>();
97- creationStatements .add (
98- "CREATE USER \" {{name}}\" WITH PASSWORD '{{password}}'; GRANT ALL PRIVILEGES ON DATABASE \" postgres\" to \" {{name}}\" ;" );
99-
100- DatabaseResponse databaseResponse = vault .database ().createOrUpdateRole ("new-role" ,
101- new DatabaseRoleOptions ().dbName ("postgres" )
102- .creationStatements (creationStatements ));
103- TestCase .assertEquals (204 , databaseResponse .getRestResponse ().getStatus ());
104-
105- DatabaseResponse credsResponse = vault .database ().creds ("new-role" );
106- TestCase .assertEquals (200 , credsResponse .getRestResponse ().getStatus ());
107-
108- TestCase .assertTrue (credsResponse .getCredential ().getUsername ().contains ("new-role" ));
109- String prefix = Arrays .stream (credsResponse .getLeaseId ().split ("([^/]+)$" ))
110- .map (str -> str .substring (0 , str .length () - 1 )).findFirst ().get ();
111-
11286 final VaultResponse response = vault .leases ().revokeForce (prefix );
11387 assertEquals (204 , response .getRestResponse ().getStatus ());
11488 }
11589
11690 @ Test
11791 public void testRenew () throws VaultException {
118- List <String > creationStatements = new ArrayList <>();
119- creationStatements .add (
120- "CREATE USER \" {{name}}\" WITH PASSWORD '{{password}}'; GRANT ALL PRIVILEGES ON DATABASE \" postgres\" to \" {{name}}\" ;" );
121-
122- DatabaseResponse databaseResponse = vault .database ().createOrUpdateRole ("new-role" ,
123- new DatabaseRoleOptions ().dbName ("postgres" )
124- .creationStatements (creationStatements ));
125- TestCase .assertEquals (204 , databaseResponse .getRestResponse ().getStatus ());
126-
127- DatabaseResponse credsResponse = vault .database ().creds ("new-role" );
128- TestCase .assertEquals (200 , credsResponse .getRestResponse ().getStatus ());
129-
130- TestCase .assertTrue (credsResponse .getCredential ().getUsername ().contains ("new-role" ));
131-
13292 final VaultResponse response = vault .leases ().renew (credsResponse .getLeaseId (),
13393 credsResponse .getLeaseDuration ());
13494 assertEquals (200 , response .getRestResponse ().getStatus ());
0 commit comments