8000 Fix tests for cluster · machak/arangodb-java-driver@ea4e4ab · GitHub
[go: up one dir, main page]
Skip to content

Commit ea4e4ab

Browse files
author
mpv1989
committed
Fix tests for cluster
1 parent 4878169 commit ea4e4ab

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

‎src/test/java/com/arangodb/ArangoSearchTest.java

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,19 @@
2727

2828
import java.util.Collection;
2929

30+
import org.junit.After;
3031
import org.junit.Test;
3132
import org.junit.runner.RunWith;
3233
import org.junit.runners.Parameterized;
3334

3435
import com.arangodb.ArangoDB.Builder;
36+
import com.arangodb.entity.ServerRole;
3537
import com.arangodb.entity.ViewEntity;
3638
import com.arangodb.entity.ViewType;
3739
import com.arangodb.entity.arangosearch.ArangoSearchPropertiesEntity;
3840
import com.arangodb.entity.arangosearch.CollectionLink;
39-
import com.arangodb.entity.arangosearch.ConsolidationType;
4041
import com.arangodb.entity.arangosearch.ConsolidationPolicy;
42+
import com.arangodb.entity.arangosearch.ConsolidationType;
4143
import com.arangodb.entity.arangosearch.FieldLink;
4244
import com.arangodb.entity.arangosearch.StoreValuesType;
4345
import com.arangodb.model.arangosearch.ArangoSearchCreateOptions;
@@ -54,8 +56,13 @@ public class ArangoSearchTest extends BaseTest {
5456

5557
public ArangoSearchTest(final Builder builder) {
5658
super(builder);
57-
if (requireVersion(3, 4)) {
58-
db.createArangoSearch(VIEW_NAME, new ArangoSearchCreateOptions());
59+
}
60+
61+
@After
62+
public void teardown() {
63+
try {
64+
db.view(VIEW_NAME).drop();
65+
} catch (final ArangoDBException e) {
5966
}
6067
}
6168

@@ -64,6 +71,7 @@ public void exists() {
6471
if (!requireVersion(3, 4)) {
6572
return;
6673
}
74+
db.createArangoSearch(VIEW_NAME, new ArangoSearchCreateOptions());
6775
assertThat(db.arangoSearch(VIEW_NAME).exists(), is(true));
6876
}
6977

@@ -72,6 +80,7 @@ public void getInfo() {
7280
if (!requireVersion(3, 4)) {
7381
return;
7482
}
83+
db.createArangoSearch(VIEW_NAME, new ArangoSearchCreateOptions());
7584
final ViewEntity info = db.arangoSearch(VIEW_NAME).getInfo();
7685
assertThat(info, is(not(nullValue())));
7786
assertThat(info.getId(), is(not(nullValue())));
@@ -84,67 +93,65 @@ public void drop() {
8493
if (!requireVersion(3, 4)) {
8594
return;
8695
}
87-
final String name = VIEW_NAME + "_droptest";
88-
db.createArangoSearch(name, new ArangoSearchCreateOptions());
89-
final ArangoView view = db.arangoSearch(name);
96+
db.createArangoSearch(VIEW_NAME, new ArangoSearchCreateOptions());
97+
final ArangoView view = db.arangoSearch(VIEW_NAME);
9098
view.drop();
9199
assertThat(view.exists(), is(false));
92100
}
93101

94102
@Test
95103
public void rename() {
104+
if (arangoDB.getRole() != ServerRole.SINGLE) {
105+
return;
106+
}
96107
if (!requireVersion(3, 4)) {
97108
return;
98109
}
99-
final String name = VIEW_NAME + "_renametest";
100-
final String newName = name + "_new";
110+
final String name = VIEW_NAME + "_new";
101111
db.createArangoSearch(name, new ArangoSearchCreateOptions());
102-
db.arangoSearch(name).rename(newName);
112+
db.arangoSearch(name).rename(VIEW_NAME);
103113
assertThat(db.arangoSearch(name).exists(), is(false));
104-
assertThat(db.arangoSearch(newName).exists(), is(true));
114+
assertThat(db.arangoSearch(VIEW_NAME).exists(), is(true));
105115
}
106116

107117
@Test
108118
public void create() {
109119
if (!requireVersion(3, 4)) {
110120
return;
111121
}
112-
final String name = VIEW_NAME + "_createtest";
113-
final ViewEntity info = db.arangoSearch(name).create();
122+
final ViewEntity info = db.arangoSearch(VIEW_NAME).create();
114123
assertThat(info, is(not(nullValue())));
115124
assertThat(info.getId(), is(not(nullValue())));
116-
assertThat(info.getName(), is(name));
125+
assertThat(info.getName(), is(VIEW_NAME));
117126
assertThat(info.getType(), is(ViewType.ARANGO_SEARCH));
118-
assertThat(db.arangoSearch(name).exists(), is(true));
127+
assertThat(db.arangoSearch(VIEW_NAME).exists(), is(true));
119128
}
120129

121130
@Test
122131
public void createWithOptions() {
123132
if (!requireVersion(3, 4)) {
124133
return;
125134
}
126-
final String name = VIEW_NAME + "_createtest";
127135
final ArangoSearchCreateOptions options = new ArangoSearchCreateOptions();
128-
final ViewEntity info = db.arangoSearch(name).create(options);
136+
final ViewEntity info = db.arangoSearch(VIEW_NAME).create(options);
129137
assertThat(info, is(not(nullValue())));
130138
assertThat(info.getId(), is(not(nullValue())));
131-
assertThat(info.getName(), is(name));
139+
assertThat(info.getName(), is(VIEW_NAME));
132140
assertThat(info.getType(), is(ViewType.ARANGO_SEARCH));
133-
assertThat(db.arangoSearch(name).exists(), is(true));
141+
assertThat(db.arangoSearch(VIEW_NAME).exists(), is(true));
134142
}
135143

136144
@Test
137145
public void getProperties() {
138146
if (!requireVersion(3, 4)) {
139147
return;
140148
}
141-
final String name = VIEW_NAME + "_getpropertiestest";
142-
final ArangoSearch view = db.arangoSearch(name);
149+
final ArangoSearch view = db.arangoSearch(VIEW_NAME);
143150
view.create(new ArangoSearchCreateOptions());
144151
final ArangoSearchPropertiesEntity properties = view.getProperties();
145152
assertThat(properties, is(not(nullValue())));
146153
assertThat(properties.getId(), is(not(nullValue())));
147-
assertThat(properties.getName(), is(name));
154+
assertThat(properties.getName(), is(VIEW_NAME));
148155
assertThat(properties.getType(), is(ViewType.ARANGO_SEARCH));
149156
assertThat(properties.getConsolidationIntervalMsec(), is(not(nullValue())));
150157
assertThat(properties.getCleanupIntervalStep(), is(not(nullValue())));
@@ -160,8 +167,7 @@ public void updateProperties() {
160167
return;
161168
}
162169
db.createCollection("view_update_prop_test_collection");
163-
final String name = VIEW_NAME + "_updatepropertiestest";
164-
final ArangoSearch view = db.arangoSearch(name);
170+
final ArangoSearch view = db.arangoSearch(VIEW_NAME);
165171
view.create(new ArangoSearchCreateOptions());
166172
final ArangoSearchPropertiesOptions options = new ArangoSearchPropertiesOptions();
167173
options.cleanupIntervalStep(15L);
@@ -195,8 +201,7 @@ public void replaceProperties() {
195201
return;
196202
}
197203
db.createCollection("view_replace_prop_test_collection");
198-
final String name = VIEW_NAME + "_updatepropertiestest";
199-
final ArangoSearch view = db.arangoSearch(name);
204+
final ArangoSearch view = db.arangoSearch(VIEW_NAME);
200205
view.create(new ArangoSearchCreateOptions());
201206
final ArangoSearchPropertiesOptions options = new ArangoSearchPropertiesOptions();
202207
options.link(

0 commit comments

Comments
 (0)
0