Skip to content

Commit

Permalink
Auth bugfix test adapt (#94)
Browse files Browse the repository at this point in the history 
* adapt test for server #1134

Change-Id: Idf1848859cb5fcb80323320f88c7c208bf9b0854
  • Loading branch information
@javeme
javeme authored Aug 15, 2020
1 parent 5d69129 commit b510013
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 58 deletions.
1 change: 0 additions & 1 deletion src/main/java/com/baidu/hugegraph/driver/HugeClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import javax.ws.rs.ProcessingException;

import com.baidu.hugegraph.client.RestClient;
import com.baidu.hugegraph.exception.ServerException;
import com.baidu.hugegraph.rest.ClientException;
import com.baidu.hugegraph.util.VersionUtil;
import com.baidu.hugegraph.version.ClientVersion;
Expand Down
52 changes: 26 additions & 26 deletions src/test/java/com/baidu/hugegraph/api/BatchUpdateElementApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ public void testVertexBatchUpdateWithInvalidArgs() {
vertexAPI.update(req2);
}, e -> {
String expect = "Parameter 'vertices' can't be null";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req3 = batchVertexRequest("list", "old", "old",
Expand All @@ -248,7 +248,7 @@ public void testVertexBatchUpdateWithInvalidArgs() {
vertexAPI.update(req3);
}, e -> {
String expect = "The number of vertices can't be 0";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req4 = batchVertexRequest("list", "old", "old",
Expand All @@ -259,7 +259,7 @@ public void testVertexBatchUpdateWithInvalidArgs() {
}, e -> {
String expect = "Parameter 'create_if_not_exist' " +
"dose not support false now";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req5 = batchVertexRequest("list", "old", "old",
Expand All @@ -269,7 +269,7 @@ public void testVertexBatchUpdateWithInvalidArgs() {
vertexAPI.update(req5);
}, e -> {
String expect = "Parameter 'update_strategies' can't be empty";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req6 = batchVertexRequest("list", "old", "old",
Expand All @@ -280,7 +280,7 @@ public void testVertexBatchUpdateWithInvalidArgs() {
vertexAPI.update(req6);
}, e -> {
String expect = "Parameter 'update_strategies' can't be empty";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
}

Expand All @@ -293,7 +293,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Number for strategy SUM, " +
"but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req2 = batchVertexRequest("name", "old", "new",
Expand All @@ -303,7 +303,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Date or Number " +
"for strategy BIGGER, but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req3 = batchVertexRequest("name", "old", "new",
Expand All @@ -313,7 +313,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Date or Number " +
"for strategy SMALLER, but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req4 = batchVertexRequest("price", 1, -1,
Expand All @@ -323,7 +323,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List " +
"for strategy UNION, but got type Integer, Integer";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req5 = batchVertexRequest("date", "old", "new",
Expand All @@ -333,7 +333,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List for " +
"strategy INTERSECTION, but got type Date, Long";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req6 = batchVertexRequest("price", 1, -1,
Expand All @@ -343,7 +343,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List for " +
"strategy APPEND, but got type Integer, Integer";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchVertexRequest req7 = batchVertexRequest("name", "old", "new",
Expand All @@ -353,7 +353,7 @@ public void testVertexInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List for " +
"strategy ELIMINATE, but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
}

Expand Down Expand Up @@ -508,7 +508,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
edgeAPI.update(req1);
}, e -> {
String expect = "The batch body can't contain null record";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req2 = batchEdgeRequest("list", "old", "old",
Expand All @@ -518,7 +518,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
edgeAPI.update(req2);
}, e -> {
String expect = "Parameter 'edges' can't be null";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req3 = batchEdgeRequest("list", "old", "old",
Expand All @@ -528,7 +528,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
edgeAPI.update(req3);
}, e -> {
String expect = "The number of edges can't be 0";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req4 = batchEdgeRequest("list", "old", "old",
Expand All @@ -539,7 +539,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
}, e -> {
String expect = "Parameter 'create_if_not_exist' " +
"dose not support false now";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req5 = batchEdgeRequest("list", "old", "old",
Expand All @@ -549,7 +549,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
edgeAPI.update(req5);
}, e -> {
String expect = "Parameter 'update_strategies' can't be empty";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req6 = batchEdgeRequest("list", "old", "old",
Expand All @@ -560,7 +560,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
edgeAPI.update(req6);
}, e -> {
String expect = "Parameter 'update_strategies' can't be empty";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req7 = batchEdgeRequest("list", "old", "old",
Expand All @@ -572,7 +572,7 @@ public void testEdgeBatchUpdateWithInvalidArgs() {
edgeAPI.update(req7);
}, e -> {
String expect = "Too many edges for one time post";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
}

Expand All @@ -585,7 +585,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Number for strategy SUM, " +
"but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req2 = batchEdgeRequest("name", "old", "new",
Expand All @@ -595,7 +595,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Date or Number " +
"for strategy BIGGER, but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req3 = batchEdgeRequest("name", "old", "new",
Expand All @@ -605,7 +605,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Date or Number " +
"for strategy SMALLER, but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req4 = batchEdgeRequest("price", 1, -1,
Expand All @@ -615,7 +615,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List " +
"for strategy UNION, but got type Integer, Integer";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req5 = batchEdgeRequest("date", "old", "new",
Expand All @@ -625,7 +625,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List for " +
"strategy INTERSECTION, but got type Date, Long";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req6 = batchEdgeRequest("price", 1, -1,
Expand All @@ -635,7 +635,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List for " +
"strategy APPEND, but got type Integer, Integer";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});

BatchEdgeRequest req7 = batchEdgeRequest("name", "old", "new",
Expand All @@ -645,7 +645,7 @@ public void testEdgeInvalidUpdateStrategy() {
}, e -> {
String expect = "Property type must be Set or List for " +
"strategy ELIMINATE, but got type String, String";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
}

Expand Down
16 changes: 8 additions & 8 deletions src/test/java/com/baidu/hugegraph/api/EdgeApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,6 @@ public void testAddEdgeWithTtl() {
Assert.assertThrows(ServerException.class, () -> {
graph().getEdge(edge.id());
}, e -> {
Assert.assertContains("edge with id", e.getMessage());
Assert.assertContains("does not exist", e.getMessage());
});
}
Expand Down Expand Up @@ -384,7 +383,6 @@ public void testAddEdgeWithTtlAndTtlStartTime() {
Assert.assertThrows(ServerException.class, () -> {
graph().getEdge(edge.id());
}, e -> {
Assert.assertContains("edge with id", e.getMessage());
Assert.assertContains("does not exist", e.getMessage());
});
}
Expand Down Expand Up @@ -675,9 +673,12 @@ public void testGetNotExist() {
// TODO: id to be modified
edgeAPI.get(edgeId);
}, e -> {
String expect = String.format("edge with id '%s' does not exist",
edgeId);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains("Edge id must be formatted as 4~5 parts, " +
"but got 1 parts: 'not-exist-edge-id'",
e.getMessage());
Assert.assertInstanceOf(ServerException.class, e);
Assert.assertContains("NotFoundException",
((ServerException) e).exception());
});
}

Expand Down Expand Up @@ -738,9 +739,8 @@ public void testDelete() {
Assert.assertThrows(ServerException.class, () -> {
edgeAPI.get(id);
}, e -> {
String expect = String.format("edge with id '%s' does not exist",
id);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
String expect = String.format("Edge '%s' does not exist", id);
Assert.assertContains(expect, e.getMessage());
});
}

Expand Down
13 changes: 7 additions & 6 deletions src/test/java/com/baidu/hugegraph/api/IndexLabelApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ public void testCreateSecondaryIndexOnMultiPropertiesOverrideExist() {
}, e -> {
String expect = String.format("index label with name '%s' does " +
"not exist", personByCityAndAge);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
schema().indexLabel(personByCityAndAge)
.onV("person")
Expand All @@ -183,7 +183,7 @@ public void testCreateSecondaryIndexOnMultiPropertiesOverrideExist() {
}, e -> {
String expect = String.format("index label with name '%s' does " +
"not exist", personByCity);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
indexLabelAPI.get(personByCityAndAge);
}
Expand All @@ -203,7 +203,7 @@ public void testCreateShardIndexOnMultiPropertiesOverrideExist() {
}, e -> {
String expect = String.format("index label with name '%s' does " +
"not exist", personByCityAndAge);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
schema().indexLabel(personByCityAndAge)
.onV("person")
Expand All @@ -215,7 +215,7 @@ public void testCreateShardIndexOnMultiPropertiesOverrideExist() {
}, e -> {
String expect = String.format("index label with name '%s' does " +
"not exist", personByCity);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
indexLabelAPI.get(personByCityAndAge);
}
Expand Down Expand Up @@ -336,7 +336,7 @@ public void testDelete() {
}, e -> {
String expect = String.format("index label with name '%s' does " +
"not exist", name);
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
}

Expand Down Expand Up @@ -479,7 +479,8 @@ public void testAddIndexLabelWithRebuildFalse() {
null, 10).results();
Assert.assertEquals(0, vertices.size());

rebuildAPI.rebuild(personByAge);
long taskId = rebuildAPI.rebuild(personByAge);
waitUntilTaskCompleted(taskId);

vertices = vertexAPI.list("person", properties, 0, null, 10)
.results();
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/baidu/hugegraph/api/VertexApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,6 @@ public void testCreateVertexWithTtl() {
Assert.assertThrows(ServerException.class, () -> {
graph().getVertex(vertex.id());
}, e -> {
Assert.assertContains("vertex with id", e.getMessage());
Assert.assertContains("does not exist", e.getMessage());
});
}
Expand Down Expand Up @@ -326,7 +325,6 @@ public void testCreateVertexWithTtlAndTtlStartTime() {
Assert.assertThrows(ServerException.class, () -> {
graph().getVertex(vertex.id());
}, e -> {
Assert.assertContains("vertex with id", e.getMessage());
Assert.assertContains("does not exist", e.getMessage());
});
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/baidu/hugegraph/api/traverser/AllShortestPathsApiTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ public void testShortestPathWithCapacity() {
0L, 10L);
}, e -> {
String expect = "Exceed capacity '10' while finding shortest path";
Assert.assertTrue(e.toString(), e.getMessage().contains(expect));
Assert.assertContains(expect, e.getMessage());
});
}

Expand Down
Loading

0 comments on commit b510013

Please sign in to comment.