Skip to content

Commit 8cfd2f5

Browse files
mediumTajmediumTaj
committed
test(Discovery): Revise discovery test so collectionID is not reused
1 parent 3ee86ad commit 8cfd2f5

File tree

1 file changed

+42
-54
lines changed

1 file changed

+42
-54
lines changed

‎test/IBM.WatsonDeveloperCloud.Discovery.v1.IntegrationTests/DiscoveryIntegrationTests.cs‎

Lines changed: 42 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ public class DiscoveryIntegrationTests
4141

4242
private static string _environmentId;
4343
private static string _createdConfigurationId;
44-
private static string _createdCollectionId;
4544
private static string _createdDocumentId;
4645
private static string _createdTrainingQueryId;
4746
private static string _createdTrainingExampleId;
@@ -164,8 +163,7 @@ public void TestCollections_Success()
164163
Configuration configuration = new Configuration()
165164
{
166165
Name = _createdConfigurationName,
167-
Description = _createdConfigurationDescription,
168-
166+
Description = _createdConfigurationDescription
169167
};
170168

171169
var createConfigurationResults = CreateConfiguration(_environmentId, configuration);
@@ -176,13 +174,12 @@ public void TestCollections_Success()
176174
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
177175
{
178176
Language = _createdCollectionLanguage,
179-
Name = _createdCollectionName,
180-
Description = _createdCollectionDescription,
181-
ConfigurationId = _createdConfigurationId
177+
Name = _createdCollectionName + "-" + Guid.NewGuid(),
178+
Description = _createdCollectionDescription
182179
};
183180

184181
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
185-
_createdCollectionId = createCollectionResult.CollectionId;
182+
var _createdCollectionId = createCollectionResult.CollectionId;
186183

187184
var getCollectionResult = GetCollection(_environmentId, _createdCollectionId);
188185

@@ -259,13 +256,12 @@ public void TestDocuments_Success()
259256
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
260257
{
261258
Language = _createdCollectionLanguage,
262-
Name = _createdCollectionName,
263-
Description = _createdCollectionDescription,
264-
ConfigurationId = _createdConfigurationId
259+
Name = _createdCollectionName + "-" + Guid.NewGuid(),
260+
Description = _createdCollectionDescription
265261
};
266262

267263
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
268-
_createdCollectionId = createCollectionResult.CollectionId;
264+
var _createdCollectionId = createCollectionResult.CollectionId;
269265

270266
DocumentAccepted addDocumentResult;
271267
using (FileStream fs = File.OpenRead(_filepathToIngest))
@@ -320,13 +316,12 @@ public void TestQuery()
320316
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
321317
{
322318
Language = _createdCollectionLanguage,
323-
Name = _createdCollectionName,
324-
Description = _createdCollectionDescription,
325-
ConfigurationId = _createdConfigurationId
319+
Name = _createdCollectionName + "-" + Guid.NewGuid(),
320+
Description = _createdCollectionDescription
326321
};
327322

328323
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
329-
_createdCollectionId = createCollectionResult.CollectionId;
324+
var _createdCollectionId = createCollectionResult.CollectionId;
330325

331326
DocumentAccepted addDocumentResult;
332327
using (FileStream fs = File.OpenRead(_filepathToIngest))
@@ -371,33 +366,31 @@ public void TestGetNotices()
371366
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
372367
{
373368
Language = _createdCollectionLanguage,
374-
Name = _createdCollectionName,
375-
Description = _createdCollectionDescription,
376-
ConfigurationId = _createdConfigurationId
369+
Name = _createdCollectionName + "-" + Guid.NewGuid(),
370+
Description = _createdCollectionDescription
377371
};
378372

379373
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
380-
_createdCollectionId = createCollectionResult.CollectionId;
374+
var noticesCollectionId = createCollectionResult.CollectionId;
381375

382376
DocumentAccepted addDocumentResult;
383377
using (FileStream fs = File.OpenRead(_filepathToIngest))
384378
{
385-
addDocumentResult = AddDocument(_environmentId, _createdCollectionId, fs, _metadata);
379+
addDocumentResult = AddDocument(_environmentId, noticesCollectionId, fs, _metadata);
386380
_createdDocumentId = addDocumentResult.DocumentId;
387381
}
388382

389-
var queryResult = Query(_environmentId, _createdCollectionId, null, null, _naturalLanguageQuery);
390-
var queryNoticesResult = QueryNotices(_environmentId, _createdCollectionId, null, null, _naturalLanguageQuery, true);
383+
var queryResult = Query(_environmentId, noticesCollectionId, null, null, _naturalLanguageQuery);
384+
var queryNoticesResult = QueryNotices(_environmentId, noticesCollectionId, null, null, _naturalLanguageQuery, true);
391385

392-
var deleteDocumentResult = DeleteDocument(_environmentId, _createdCollectionId, _createdDocumentId);
393-
var deleteCollectionResult = DeleteCollection(_environmentId, _createdCollectionId);
386+
var deleteDocumentResult = DeleteDocument(_environmentId, noticesCollectionId, _createdDocumentId);
387+
var deleteCollectionResult = DeleteCollection(_environmentId, noticesCollectionId);
394388
var deleteConfigurationResults = DeleteConfiguration(_environmentId, _createdConfigurationId);
395389

396390
Assert.IsNotNull(queryNoticesResult);
397391

398392
_environmentId = null;
399393
_createdConfigurationId = null;
400-
_createdCollectionId = null;
401394
_createdDocumentId = null;
402395
}
403396
#endregion
@@ -421,30 +414,29 @@ public void TestTrainingData()
421414
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
422415
{
423416
Language = _createdCollectionLanguage,
424-
Name = _createdCollectionName,
425-
Description = _createdCollectionDescription,
426-
ConfigurationId = _createdConfigurationId
417+
Name = _createdCollectionName + "-" + Guid.NewGuid(),
418+
Description = _createdCollectionDescription
427419
};
428420

429421
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
430-
_createdCollectionId = createCollectionResult.CollectionId;
422+
var trainingCollectionId = createCollectionResult.CollectionId;
431423

432424
DocumentAccepted addDocumentResult;
433425
using (FileStream fs = File.OpenRead(_filepathToIngest))
434426
{
435-
addDocumentResult = AddDocument(_environmentId, _createdCollectionId, fs, _metadata);
427+
addDocumentResult = AddDocument(_environmentId, trainingCollectionId, fs, _metadata);
436428
_createdDocumentId = addDocumentResult.DocumentId;
437429
}
438430

439-
var getDocumentStatusResult = GetDocumentStatus(_environmentId, _createdCollectionId, _createdDocumentId);
431+
var getDocumentStatusResult = GetDocumentStatus(_environmentId, trainingCollectionId, _createdDocumentId);
440432

441433
DocumentAccepted updateDocumentResult;
442434
using (FileStream fs = File.OpenRead(_filepathToIngest))
443435
{
444-
updateDocumentResult = UpdateDocument(_environmentId, _createdCollectionId, _createdDocumentId, fs, _metadata);
436+
updateDocumentResult = UpdateDocument(_environmentId, trainingCollectionId, _createdDocumentId, fs, _metadata);
445437
}
446438

447-
var listTrainingDataResult = ListTrainingData(_environmentId, _createdCollectionId);
439+
var listTrainingDataResult = ListTrainingData(_environmentId, trainingCollectionId);
448440

449441
var newTrainingQuery = new NewTrainingQuery()
450442
{
@@ -461,35 +453,35 @@ public void TestTrainingData()
461453
}
462454
};
463455

464-
var addTrainingDataResult = AddTrainingData(_environmentId, _createdCollectionId, newTrainingQuery);
456+
var addTrainingDataResult = AddTrainingData(_environmentId, trainingCollectionId, newTrainingQuery);
465457
_createdTrainingQueryId = addTrainingDataResult.QueryId;
466458

467-
var getTrainingDataResult = GetTrainingData(_environmentId, _createdCollectionId, _createdTrainingQueryId);
459+
var getTrainingDataResult = GetTrainingData(_environmentId, trainingCollectionId, _createdTrainingQueryId);
468460

469461
var trainingExample = new TrainingExample()
470462
{
471463
DocumentId = _createdDocumentId,
472464
Relevance = 1
473465
};
474466

475-
var createTrainingExampleResult = CreateTrainingExample(_environmentId, _createdCollectionId, _createdTrainingQueryId, trainingExample);
467+
var createTrainingExampleResult = CreateTrainingExample(_environmentId, trainingCollectionId, _createdTrainingQueryId, trainingExample);
476468
_createdTrainingExampleId = createTrainingExampleResult.DocumentId;
477469

478-
var getTrainingExampleResult = GetTrainingExample(_environmentId, _createdCollectionId, _createdTrainingQueryId, _createdTrainingExampleId);
470+
var getTrainingExampleResult = GetTrainingExample(_environmentId, trainingCollectionId, _createdTrainingQueryId, _createdTrainingExampleId);
479471

480472
var updateTrainingExample = new TrainingExamplePatch()
481473
{
482474
CrossReference = "crossReference",
483475
Relevance = 1
484476
};
485477

486-
var updateTrainingExampleResult = UpdateTrainingExample(_environmentId, _createdCollectionId, _createdTrainingQueryId, _createdTrainingExampleId, updateTrainingExample);
478+
var updateTrainingExampleResult = UpdateTrainingExample(_environmentId, trainingCollectionId, _createdTrainingQueryId, _createdTrainingExampleId, updateTrainingExample);
487479

488-
var deleteTrainingExampleResult = DeleteTrainingExample(_environmentId, _createdCollectionId, _createdTrainingQueryId, _createdTrainingExampleId);
489-
var deleteTrainingDataResult = DeleteTrainingData(_environmentId, _createdCollectionId, _createdTrainingQueryId);
490-
var deleteAllTrainingDataResult = DeleteAllTrainingData(_environmentId, _createdCollectionId);
491-
var deleteDocumentResult = DeleteDocument(_environmentId, _createdCollectionId, _createdDocumentId);
492-
var deleteCollectionResult = DeleteCollection(_environmentId, _createdCollectionId);
480+
var deleteTrainingExampleResult = DeleteTrainingExample(_environmentId, trainingCollectionId, _createdTrainingQueryId, _createdTrainingExampleId);
481+
var deleteTrainingDataResult = DeleteTrainingData(_environmentId, trainingCollectionId, _createdTrainingQueryId);
482+
var deleteAllTrainingDataResult = DeleteAllTrainingData(_environmentId, trainingCollectionId);
483+
var deleteDocumentResult = DeleteDocument(_environmentId, trainingCollectionId, _createdDocumentId);
484+
var deleteCollectionResult = DeleteCollection(_environmentId, trainingCollectionId);
493485
var deleteConfigurationResults = DeleteConfiguration(_environmentId, _createdConfigurationId);
494486

495487
Assert.IsNotNull(deleteAllTrainingDataResult);
@@ -504,7 +496,6 @@ public void TestTrainingData()
504496

505497
_createdTrainingExampleId = null;
506498
_createdTrainingQueryId = null;
507-
_createdCollectionId = null;
508499
_createdConfigurationId = null;
509500
_environmentId = null;
510501
_createdDocumentId = null;
@@ -597,13 +588,12 @@ public void TestCreateEvent_Success()
597588
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
598589
{
599590
Language = _createdCollectionLanguage,
600-
Name = _createdCollectionName,
601-
Description = _createdCollectionDescription,
602-
ConfigurationId = _createdConfigurationId
591+
Name = _createdCollectionName + "-" + Guid.NewGuid(),
592+
Description = _createdCollectionDescription
603593
};
604594

605595
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
606-
_createdCollectionId = createCollectionResult.CollectionId;
596+
var _createdCollectionId = createCollectionResult.CollectionId;
607597

608598
DocumentAccepted addDocumentResult;
609599
using (FileStream fs = File.OpenRead(_filepathToIngest))
@@ -682,9 +672,8 @@ public void TestExpansions_Success()
682672
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
683673
{
684674
Language = CreateCollectionRequest.LanguageEnum.JA,
685-
Name = _createdCollectionName,
686-
Description = _createdCollectionDescription,
687-
ConfigurationId = _createdConfigurationId
675+
Name = "expansions-collection-please-delete-" + Guid.NewGuid(),
676+
Description = _createdCollectionDescription
688677
};
689678

690679
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);
@@ -744,9 +733,8 @@ public void TestTokenization_Success()
744733
CreateCollectionRequest createCollectionRequest = new CreateCollectionRequest()
745734
{
746735
Language = CreateCollectionRequest.LanguageEnum.JA,
747-
Name = _createdCollectionName,
748-
Description = _createdCollectionDescription,
749-
ConfigurationId = _createdConfigurationId
736+
Name = "tokenization-collection-please-delete-" + Guid.NewGuid(),
737+
Description = _createdCollectionDescription
750738
};
751739

752740
var createCollectionResult = CreateCollection(_environmentId, createCollectionRequest);

0 commit comments

Comments
 (0)