Commit 626ed2a5 authored by Greg Messner's avatar Greg Messner
Browse files

Mods for hamcrest update.

parent f6af21f2
package org.gitlab4j.api; package org.gitlab4j.api;
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.hasEntry; import static org.hamcrest.Matchers.hasEntry;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertThat;
import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import static org.mockito.MockitoAnnotations.initMocks; import static org.mockito.MockitoAnnotations.initMocks;
......
package org.gitlab4j.api; package org.gitlab4j.api;
import static org.hamcrest.Matchers.containsInAnyOrder; import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.contains;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals; import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeNotNull; import static org.junit.Assume.assumeNotNull;
import static org.junit.Assume.assumeTrue; import static org.junit.Assume.assumeTrue;
...@@ -283,7 +283,7 @@ public class TestUserApi extends AbstractIntegrationTest { ...@@ -283,7 +283,7 @@ public class TestUserApi extends AbstractIntegrationTest {
assertEquals(TEST_IMPERSONATION_TOKEN_NAME, token.getName()); assertEquals(TEST_IMPERSONATION_TOKEN_NAME, token.getName());
assertEquals(expiresAt.getTime(), token.getExpiresAt().getTime()); assertEquals(expiresAt.getTime(), token.getExpiresAt().getTime());
assertEquals(scopes.length, token.getScopes().size()); assertEquals(scopes.length, token.getScopes().size());
assertThat(token.getScopes(), containsInAnyOrder(scopes)); assertThat(token.getScopes(), contains(scopes));
} finally { } finally {
if (user != null && token != null) { if (user != null && token != null) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment