Skip to content

Fix-GDTF-creates-empty-folder #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adragnevVW wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix-GDTF-creates-empty-folder #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a99dda
Adding folder
adragnevVW Feb 6, 2026
b584197
Fixing unit tests
adragnevVW Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/GDTFManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7691,7 +7691,13 @@ void GdtfFixture::PrepareWorkingFolder(TXString folderName)
if(folderName.IsEmpty()){ folderName = "GdtfGroup"; }

fWorkingFolder = (IID_FolderIdentifier);
fWorkingFolder->Set(EFolderSpecifier::kSpotlightFolder, true /*UserFolder*/, folderName);

IFolderIdentifierPtr folder ( IID_FolderIdentifier );
folder->Set( EFolderSpecifier::kSpotlightFolder, true, "GDTFs" );
folder->CreateOnDisk();

fWorkingFolder->Set(folder, folderName );


//---------------------------------------------------------------------------------------------
// Always start with a empty folder
Expand Down
30 changes: 15 additions & 15 deletions unittest/GdtfUnittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,8 +533,8 @@ void GdtfUnittest::ReadFile()
this->checkifEqual("GetFixtureThumbnail " , thumbFileName, "MyThumbnail");

// Check if the Resource Files have been unpacked correctly.
this->checkifEqual("GetFixtureThumbnail " , fullPath_PNG, fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.png" );
this->checkifEqual("GetFixtureThumbnail " , fullPath_SVG, fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.svg");
this->checkifEqual("GetFixtureThumbnail " , fullPath_PNG, fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.png");
this->checkifEqual("GetFixtureThumbnail " , fullPath_SVG, fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator + "MyThumbnail.svg");

this->checkifTrue("Testwheel PNG exists.", UnitTestUtil::FileExists (fullPath_PNG) );
this->checkifTrue("Testmodel SVG exits.", UnitTestUtil::FileExists (fullPath_SVG) );
Expand Down Expand Up @@ -1717,7 +1717,7 @@ void GdtfUnittest::ReadFile()
std::string GdtfUnittest::GetTestPNG_ThumbNail(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }
path += "MyThumbnail.png";
return path;
Expand All @@ -1726,7 +1726,7 @@ std::string GdtfUnittest::GetTestPNG_ThumbNail(bool readLocation)
std::string GdtfUnittest::GetTestSVG_ThumbNail(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }
path += "MyThumbnail.svg";
return path;
Expand All @@ -1735,7 +1735,7 @@ std::string GdtfUnittest::GetTestSVG_ThumbNail(bool readLocation)
std::string GdtfUnittest::GetTestSVG_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }
path += "MyModel.svg";
return path;
Expand All @@ -1744,7 +1744,7 @@ std::string GdtfUnittest::GetTestSVG_Model(bool readLocation)
std::string GdtfUnittest::GetTestSVGSide_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_side" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_side" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }
path += "MyModelSide.svg";
return path;
Expand All @@ -1753,7 +1753,7 @@ std::string GdtfUnittest::GetTestSVGSide_Model(bool readLocation)
std::string GdtfUnittest::GetTestSVGFront_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_front" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelssvg_front" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }
path += "MyModelFront.svg";
return path;
Expand All @@ -1762,7 +1762,7 @@ std::string GdtfUnittest::GetTestSVGFront_Model(bool readLocation)
std::string GdtfUnittest::GetTest3DS_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "models3ds" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "models3ds" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "MyModel.3ds";
Expand All @@ -1772,7 +1772,7 @@ std::string GdtfUnittest::GetTest3DS_Model(bool readLocation)
std::string GdtfUnittest::GetTest3DSLow_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_low" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_low" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "MyModelLow.3ds";
Expand All @@ -1782,7 +1782,7 @@ std::string GdtfUnittest::GetTest3DSLow_Model(bool readLocation)
std::string GdtfUnittest::GetTest3DSHigh_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_high" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "models3ds_high" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "MyModelHigh.3ds";
Expand All @@ -1792,7 +1792,7 @@ std::string GdtfUnittest::GetTest3DSHigh_Model(bool readLocation)
std::string GdtfUnittest::GetTestGLTF_Model_glb(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "MyModel.glb";
Expand All @@ -1802,7 +1802,7 @@ std::string GdtfUnittest::GetTestGLTF_Model_glb(bool readLocation)
std::string GdtfUnittest::GetTestGLTFLow_Model_glb(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_low" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_low" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "MyModelLow.glb";
Expand All @@ -1812,7 +1812,7 @@ std::string GdtfUnittest::GetTestGLTFLow_Model_glb(bool readLocation)
std::string GdtfUnittest::GetTestGLTFHigh_Model_glb(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_high" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf_high" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "MyModelHigh.glb";
Expand All @@ -1822,7 +1822,7 @@ std::string GdtfUnittest::GetTestGLTFHigh_Model_glb(bool readLocation)
std::string GdtfUnittest::GetTestGLTF_Model(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator+ "modelsgltf" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }

path += "Fox.gltf";
Expand All @@ -1832,7 +1832,7 @@ std::string GdtfUnittest::GetTestGLTF_Model(bool readLocation)
std::string GdtfUnittest::GetTestWheel_PNG(bool readLocation)
{
std::string path;
if(readLocation) { path = fAppDataFolder + kSeparator + "GdtfGroup" + kSeparator + "wheels" + kSeparator; }
if(readLocation) { path = fAppDataFolder + kSeparator + "GDTFs" + kSeparator + "GdtfGroup" + kSeparator + "wheels" + kSeparator; }
else { path = fTestResourcesFolder + kSeparator; }
path += "MWheel_Img1.png";
return path;
Expand Down