Skip to content

Commit 8f8f6d9

Browse files
rw7rw7
committed
Merge branch 'VaultTrailEndPre' into 'master'
VaultTrail tables renamed - prepare tests See merge request exedio/cope!1898
2 parents 42a8fcd + d157ce2 commit 8f8f6d9

7 files changed

Lines changed: 69 additions & 56 deletions

File tree

‎runtime/testsrc/com/exedio/cope/DataTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import static com.exedio.cope.DataItem.data10;
2424
import static com.exedio.cope.RuntimeAssert.assertData;
2525
import static com.exedio.cope.SchemaInfo.checkVaultTrail;
26+
import static com.exedio.cope.SchemaInfo.getVaultTrailTableName;
2627
import static com.exedio.cope.tojunit.Assert.assertEqualsUnmodifiable;
2728
import static com.exedio.cope.tojunit.Assert.assertFails;
2829
import static org.junit.jupiter.api.Assertions.assertAll;
@@ -472,7 +473,7 @@ private void assertIt(final byte[] expectedData, final DataItem item)
472473
else
473474
{
474475
assertEquals(0, data.checkVaultTrail());
475-
final String trailTab = SchemaInfo.quoteName(model, "VaultTrail_default");
476+
final String trailTab = SchemaInfo.quoteName(model, getVaultTrailTableName(model, "default"));
476477
final String trailHash = SchemaInfo.quoteName(model, "hash");
477478
final String trailLength=SchemaInfo.quoteName(model, "length");
478479
assertEquals(

‎runtime/testsrc/com/exedio/cope/DataVaultInfoTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import static com.exedio.cope.DataField.toValue;
2222
import static com.exedio.cope.PrometheusMeterRegistrar.meter;
2323
import static com.exedio.cope.PrometheusMeterRegistrar.tag;
24+
import static com.exedio.cope.SchemaInfo.getVaultTrailTableName;
2425
import static com.exedio.cope.instrument.Visibility.DEFAULT;
2526
import static com.exedio.cope.instrument.Visibility.NONE;
2627
import static com.exedio.cope.tojunit.TestSources.minimal;
@@ -217,7 +218,7 @@ private static CounterDeferredTester counter(final String name, final Tags tags)
217218

218219
@Test void testSchema()
219220
{
220-
final com.exedio.dsmf.Table tab = model.getSchema().getTable("VaultTrail_default");
221+
final com.exedio.dsmf.Table tab = model.getSchema().getTable(getVaultTrailTableName(model, "default"));
221222
assertNotNull(tab);
222223
assertEquals(
223224
Arrays.asList("hash", "length", "start20", "markPut", "date", "field", "origin"),

‎runtime/testsrc/com/exedio/cope/DataVaultTrailTest.java‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,8 @@ public class DataVaultTrailTest extends TestWithEnvironment
9595
}
9696
private void test(final java.util.function.Function<String, DataField.Value> f) throws SQLException
9797
{
98-
final String trailTab = quoteName(model, "VaultTrail_my_Bucket");
99-
final String trailTabD = quoteName(model, "VaultTrail_default");
98+
final String trailTab = quoteName(model, getVaultTrailTableName(model, "my-Bucket"));
99+
final String trailTabD = quoteName(model, getVaultTrailTableName(model, "default"));
100100
final String trailHash = quoteName(model, "hash");
101101
final String trailLength = quoteName(model, "length");
102102
assertEquals(
@@ -116,30 +116,30 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
116116
assertEquals(0, MyItem.field.checkVaultTrail());
117117
assertEquals(0, MyItem.other.checkVaultTrail());
118118

119-
queryTrail("my_Bucket", rs -> {});
119+
queryTrail("my-Bucket", rs -> {});
120120
queryTrail("default", rs -> {});
121121

122122
final MyItem item = new MyItem(f.apply("abcdef"));
123-
queryTrail("my_Bucket", rs ->
123+
queryTrail("my-Bucket", rs ->
124124
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
125125

126126
item.setField(f.apply("abcdef"));
127-
queryTrail("my_Bucket", rs ->
127+
queryTrail("my-Bucket", rs ->
128128
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
129129

130130
item.setField(f.apply("abcdef"));
131-
queryTrail("my_Bucket", rs ->
131+
queryTrail("my-Bucket", rs ->
132132
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
133133

134134
item.setField(f.apply("abcde0"));
135-
queryTrail("my_Bucket", rs ->
135+
queryTrail("my-Bucket", rs ->
136136
{
137137
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs);
138138
assertRow(abcde0Hash, 3, "abcde0", "MyItem.field", rs);
139139
});
140140

141141
item.setField(f.apply("abcde01234"));
142-
queryTrail("my_Bucket", rs ->
142+
queryTrail("my-Bucket", rs ->
143143
{
144144
assertRow(abcde01234Hash, 5, "abcde01234", "MyItem.field", rs);
145145
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs);
@@ -150,7 +150,7 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
150150
item.setOther(f.apply("abcdef"));
151151
queryTrail("default", rs ->
152152
assertRow(abcdefHash, 3, "abcdef", "MyItem.other", rs));
153-
queryTrail("my_Bucket", rs ->
153+
queryTrail("my-Bucket", rs ->
154154
{
155155
assertRow(abcde01234Hash, 5, "abcde01234", "MyItem.field", rs);
156156
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs);
@@ -163,13 +163,13 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
163163

164164
@Test void testEmpty() throws SQLException
165165
{
166-
queryTrail("my_Bucket", rs -> {});
166+
queryTrail("my-Bucket", rs -> {});
167167
queryTrail("default", rs -> {});
168168
assertEquals(0, MyItem.field.checkVaultTrail());
169169
assertEquals(0, MyItem.other.checkVaultTrail());
170170

171171
new MyItem(toValue(decodeLower("")));
172-
queryTrail("my_Bucket", rs ->
172+
queryTrail("my-Bucket", rs ->
173173
assertRow(emptyHash, 0, "", "MyItem.field", rs));
174174
queryTrail("default", rs -> {});
175175
assertEquals(0, MyItem.field.checkVaultTrail());
@@ -178,18 +178,18 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
178178

179179
@Test void testRedundant() throws SQLException
180180
{
181-
queryTrail("my_Bucket", rs -> {});
181+
queryTrail("my-Bucket", rs -> {});
182182
assertEquals(0, MyItem.field.checkVaultTrail());
183183
assertEquals(0, MyItem.other.checkVaultTrail());
184184

185185
final MyItem item = new MyItem(toValue(decodeLower("abcdef")));
186-
queryTrail("my_Bucket", rs ->
186+
queryTrail("my-Bucket", rs ->
187187
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
188188
assertEquals(0, MyItem.field.checkVaultTrail());
189189
assertEquals(0, MyItem.other.checkVaultTrail());
190190

191191
item.setField(toValue(decodeLower("abcdef")));
192-
queryTrail("my_Bucket", rs ->
192+
queryTrail("my-Bucket", rs ->
193193
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
194194
assertEquals(0, MyItem.field.checkVaultTrail());
195195
assertEquals(0, MyItem.other.checkVaultTrail());
@@ -198,18 +198,18 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
198198
@Test void testIncomplete() throws SQLException
199199
{
200200
final MyItem item = new MyItem(toValue(decodeLower("abcdef")));
201-
queryTrail("my_Bucket", rs ->
201+
queryTrail("my-Bucket", rs ->
202202
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
203203
assertEquals(0, MyItem.field.checkVaultTrail());
204204
assertEquals(0, MyItem.other.checkVaultTrail());
205205

206-
updateTrail("DELETE FROM " + quoteName(model, "VaultTrail_my_Bucket"));
207-
queryTrail("my_Bucket", rs -> {});
206+
updateTrail("DELETE FROM " + quoteName(model, getVaultTrailTableName(model, "my-Bucket")));
207+
queryTrail("my-Bucket", rs -> {});
208208
assertEquals(1, MyItem.field.checkVaultTrail());
209209
assertEquals(0, MyItem.other.checkVaultTrail());
210210

211211
item.setField(toValue(decodeLower("abcdef")));
212-
queryTrail("my_Bucket", rs ->
212+
queryTrail("my-Bucket", rs ->
213213
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
214214
assertEquals(0, MyItem.field.checkVaultTrail());
215215
assertEquals(0, MyItem.other.checkVaultTrail());
@@ -218,52 +218,52 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
218218
@Test void testLengthExceeded() throws SQLException
219219
{
220220
new MyItem(toValue(decodeLower("abcdef")));
221-
queryTrail("my_Bucket", rs ->
221+
queryTrail("my-Bucket", rs ->
222222
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
223223
assertEquals(0, MyItem.field.checkVaultTrail());
224224
assertEquals(0, MyItem.other.checkVaultTrail());
225225

226226
updateTrail(
227-
"UPDATE " + quoteName(model, "VaultTrail_my_Bucket") + " " +
227+
"UPDATE " + quoteName(model, getVaultTrailTableName(model, "my-Bucket")) + " " +
228228
"SET " + quoteName(model, "length") + "=" + (MyItem.field.getMaximumLength()+1) + " " +
229229
"WHERE " + quoteName(model, "hash") + "='" + abcdefHash + "'");
230-
queryTrail("my_Bucket", rs ->
230+
queryTrail("my-Bucket", rs ->
231231
assertRow(abcdefHash, toIntExact(MyItem.field.getMaximumLength())+1, "abcdef", "MyItem.field", rs));
232232
assertEquals(1, MyItem.field.checkVaultTrail());
233233
assertEquals(0, MyItem.other.checkVaultTrail());
234234

235235
updateTrail(
236-
"UPDATE " + quoteName(model, "VaultTrail_my_Bucket") + " " +
236+
"UPDATE " + quoteName(model, getVaultTrailTableName(model, "my-Bucket")) + " " +
237237
"SET " + quoteName(model, "length") + "=" + MyItem.field.getMaximumLength() + " " +
238238
"WHERE " + quoteName(model, "hash") + "='" + abcdefHash + "'");
239-
queryTrail("my_Bucket", rs ->
239+
queryTrail("my-Bucket", rs ->
240240
assertRow(abcdefHash, toIntExact(MyItem.field.getMaximumLength()), "abcdef", "MyItem.field", rs));
241241
assertEquals(0, MyItem.field.checkVaultTrail());
242242
assertEquals(0, MyItem.other.checkVaultTrail());
243243
}
244244

245245
@Test void testCollision() throws SQLException
246246
{
247-
queryTrail("my_Bucket", rs -> {});
247+
queryTrail("my-Bucket", rs -> {});
248248

249249
final MyItem item = new MyItem(toValue(decodeLower("abcdef")));
250-
queryTrail("my_Bucket", rs ->
250+
queryTrail("my-Bucket", rs ->
251251
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
252252

253253
final VaultMockService vs = (VaultMockService)deresiliate(model.connect().vault("my-Bucket").service);
254254
assertNotNull(vs);
255255
vs.clear();
256256
item.setField(toValue(decodeLower("abcdef")));
257-
queryTrail("my_Bucket", rs ->
257+
queryTrail("my-Bucket", rs ->
258258
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
259259
}
260260

261261
@Test void testStartOverflow() throws SQLException
262262
{
263-
queryTrail("my_Bucket", rs -> {});
263+
queryTrail("my-Bucket", rs -> {});
264264

265265
new MyItem(toValue(decodeLower("0001020304050607080900010203040506070809ab")));
266-
queryTrail("my_Bucket", rs ->
266+
queryTrail("my-Bucket", rs ->
267267
assertRow(
268268
"64551e4605d5b8973ddee826d90e0841b06dc933cf7874b81632cc0e67176d70a319ae6fe7b23bb400f0704be45abb3aa74eb29df34753c390bef492bff3baf5",
269269
21,
@@ -272,10 +272,10 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
272272

273273
@Test void testStartOverflowAlmost() throws SQLException
274274
{
275-
queryTrail("my_Bucket", rs -> {});
275+
queryTrail("my-Bucket", rs -> {});
276276

277277
new MyItem(toValue(decodeLower("0001020304050607080900010203040506070809")));
278-
queryTrail("my_Bucket", rs ->
278+
queryTrail("my-Bucket", rs ->
279279
assertRow(
280280
"7d1e2e25f25b9861f2cd8682301aa19cae07c8aa304418040d05c8926bc6ea995c923c0c5628c668980b099385f4ba58dc94e623f72f2d70cb24baf83636ce8c",
281281
20,
@@ -285,50 +285,50 @@ private void test(final java.util.function.Function<String, DataField.Value> f)
285285
@Test void testMarkPutInitial() throws SQLException
286286
{
287287
assertEquals(false, model.isVaultRequiredToMarkPut("my-Bucket"));
288-
queryTrail("my_Bucket", rs -> {});
288+
queryTrail("my-Bucket", rs -> {});
289289

290290
model.setVaultRequiredToMarkPut("my-Bucket", true);
291291
assertEquals(true, model.isVaultRequiredToMarkPut("my-Bucket"));
292292

293293
final MyItem item = new MyItem(toValue(decodeLower("abcdef")));
294-
queryTrail("my_Bucket", rs ->
294+
queryTrail("my-Bucket", rs ->
295295
assertRow(abcdefHash, 3, "abcdef", 1, "MyItem.field", rs));
296296

297297
item.setField(toValue(decodeLower("abcdef")));
298-
queryTrail("my_Bucket", rs ->
298+
queryTrail("my-Bucket", rs ->
299299
assertRow(abcdefHash, 3, "abcdef", 1, "MyItem.field", rs));
300300
}
301301

302302
@Test void testMarkPutRedundant() throws SQLException
303303
{
304304
assertEquals(false, model.isVaultRequiredToMarkPut("my-Bucket"));
305-
queryTrail("my_Bucket", rs -> {});
305+
queryTrail("my-Bucket", rs -> {});
306306

307307
final MyItem item = new MyItem(toValue(decodeLower("abcdef")));
308-
queryTrail("my_Bucket", rs ->
308+
queryTrail("my-Bucket", rs ->
309309
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
310310

311311
model.setVaultRequiredToMarkPut("my-Bucket", true);
312312
assertEquals(true, model.isVaultRequiredToMarkPut("my-Bucket"));
313313

314314
item.setField(toValue(decodeLower("abcdef")));
315-
queryTrail("my_Bucket", rs ->
315+
queryTrail("my-Bucket", rs ->
316316
assertRow(abcdefHash, 3, "abcdef", 1, "MyItem.field", rs));
317317
}
318318

319319
@Test void testFieldLong() throws SQLException
320320
{
321-
queryTrail("my_Bucket", rs -> {});
321+
queryTrail("my-Bucket", rs -> {});
322322

323323
final MyItem item = new MyItem(toValue(decodeLower("abcdef")));
324-
queryTrail("my_Bucket", rs ->
324+
queryTrail("my-Bucket", rs ->
325325
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs));
326326

327327
final String field = "MyItem.veryLong0123456789012345678901234567890123456789012345678901234567890 ...";
328328
assertEquals(80, field.length());
329329

330330
item.setVeryLong(toValue(decodeLower("abcde0")));
331-
queryTrail("my_Bucket", rs ->
331+
queryTrail("my-Bucket", rs ->
332332
{
333333
assertRow(abcdefHash, 3, "abcdef", "MyItem.field", rs);
334334
assertRow(abcde0Hash, 3, "abcde0", field, rs);
@@ -344,7 +344,7 @@ private void queryTrail(final String bucket, final SQLRunnable runnable) throws
344344
final String txName = model.currentTransaction().getName();
345345
model.commit();
346346
try(ResultSet rs = connection.executeQuery(
347-
"SELECT * FROM " + quoteName(model, "VaultTrail_" + bucket) + " " +
347+
"SELECT * FROM " + quoteName(model, getVaultTrailTableName(model, bucket)) + " " +
348348
"ORDER BY " + quoteName(model, "hash")))
349349
{
350350
final ResultSetMetaData md = rs.getMetaData();
@@ -496,8 +496,8 @@ void beforeEach() throws SQLException
496496
assertEquals(true, vaultProperties.isAppliedToAllFields(), "isAppliedToAllFields required by test");
497497
model.setVaultRequiredToMarkPut("my-Bucket", false);
498498
model.setVaultRequiredToMarkPut("default", false);
499-
connection.executeUpdate("DELETE FROM " + quoteName(model, "VaultTrail_my_Bucket"));
500-
connection.executeUpdate("DELETE FROM " + quoteName(model, "VaultTrail_default"));
499+
connection.executeUpdate("DELETE FROM " + quoteName(model, getVaultTrailTableName(model, "my-Bucket")));
500+
connection.executeUpdate("DELETE FROM " + quoteName(model, getVaultTrailTableName(model, "default")));
501501
model.startTransaction(DataVaultTrailTest.class.getName());
502502
}
503503

‎runtime/testsrc/com/exedio/cope/ItemModificationTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.exedio.cope;
22

3+
import static com.exedio.cope.SchemaInfo.getVaultTrailTableName;
34
import static com.exedio.cope.instrument.Visibility.DEFAULT;
45
import static com.exedio.cope.instrument.Visibility.NONE;
56
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -479,7 +480,7 @@ public void onStatement(final String sql,
479480
final long durationRead,
480481
final long durationClose)
481482
{
482-
final String trailTab = SchemaInfo.quoteName(model, "VaultTrail_default");
483+
final String trailTab = SchemaInfo.quoteName(model, getVaultTrailTableName(model, "default"));
483484
if (sql.startsWith("MERGE INTO " + trailTab)
484485
|| sql.startsWith("INSERT INTO " + trailTab))
485486
return;

‎runtime/testsrc/com/exedio/cope/SchemaMismatchTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
package com.exedio.cope;
2020

21+
import static com.exedio.cope.SchemaInfo.getVaultTrailTableName;
2122
import static com.exedio.dsmf.TableTest.getError;
2223
import static java.util.Objects.requireNonNull;
2324
import static org.junit.jupiter.api.Assertions.assertAll;
@@ -198,7 +199,7 @@ protected List<Table> withTrail(
198199
return plain;
199200

200201
// insert trailTable before the first unused table, or append to the end if there is no unused table
201-
final Table trailTable = schema.getTable("VaultTrail_default");
202+
final Table trailTable = schema.getTable(getVaultTrailTableName(model, "default"));
202203
assertNotNull(trailTable);
203204
final ArrayList<Table> withTrail = new ArrayList<>();
204205
boolean done = false;

0 commit comments

Comments
 (0)