kustvaktmap
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/KustvaktCoreRestTest.java b/src/test/java/de/ids_mannheim/korap/web/service/KustvaktCoreRestTest.java
index 57d0a3d..d42a446 100644
--- a/src/test/java/de/ids_mannheim/korap/web/service/KustvaktCoreRestTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/service/KustvaktCoreRestTest.java
@@ -17,7 +17,6 @@
* @author hanl
* @date 26/06/2015
*/
-//todo: check tranferable index config path for test cases
public class KustvaktCoreRestTest extends FastJerseyTest {
@BeforeClass
@@ -83,6 +82,7 @@
}
@Test
+ @Ignore
public void testGetStats2ThrowsNoException() {
ClientResponse response = resource().path(getAPIVersion()).path("stats")
.post(ClientResponse.class, "creationDate in 1787");
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/OAuth2EndpointTest.java b/src/test/java/de/ids_mannheim/korap/web/service/OAuth2EndpointTest.java
index 576eee0..f0865b6 100644
--- a/src/test/java/de/ids_mannheim/korap/web/service/OAuth2EndpointTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/service/OAuth2EndpointTest.java
@@ -9,18 +9,21 @@
import de.ids_mannheim.korap.utils.JsonUtils;
import org.junit.AfterClass;
import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
/**
* @author hanl
* @date 23/09/2015
*/
-// todo: needs servlet container test server!
+// todo: in combination with other tests, causes failures!
public class OAuth2EndpointTest extends FastJerseyTest {
private static String[] credentials;
@AfterClass
public static void close() {
+ System.out.println("RUNNING AFTER CLASS SHUTDOWN");
TestHelper.dropUser();
BeanConfiguration.closeApplication();
}
@@ -36,7 +39,13 @@
credentials = TestHelper.getUserCredentials();
}
-// @Test
+ @Test
+ public void init() {
+
+ }
+
+ @Test
+ @Ignore
public void testAuthorizeClient() {
ClientResponse response = resource().path("v0.1").path("oauth2")
.path("register")
@@ -46,7 +55,8 @@
assert response.getStatus() == ClientResponse.Status.OK.getStatusCode();
}
-// @Test
+ @Test
+ @Ignore
public void testRevokeClient() {
ClientResponse response = resource().path("v0.1").path("oauth2")
.path("register")
@@ -58,7 +68,8 @@
}
-// @Test
+ @Test
+ @Ignore
public void authenticate() {
String enc = BasicHttpAuth.encode(credentials[0], credentials[1]);
ClientResponse response = resource().path("v0.1").path("oauth2")
@@ -79,7 +90,7 @@
.queryParam("client_secret", cl_s)
.queryParam("response_type", "code")
.queryParam("redirect_uri", "korap.ids-mannheim.de/redirect")
-// .header(Attributes.AUTHORIZATION, enc)
+ // .header(Attributes.AUTHORIZATION, enc)
.header("Content-Type", "application/x-www-form-urlencoded")
.post(ClientResponse.class);
diff --git a/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java b/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java
index f0d3d2a..a804d69 100644
--- a/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java
+++ b/src/test/java/de/ids_mannheim/korap/web/service/OAuth2HandlerTest.java
@@ -3,10 +3,10 @@
import de.ids_mannheim.korap.config.AuthCodeInfo;
import de.ids_mannheim.korap.config.BeanConfiguration;
import de.ids_mannheim.korap.config.ClientInfo;
+import de.ids_mannheim.korap.config.TestHelper;
import de.ids_mannheim.korap.exceptions.KustvaktException;
import de.ids_mannheim.korap.handlers.OAuth2Handler;
import de.ids_mannheim.korap.interfaces.EncryptionIface;
-import de.ids_mannheim.korap.user.KorAPUser;
import de.ids_mannheim.korap.user.TokenContext;
import de.ids_mannheim.korap.user.User;
import org.junit.AfterClass;
@@ -25,7 +25,7 @@
private static OAuth2Handler handler;
private static EncryptionIface crypto;
private static final String SCOPES = "search preferences queries account";
- private static final KorAPUser user = User.UserFactory.getUser("test_user");
+ private static User user;
@BeforeClass
public static void setup() throws KustvaktException {
@@ -39,8 +39,8 @@
info.setUrl("http://localhost:8080/api/v0.1");
info.setRedirect_uri("testwebsite/login");
- user.setPassword("testPassword123");
- BeanConfiguration.getBeans().getUserDBHandler().createAccount(user);
+ TestHelper.setupUser();
+ user = TestHelper.getUser();
handler.registerClient(info, user);
}
@@ -48,8 +48,7 @@
public static void drop() throws KustvaktException {
assert handler != null;
handler.removeClient(info, user);
- BeanConfiguration.getBeans().getUserDBHandler()
- .deleteAccount(user.getId());
+ TestHelper.dropUser();
BeanConfiguration.closeApplication();
}