bitflicker64 commented on code in PR #805: URL: https://github.com/apache/hugegraph-toolchain/pull/805#discussion_r4255561644
########## hugegraph-client/src/test/java/org/apache/hugegraph/unit/JsonUtilTest.java: ########## @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + */ + +package org.apache.hugegraph.unit; + +import java.util.Map; + +import org.apache.hugegraph.rest.SerializeException; +import org.apache.hugegraph.structure.graph.Vertex; +import org.apache.hugegraph.testutil.Assert; +import org.apache.hugegraph.util.JsonUtil; +import org.junit.Test; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; + +public class JsonUtilTest extends BaseUnitTest { Review Comment: Important: this head does not merge into `master`. #577 landed on master as 8e6ed847 and added its own `hugegraph-client/src/test/java/org/apache/hugegraph/unit/JsonUtilTest.java` and its own `JsonUtilTest.class` entry in `UnitTestSuite`. Evidence: `gh pr view 805 --json mergeable` reports `CONFLICTING`, and `git merge-tree --write-tree origin/master 1b962641` (master at 8e6ed847) reports `CONFLICT (add/add)` for `JsonUtilTest.java` and `CONFLICT (content)` for `UnitTestSuite.java`. No other path conflicts. The two classes also differ in shape: master's is a plain class on `org.junit.Assert` with `testToJson`, `testFromJson`, `testConvertValue` and three `testFromJson2List*` cases, while this one extends `BaseUnitTest`, uses `org.apache.hugegraph.testutil.Assert`, and also declares `testConvertValue()` (line 81), so the two bodies cannot be concatenated as they are. Requested change: rebase onto current master, fold these five cases into master's `JsonUtilTest` (rename this `testConvertValue`, for example to `testConvertValueErrors`, and keep the `fromJson2List` cases), and keep a single `JsonUtilTest.class` entry in `UnitTestSuite`. The green checks on this head predate 8e6ed847, so `client-ci` needs to run again on the rebased head. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
