From ef550316d8e93cfbd9d331d0cc2df8a38c3f9333 Mon Sep 17 00:00:00 2001 From: Marvin Hochstetter Date: Wed, 18 Sep 2024 09:47:34 +0200 Subject: [PATCH] Fixed #589 by adding filetype to filename in XmlH5PFactory.cs --- Generator/ATF/ReadAtf.cs | 2 +- Generator/XmlClasses/XmlFileFactories/XmlH5PFactory.cs | 5 ++--- GeneratorTest/XmlClasses/XmlFileFactories/XmlH5PFactoryUt.cs | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Generator/ATF/ReadAtf.cs b/Generator/ATF/ReadAtf.cs index db916db4..0a1c86d6 100644 --- a/Generator/ATF/ReadAtf.cs +++ b/Generator/ATF/ReadAtf.cs @@ -148,7 +148,7 @@ private void GetH5PElements(IDocumentRootJson documentRootJson) { foreach (var element in documentRootJson.World.Elements) { - if (element.ElementFileType is "h5p" or "primitiveH5P") + if (element.ElementFileType is "h5p") { _listH5PElements.Add((ILearningElementJson)element); } diff --git a/Generator/XmlClasses/XmlFileFactories/XmlH5PFactory.cs b/Generator/XmlClasses/XmlFileFactories/XmlH5PFactory.cs index eb32ec1d..66021af3 100644 --- a/Generator/XmlClasses/XmlFileFactories/XmlH5PFactory.cs +++ b/Generator/XmlClasses/XmlFileFactories/XmlH5PFactory.cs @@ -17,10 +17,9 @@ namespace Generator.XmlClasses.XmlFileFactories; /// public class XmlH5PFactory : IXmlH5PFactory { - private readonly string _workDir; - private readonly IFileSystem _fileSystem; private readonly string _hardcodedPath = "XMLFilesForExport"; + private readonly string _workDir; public readonly IXmlFileManager FileManager; private List _activitiesInforefXmlFileList; @@ -180,7 +179,7 @@ public void H5PSetParametersFilesXml(string hashCheckSum, string filesize, strin Id = XmlEntityManager.GetFileIdBlock1().ToString(), ContentHash = hashCheckSum, ContextId = H5PElementId, - Filename = H5PElementName, + Filename = H5PElementName + "." + H5PElementType, Source = H5PElementName + "." + H5PElementType, Filesize = filesize, Component = "mod_h5pactivity", diff --git a/GeneratorTest/XmlClasses/XmlFileFactories/XmlH5PFactoryUt.cs b/GeneratorTest/XmlClasses/XmlFileFactories/XmlH5PFactoryUt.cs index 822e3af5..c1ba5591 100644 --- a/GeneratorTest/XmlClasses/XmlFileFactories/XmlH5PFactoryUt.cs +++ b/GeneratorTest/XmlClasses/XmlFileFactories/XmlH5PFactoryUt.cs @@ -144,11 +144,11 @@ public void H5PSetParametersFilesXml_SetsFile2Times_AndAddsToFileList() //Every File has 2 FilesXmlFile Id´s thats why the Count has to be 2*FileCount Assert.That(systemUnderTest.FilesXmlFiles.File, Has.Count.EqualTo(4)); Assert.That(systemUnderTest.FilesXmlFiles.File[0].ContextId, Is.EqualTo(h5PElement1.ElementId.ToString())); - Assert.That(systemUnderTest.FilesXmlFiles.File[0].Filename, Is.EqualTo("element1")); + Assert.That(systemUnderTest.FilesXmlFiles.File[0].Filename, Is.EqualTo("element1.h5p")); Assert.That(systemUnderTest.FilesXmlFiles.File[0].Source, Is.EqualTo("element1" + "." + h5PElement1.ElementFileType)); Assert.That(systemUnderTest.FilesXmlFiles.File[2].ContextId, Is.EqualTo(h5PElement2.ElementId.ToString())); - Assert.That(systemUnderTest.FilesXmlFiles.File[2].Filename, Is.EqualTo("element2")); + Assert.That(systemUnderTest.FilesXmlFiles.File[2].Filename, Is.EqualTo("element2.h5p")); Assert.That(systemUnderTest.FilesXmlFiles.File[2].Source, Is.EqualTo("element2" + "." + h5PElement2.ElementFileType)); Assert.That(systemUnderTest.FilesXmlFiles.File[2].Id,