add user-api test #1456

coderzc · 2021-05-19T03:26:00Z

No description provided.

codecov · 2021-05-19T03:56:30Z

Codecov Report

Merging #1456 (4f69663) into master (1ede97c) will increase coverage by 2.25%.
The diff coverage is 25.00%.

@@             Coverage Diff              @@
##             master    #1456      +/-   ##
============================================
+ Coverage     61.80%   64.05%   +2.25%     
- Complexity     5840     5882      +42     
============================================
  Files           381      381              
  Lines         32148    32190      +42     
  Branches       4504     4506       +2     
============================================
+ Hits          19869    20620     +751     
+ Misses        10231     9463     -768     
- Partials       2048     2107      +59

Impacted Files	Coverage Δ
.../com/baidu/hugegraph/auth/ConfigAuthenticator.java	`0.00% <0.00%> (ø)`
...va/com/baidu/hugegraph/auth/HugeAuthenticator.java	`33.70% <ø> (+12.70%)`	⬆️
...c/main/java/com/baidu/hugegraph/cmd/InitStore.java	`0.00% <0.00%> (ø)`
...om/baidu/hugegraph/auth/StandardAuthenticator.java	`35.38% <14.28%> (+35.38%)`	⬆️
...in/java/com/baidu/hugegraph/core/GraphManager.java	`54.59% <50.00%> (+2.50%)`	⬆️
...ava/com/baidu/hugegraph/api/profile/GraphsAPI.java	`0.00% <0.00%> (-20.76%)`	⬇️
.../hugegraph/backend/store/rocksdb/RocksDBStore.java	`69.61% <0.00%> (-1.79%)`	⬇️
...in/java/com/baidu/hugegraph/StandardHugeGraph.java	`68.45% <0.00%> (-0.39%)`	⬇️
...a/com/baidu/hugegraph/api/traversers/CountAPI.java	`0.00% <0.00%> (ø)`
...ugegraph/backend/store/raft/StoreSnapshotFile.java	`0.00% <0.00%> (ø)`
... and 33 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 1ede97c...4f69663. Read the comment docs.

javeme · 2021-05-19T05:55:42Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+                                      ImmutableMap.of());
+            assertResponseStatus(200, r);
+        }
+


remove the empty line

javeme · 2021-05-19T05:55:54Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+        String result = assertResponseStatus(400, r);
+        String message = assertJsonContains(result, "message");
+        Assert.assertThat(message, CoreMatchers.containsString(
+                "Invalid user id:"));


javeme · 2021-05-19T05:56:26Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+        this.client().post(path, user);
+    }
+
+    protected List<Map<String, Object>> getList() {


javeme · 2021-05-19T05:56:59Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+        Response r3 = client().post(path, "{}");
+        assertResponseStatus(400, r3);
+
+


remove empty line

javeme · 2021-05-19T05:57:31Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+    private static final String path = "graphs/hugegraph/auth/users";
+
+    @After
+    public void clearUser() {


javeme · 2021-05-19T05:58:19Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+
+    protected List<Map<String, Object>> getList() {
+        Response r = this.client().get(path,
+                                       ImmutableMap.of("limit", -1));


define params var

javeme · 2021-05-19T05:58:37Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+        String result = assertResponseStatus(200, r);
+        Map<String, List<Map<String, Object>>> resultMap = JsonUtil.fromJson(
+                result,
+                new TypeReference<Map<String, List<Map<String, Object>>>>() {


define local var

javeme · 2021-05-19T05:59:18Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+                result,
+                new TypeReference<Map<String, List<Map<String, Object>>>>() {
+                });
+        return resultMap.get("users");


JsonUtil.fromJson().get("users");

javeme · 2021-05-19T11:10:22Z

hugegraph-dist/src/assembly/travis/run-api-test.sh

@@ -5,9 +5,30 @@ set -ev
 TRAVIS_DIR=`dirname $0`
 VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
 SERVER_DIR=hugegraph-$VERSION
+CONF=$TRAVIS_DIR/conf/hugegraph.properties
+REST_CONF=$TRAVIS_DIR/conf/rest-server.properties


REST_SERVER_CONF

javeme · 2021-05-19T11:11:19Z

hugegraph-dist/src/assembly/travis/run-api-test.sh


 mvn package -DskipTests
+
+cp $CONF "${CONF}_bak"


don't need to copy bak file

javeme · 2021-05-19T11:11:31Z

hugegraph-dist/src/assembly/travis/run-api-test.sh

@@ -5,9 +5,30 @@ set -ev
 TRAVIS_DIR=`dirname $0`
 VERSION=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
 SERVER_DIR=hugegraph-$VERSION
+CONF=$TRAVIS_DIR/conf/hugegraph.properties
+REST_CONF=$TRAVIS_DIR/conf/rest-server.properties
+GREMLIN_CONF=$TRAVIS_DIR/conf/gremlin-server.yaml


GREMLIN_SERVER_CONF

javeme · 2021-05-19T11:11:43Z

hugegraph-dist/src/assembly/travis/run-api-test.sh

+
+mv "${CONF}_bak" $CONF
+mv "${REST_CONF}_bak" $REST_CONF
+mv "${GREMLIN_CONF}_bak" $GREMLIN_CONF


add empty line

javeme · 2021-05-19T11:12:50Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

@@ -36,9 +36,12 @@
 public class UserApiTest extends BaseApiTest {

    private static final String path = "graphs/hugegraph/auth/users";
+    private static final Map<String, Object> NO_LIMIT = ImmutableMap.of("limit",


just define NO_LIMIT = -1;

javeme · 2021-05-19T11:13:39Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

-                });
+        Map<String, List<Map<String, Object>>> resultMap =
+                JsonUtil.fromJson(result, new TypeReference<Map<String,
+                                  List<Map<String, Object>>>>() {});


return JsonUtil.fromJson(result, type).get("users");

it need to cast

update alignment

javeme · 2021-05-20T06:09:02Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

-                });
+        Map<String, List<Map<String, Object>>> resultMap =
+                JsonUtil.fromJson(result, new TypeReference<Map<String,
+                                  List<Map<String, Object>>>>() {});


update alignment

javeme · 2021-05-20T06:11:54Z

hugegraph-dist/src/assembly/travis/run-api-test.sh


 mvn package -DskipTests
+
+sed -i 's/#auth.authenticator=/auth.authenticator=com.baidu.hugegraph.auth.StandardAuthenticator/' $REST_SERVER_CONF
+sed -i 's/gremlin.graph=.*/gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy/' $CONF


seem no this option

seem no the option named "gremlin.graph"

javeme · 2021-05-21T10:30:15Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

-                      "\", \"user_email\":\"user1@baidu.com\", " +
-                      "\"user_phone\"123456789\", \"user_avatar\":\"image1" +
+                      "\", \"user_email\":\"user1@baidu.com\"," +
+                      "\"user_phone\":123456789,\"user_avatar\":\"image1" +


keep string

javeme · 2021-05-25T08:25:52Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/GremlinApiTest.java

@@ -93,7 +93,13 @@ public void testClearAndInit() {
        assertResponseStatus(200, client().post(path, body));

        body = "{"
-                + "\"gremlin\":\"hugegraph.initBackend()\","
+                + "\"gremlin\":\"import com.baidu.hugegraph.auth.HugeUser;"


can't separate clearBackend and initBackend into 2 parts if enabled auth

javeme · 2021-05-27T11:20:39Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/GremlinApiTest.java

+                + "import com.baidu.hugegraph.util.StringEncoding;"
+                + "hugegraph.clearBackend();"
+                + "hugegraph.initBackend();"
+                + "HugeUser admin = new HugeUser('admin');"


auth = hugegraph.authManager(); admin = auth.findUser('admin'); hugegraph.clearBackend(); hugegraph.initBackend(); auth.createUser(admin);

javeme · 2021-05-27T11:22:07Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/BaseApiTest.java

@@ -52,6 +53,8 @@

    private static String BASE_URL = "http://127.0.0.1:8080";
    private static String GRAPH = "hugegraph";
+    protected static final String USERNAME = "admin";
+    protected static final String PASSWORD = "pa";


set private

javeme · 2021-05-27T11:23:19Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/UserApiTest.java

+                                                             NO_LIMIT));
+        String result = assertResponseStatus(200, r);
+        Map<String, List<Map<String, Object>>> resultMap =
+        JsonUtil.fromJson(result, new TypeReference<Map<String,


improve align

hugegraph-dist/src/assembly/travis/run-api-test.sh

javeme · 2021-05-29T03:09:55Z

hugegraph-test/src/main/java/com/baidu/hugegraph/api/GremlinApiTest.java

                + "hugegraph.clearBackend();"
                + "hugegraph.initBackend();"
-                + "HugeUser admin = new HugeUser('admin');"
-                + "admin.password(StringEncoding.hashPassword('pa'));"
-                + "admin.creator('system');"
                + "hugegraph.hugegraph().authManager().createUser(admin);\","


auth.createUser(admin);

javeme · 2021-05-29T03:11:06Z

hugegraph-dist/src/assembly/travis/run-api-test.sh


 mvn package -DskipTests
+
+sed -i 's/#auth.authenticator=/auth.authenticator=com.baidu.hugegraph.auth.StandardAuthenticator/' $REST_SERVER_CONF
+sed -i 's/gremlin.graph=.*/gremlin.graph=com.baidu.hugegraph.auth.HugeFactoryAuthProxy/' $CONF


seem no the option named "gremlin.graph"

* add user test * open auth properties * fix auth startup of memory backend bug

add user test

9236891

javeme reviewed May 19, 2021

View reviewed changes

coderzc force-pushed the user-graph-api-test branch from 9dfd80b to 96edf75 Compare May 19, 2021 08:55

open auth properties

00b22f6

coderzc force-pushed the user-graph-api-test branch from 96edf75 to 00b22f6 Compare May 19, 2021 09:02

javeme changed the title ~~add user test~~ add user-api test May 19, 2021

javeme reviewed May 19, 2021

View reviewed changes

improve code style

454d51a

coderzc force-pushed the user-graph-api-test branch from 1b961e8 to 454d51a Compare May 19, 2021 11:42

fix shell

d95d5ad

coderzc force-pushed the user-graph-api-test branch from f16fa55 to d95d5ad Compare May 20, 2021 04:35

javeme reviewed May 20, 2021

View reviewed changes

fix test

d47d8cc

javeme reviewed May 21, 2021

View reviewed changes

coderzc added 2 commits May 24, 2021 19:34

fix json

89a69f2

fix test

839b30f

javeme reviewed May 25, 2021

View reviewed changes

fix auth startup of memory backend bug

50e926b

coderzc force-pushed the user-graph-api-test branch from 92fd0eb to 50e926b Compare May 27, 2021 10:27

javeme reviewed May 27, 2021

View reviewed changes

hugegraph-dist/src/assembly/travis/run-api-test.sh Show resolved Hide resolved

improve some comment

c250713

javeme reviewed May 29, 2021

View reviewed changes

improve some comment

4f69663

javeme approved these changes May 31, 2021

View reviewed changes

houzhizhen approved these changes Jun 1, 2021

View reviewed changes

houzhizhen merged commit 461948e into master Jun 1, 2021

houzhizhen deleted the user-graph-api-test branch June 1, 2021 04:31

jadepeng pushed a commit to jadepeng/hugegraph that referenced this pull request Jun 25, 2021

add user-api test (apache#1456)

ab20e5f

* add user test * open auth properties * fix auth startup of memory backend bug

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

add user-api test #1456

add user-api test #1456

coderzc commented May 19, 2021

codecov bot commented May 19, 2021 •

edited

Loading

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

javeme May 19, 2021

coderzc May 19, 2021

javeme May 20, 2021

javeme May 20, 2021

javeme May 20, 2021

javeme May 29, 2021

javeme May 21, 2021

javeme May 25, 2021

javeme May 27, 2021

coderzc May 27, 2021

javeme May 27, 2021

javeme May 27, 2021

javeme May 29, 2021

javeme May 29, 2021

		Response r3 = client().post(path, "{}");
		assertResponseStatus(400, r3);

add user-api test #1456

add user-api test #1456

Conversation

coderzc commented May 19, 2021

codecov bot commented May 19, 2021 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented May 19, 2021 •

edited

Loading