Updated based on code review feedback

Author: pmachapman

src/Serval/test/Serval.E2ETests/ServalApiTests.cs

@@ -157,6 +157,11 @@ public async Task Nmt_Batch()
                 ],
             }
         ];
+
+        // Validate that a build can be started and canceled twice
+        await StartAndCancelTwiceAsync(engineId);
+
+        // Validate an NMT build using text files
         string buildId = await _helperClient.BuildEngineAsync(engineId);
         await Task.Delay(1000);
         IList<Pretranslation> lTrans1 = await _helperClient.TranslationEnginesClient.GetAllPretranslationsAsync(
@@ -186,41 +191,6 @@ public async Task Nmt_Batch()
         Assert.That(lTrans2, Has.Count.EqualTo(13)); // just 2 John
     }
 
-    [Test]
-    public async Task Nmt_CancelAndRestartBuild()
-    {
-        string engineId = await _helperClient.CreateNewEngineAsync("Nmt", "es", "en", "NMT2");
-        (string parallelCorpusId, ParallelCorpusConfig parallelCorpusConfig) =
-            await _helperClient.AddParatextCorpusToEngineAsync(engineId, "es", "en", false);
-        _helperClient.TranslationBuildConfig.TrainOn =
-        [
-            new TrainingCorpusConfig
-            {
-                ParallelCorpusId = parallelCorpusId,
-                SourceFilters =
-                [
-                    new ParallelCorpusFilterConfig { CorpusId = parallelCorpusConfig.SourceCorpusIds.Single() },
-                ],
-                TargetFilters =
-                [
-                    new ParallelCorpusFilterConfig { CorpusId = parallelCorpusConfig.TargetCorpusIds.Single() },
-                ],
-            }
-        ];
-        _helperClient.TranslationBuildConfig.Pretranslate =
-        [
-            new PretranslateCorpusConfig
-            {
-                ParallelCorpusId = parallelCorpusId,
-                SourceFilters =
-                [
-                    new ParallelCorpusFilterConfig { CorpusId = parallelCorpusConfig.SourceCorpusIds.Single() },
-                ],
-            }
-        ];
-        await StartAndCancelTwiceAsync(engineId);
-    }
-
     [Test]
     public async Task Nmt_LargeBatchAndDownload()
     {
@@ -402,6 +372,9 @@ public async Task Smt(bool legacyCorpus)
         Assert.That(ex, Is.Not.Null);
         Assert.That(ex.StatusCode, Is.EqualTo(409));
 
+        // Validate that a build can be started and canceled twice
+        await StartAndCancelTwiceAsync(engineId);
+
         // Validate suggestion where one word is the corpus
         string corpusId1 = await _helperClient.AddTextCorpusToEngineAsync(
             engineId,
@@ -495,20 +468,6 @@ await _helperClient.AddTextCorpusToEngineAsync(
         );
     }
 
-    [Test]
-    public async Task Smt_CancelAndRestartBuild()
-    {
-        string engineId = await _helperClient.CreateNewEngineAsync("SmtTransfer", "es", "en", "SMT2");
-        await _helperClient.AddParatextCorpusToEngineAsync(engineId, "es", "en", false);
-
-        await StartAndCancelTwiceAsync(engineId);
-
-        // do a job normally and make sure it works.
-        await _helperClient.BuildEngineAsync(engineId);
-        TranslationResult tResult = await _helperClient.TranslationEnginesClient.TranslateAsync(engineId, "Espíritu");
-        Assert.That(tResult.Translation.Contains("spirit"));
-    }
-
     [Test]
     public async Task WordAlignment()
     {

src/Serval/test/Serval.E2ETests/ServalClientHelper.cs

@@ -460,27 +460,15 @@ bool inference
             );
         }
 
-        var sourceFileConfig = new List<TranslationCorpusFileConfig>();
-
-        if (sourceLanguage == targetLanguage && !inference)
-        {
-            // if it's the same language, and we are not pretranslating, do nothing (echo for suggestions)
-            // if pretranslating, we need to upload the source separately
-            // if different languages, we are not echoing.
-        }
-        else
-        {
-            sourceFileConfig.AddRange(
-                sourceFiles.Select((s, i) => new TranslationCorpusFileConfig { FileId = s.Id, TextId = filesToAdd[i] })
-            );
-        }
-
         TranslationCorpus response = await TranslationEnginesClient.AddCorpusAsync(
             id: engineId,
             new TranslationCorpusConfig
             {
                 Name = "None",
-                SourceFiles = sourceFileConfig,
+                SourceFiles =
+                [
+                    .. sourceFiles.Select((s, i) => new TranslationCorpusFileConfig { FileId = s.Id, TextId = filesToAdd[i] })
+                ],
                 SourceLanguage = sourceLanguage,
                 TargetFiles = targetFileConfig,
                 TargetLanguage = targetLanguage
@@ -526,29 +514,17 @@ bool inference
         Corpus? targetCorpus =
             targetCorpusConfig.Files.Count > 0 ? await CorporaClient.CreateAsync(targetCorpusConfig) : null;
 
-        var sourceFileConfig = new List<CorpusFileConfig>();
-
-        if (sourceLanguage == targetLanguage && !inference)
-        {
-            // if it's the same language, and we are not pretranslating, do nothing (echo for suggestions)
-            // if pretranslating, we need to upload the source separately
-            // if different languages, we are not echoing.
-        }
-        else
-        {
-            DataFile sourceFile = await DataFilesClient.CreateAsync(
-                file: new FileParameter(data: File.OpenRead(sourceZipFile), fileName: Path.GetFileName(sourceZipFile)),
-                format: FileFormat.Paratext,
-                name: $"{_prefix}{sourceLanguage}_zip"
-            );
-            sourceFileConfig.Add(new CorpusFileConfig { FileId = sourceFile.Id, TextId = "test_data" });
-        }
+        DataFile sourceFile = await DataFilesClient.CreateAsync(
+            file: new FileParameter(data: File.OpenRead(sourceZipFile), fileName: Path.GetFileName(sourceZipFile)),
+            format: FileFormat.Paratext,
+            name: $"{_prefix}{sourceLanguage}_zip"
+        );
 
         var sourceCorpusConfig = new CorpusConfig()
         {
             Name = $"{_prefix}Source",
             Language = sourceLanguage,
-            Files = sourceFileConfig
+            Files = [new CorpusFileConfig { FileId = sourceFile.Id, TextId = "test_data" }]
         };
 
         Corpus sourceCorpus = await CorporaClient.CreateAsync(sourceCorpusConfig);
@@ -588,26 +564,11 @@ bool inference
         Corpus? targetCorpus =
             targetCorpusConfig.Files.Count > 0 ? await CorporaClient.CreateAsync(targetCorpusConfig) : null;
 
-        var sourceFileConfig = new List<CorpusFileConfig>();
-
-        if (sourceLanguage == targetLanguage && !inference)
-        {
-            // if it's the same language, and we are not pretranslating, do nothing (echo for suggestions)
-            // if pretranslating, we need to upload the source separately
-            // if different languages, we are not echoing.
-        }
-        else
-        {
-            sourceFileConfig.AddRange(
-                sourceFiles.Select((s, i) => new CorpusFileConfig { FileId = s.Id, TextId = filesToAdd[i] })
-            );
-        }
-
         var sourceCorpusConfig = new CorpusConfig()
         {
             Name = $"{_prefix}Source",
             Language = sourceLanguage,
-            Files = sourceFileConfig
+            Files = [.. sourceFiles.Select((s, i) => new CorpusFileConfig { FileId = s.Id, TextId = filesToAdd[i] })]
         };
 
         Corpus sourceCorpus = await CorporaClient.CreateAsync(sourceCorpusConfig);