Cleaned program code

This commit is contained in:
2022-11-12 01:25:08 -06:00
parent 074fb0507b
commit 36c4d61c9f
3 changed files with 94 additions and 71 deletions
+26 -26
View File
@@ -56,44 +56,33 @@ void Test_StripFilename_Should_ChangeName(void)
TEST_ASSERT_EQUAL_STRING("temp5.test", StripFilename("test/files/temp5.test"));
}
void Test_ReadSingleModule_Should_ReadCorrectly(void)
void Test_ReadSingleModuleFromArchive_Should_ReadCorrectly(void)
{
int fd = open(argv[2], O_RDONLY);
TEST_ASSERT_EQUAL(80, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(25, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(27, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(27, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(80, ReadSingleModuleFromArchive(fd, &moduleTest));
TEST_ASSERT_EQUAL(25, ReadSingleModuleFromArchive(fd, &moduleTest));
TEST_ASSERT_EQUAL(27, ReadSingleModuleFromArchive(fd, &moduleTest));
TEST_ASSERT_EQUAL(27, ReadSingleModuleFromArchive(fd, &moduleTest));
close(fd);
}
void Test_ReadSingleModule_Should_ReadNewArchive(void)
void Test_ReadSingleModuleFromArchive_Should_ReadNewArchive(void)
{
// TEST_IGNORE_MESSAGE("Implementation Required: AddToArchive");
remove("test/files/newstuffyarchive.test");
int fd = open("test/files/newstuffyarchive.test", O_RDONLY | O_CREAT, 0644);
int testFD = OpenArchive("test/files/newstuffyarchive.test", O_RDONLY | O_CREAT);
AddToArchive("test/files/newstuffyarchive.test", "test/files/temp4.test");
TEST_ASSERT_EQUAL(27, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(27, ReadSingleModuleFromArchive(testFD, &moduleTest));
AddToArchive("test/files/newstuffyarchive.test", "test/files/temp3.test");
TEST_ASSERT_EQUAL(27, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(27, ReadSingleModuleFromArchive(testFD, &moduleTest));
AddToArchive("test/files/newstuffyarchive.test", "test/files/temp2.test");
TEST_ASSERT_EQUAL(25, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(25, ReadSingleModuleFromArchive(testFD, &moduleTest));
AddToArchive("test/files/newstuffyarchive.test", "test/files/temp.test");
TEST_ASSERT_EQUAL(80, ReadSingleModule(fd, &moduleTest));
TEST_ASSERT_EQUAL(80, ReadSingleModuleFromArchive(testFD, &moduleTest));
// Fail test removed due to printf breaking test
// AddToArchive("test/files/newstuffyarchive.test", "test/files/fake.test");
// TEST_ASSERT_EQUAL(0, ReadSingleModule(fd, &moduleTest));
close(fd);
}
void Test_RemoveFromArchive_Should_RemoveCorrectly(void)
{
// TEST_IGNORE_MESSAGE("Implementation Required: RemoveFromArchive");
int oldArchiveSize = Test_ListArchive("test/files/newstuffyarchive.test");
RemoveFromArchive("test/files/newstuffyarchive.test", "test/files/temp.test");
TEST_ASSERT_LESS_THAN(oldArchiveSize, Test_ListArchive("test/files/newstuffyarchive.test"));
oldArchiveSize = Test_ListArchive("test/files/newstuffyarchive.test");
RemoveFromArchive("test/files/newstuffyarchive.test", "test/files/temp2.test");
TEST_ASSERT_LESS_THAN(oldArchiveSize, Test_ListArchive("test/files/newstuffyarchive.test"));
// TEST_ASSERT_EQUAL(0, ReadSingleModuleFromArchive(fd, &moduleTest));
close(testFD);
}
void Test_ListArchive_Should_ListCorrectly(void)
@@ -109,14 +98,25 @@ void Test_ExtractArchive_Should_ExtractCorrectly(void)
TEST_ASSERT_GREATER_THAN(0, outputFileSize);
}
void Test_RemoveFromArchive_Should_RemoveCorrectly(void)
{
// TEST_IGNORE_MESSAGE("Implementation Required: RemoveFromArchive");
int oldArchiveSize = Test_ListArchive("test/files/newstuffyarchive.test");
RemoveFromArchive("test/files/newstuffyarchive.test", "test/files/temp.test");
TEST_ASSERT_LESS_THAN(oldArchiveSize, Test_ListArchive("test/files/newstuffyarchive.test"));
oldArchiveSize = Test_ListArchive("test/files/newstuffyarchive.test");
RemoveFromArchive("test/files/newstuffyarchive.test", "test/files/temp2.test");
TEST_ASSERT_LESS_THAN(oldArchiveSize, Test_ListArchive("test/files/newstuffyarchive.test"));
}
int main(void)
{
UNITY_BEGIN();
RUN_TEST(Test_StuffyArgument_Should_ReturnCorrectly);
RUN_TEST(Test_StripFilename_Should_ChangeName);
RUN_TEST(Test_IsFileArchived_Should_ReturnCorrectly);
RUN_TEST(Test_ReadSingleModule_Should_ReadCorrectly);
RUN_TEST(Test_ReadSingleModule_Should_ReadNewArchive);
RUN_TEST(Test_ReadSingleModuleFromArchive_Should_ReadCorrectly);
RUN_TEST(Test_ReadSingleModuleFromArchive_Should_ReadNewArchive);
RUN_TEST(Test_ListArchive_Should_ListCorrectly);
RUN_TEST(Test_ExtractArchive_Should_ExtractCorrectly);
RUN_TEST(Test_RemoveFromArchive_Should_RemoveCorrectly);