desu/libKonogonka
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Simplifying tests somehow... or not
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
Details

Browse source
This commit is contained in:
Dmitry Isaenko 2025-02-06 23:08:47 +03:00
parent abe078612b
commit d1e18d1e51
6 changed files with 111 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/test/java/libKonogonka/package2/ExtractPackage2Test.java
View file

@ -31,10 +31,6 @@ public class ExtractPackage2Test extends LKonPackage2Test {
private static final String OWN_FILE1_PATH = File.separator+"ROOT"+File.separator+"nx"+File.separator+"package2"; private static final String OWN_FILE1_PATH = File.separator+"ROOT"+File.separator+"nx"+File.separator+"package2";
private static final String OWN_FILE2_PATH = File.separator+"package2"; private static final String OWN_FILE2_PATH = File.separator+"package2";
private boolean is(byte[] byteArray, String pattern){
return Converter.byteArrToHexStringAsLE(byteArray).equals(pattern);
}
@Disabled @Disabled
@DisplayName("Extract package2 test") @DisplayName("Extract package2 test")
@Test @Test
@ -70,9 +66,8 @@ public class ExtractPackage2Test extends LKonPackage2Test {
} }
String[] collectNcaFileNames(){ String[] collectNcaFileNames(){
File firmware = new File(PATH_TO_FIRMWARE); String[] ncaFileNames = new File(PATH_TO_FIRMWARE)
Assertions.assertTrue(firmware.exists()); .list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
String[] ncaFileNames = firmware.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
Assertions.assertNotNull(ncaFileNames); Assertions.assertNotNull(ncaFileNames);
return ncaFileNames; return ncaFileNames;
} }

122
src/test/java/libKonogonka/package2/Ini1ExtractTest.java
View file

@ -16,6 +16,7 @@ import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.zip.CRC32; import java.util.zip.CRC32;
@ -27,6 +28,12 @@ import java.util.zip.CRC32;
* */ * */
public class Ini1ExtractTest extends LKonPackage2Test { public class Ini1ExtractTest extends LKonPackage2Test {
private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819";
private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b";
private static final String REFERENCE_FILE_PATH = File.separator+"package2"+File.separator+"INI1.bin";
private static final String OWN_FILE_PATH = File.separator+"INI1.bin";
@DisplayName("INI1.bin extract test") @DisplayName("INI1.bin extract test")
@Test @Test
void testSystem2() throws Exception{ void testSystem2() throws Exception{
@ -34,39 +41,37 @@ public class Ini1ExtractTest extends LKonPackage2Test {
String[] ncaFileNames = collectNcaFileNames(); String[] ncaFileNames = collectNcaFileNames();
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames); List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
NCAProvider system2FatNcaProvider = null; NCAProvider system2FatNcaProvider = ncaProviders.stream()
NCAProvider system2ExFatNcaProvider = null; .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
.findFirst().get();
for (NCAProvider ncaProvider : ncaProviders) { NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId()); .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
if (titleId.equals("0100000000000819")) .findFirst().get();
system2FatNcaProvider = ncaProvider;
else if (titleId.equals("010000000000081b"))
system2ExFatNcaProvider = ncaProvider;
}
Assertions.assertNotNull(system2FatNcaProvider); System.out.printf("FAT %s\nExFAT %s\n",
Assertions.assertNotNull(system2ExFatNcaProvider); system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca")); Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca")); Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));
testExportedFiles(system2FatNcaProvider, exportFat, REFERENCE_FAT); testExportedFiles(system2FatNcaProvider, exportFat, REFERENCE_FAT, true);
testExportedFiles(system2ExFatNcaProvider, exportExFat, REFERENCE_EXFAT); testExportedFiles(system2ExFatNcaProvider, exportExFat, REFERENCE_EXFAT, true);
System.out.println("\n\tAlternative flow");
testExportedFiles(system2FatNcaProvider, exportFat, REFERENCE_FAT, false);
testExportedFiles(system2ExFatNcaProvider, exportExFat, REFERENCE_EXFAT, false);
} }
String[] collectNcaFileNames(){ String[] collectNcaFileNames(){
File firmware = new File(PATH_TO_FIRMWARE); String[] ncaFileNames = new File(PATH_TO_FIRMWARE)
Assertions.assertTrue(firmware.exists()); .list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
String[] ncaFileNames = firmware.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
Assertions.assertNotNull(ncaFileNames); Assertions.assertNotNull(ncaFileNames);
return ncaFileNames; return ncaFileNames;
} }
List<NCAProvider> makeNcaProviders(String[] ncaFileNames) throws Exception{ List<NCAProvider> makeNcaProviders(String[] ncaFileNames) throws Exception{
List<NCAProvider> ncaProviders = new ArrayList<>(); List<NCAProvider> ncaProviders = new ArrayList<>();
for (String ncaFileName : ncaFileNames){ for (String ncaFileName : ncaFileNames){
File nca = new File(PATH_TO_FIRMWARE +File.separator+ncaFileName); File nca = new File(PATH_TO_FIRMWARE +File.separator+ncaFileName);
NCAProvider provider = new NCAProvider(nca, keyChainHolder.getRawKeySet()); NCAProvider provider = new NCAProvider(nca, keyChainHolder.getRawKeySet());
@ -78,7 +83,10 @@ public class Ini1ExtractTest extends LKonPackage2Test {
return ncaProviders; return ncaProviders;
} }
void testExportedFiles(NCAProvider system2NcaProvider, String exportIntoFolder, String referenceFilesFolder) throws Exception{ void testExportedFiles(NCAProvider system2NcaProvider,
String exportIntoFolder,
String referenceFilesFolder,
boolean mainFlow) throws Exception{
RomFsProvider romFsProvider = system2NcaProvider.getNCAContentProvider(0).getRomfs(); RomFsProvider romFsProvider = system2NcaProvider.getNCAContentProvider(0).getRomfs();
FileSystemEntry package2FileSystemEntry = romFsProvider.getRootEntry().getContent() FileSystemEntry package2FileSystemEntry = romFsProvider.getRootEntry().getContent()
@ -92,47 +100,51 @@ public class Ini1ExtractTest extends LKonPackage2Test {
.collect(Collectors.toList()) .collect(Collectors.toList())
.get(0); .get(0);
Path referenceFilePath = Paths.get(referenceFilesFolder+File.separator+"package2"+File.separator+"INI1.bin"); Path referenceFilePath = Paths.get(referenceFilesFolder+REFERENCE_FILE_PATH);
Path myFilePath = Paths.get(exportIntoFolder+File.separator+"INI1.bin"); Path ownFilePath = Paths.get(exportIntoFolder+OWN_FILE_PATH);
System.out.println("\n" + System.out.printf("\nReference : %s\nOwn : %s\n", referenceFilePath, ownFilePath);
"\nReference : " + referenceFilePath +
"\nOwn : " + myFilePath);
long referenceCrc32 = calculateReferenceCRC32(referenceFilePath);
romFsProvider.exportContent(exportIntoFolder, package2FileSystemEntry); romFsProvider.exportContent(exportIntoFolder, package2FileSystemEntry);
System2Provider kernelProviderFile = new System2Provider(exportIntoFolder+File.separator+"package2", keyChainHolder);
Ini1Provider ini1Provider = new Ini1Provider(
kernelProviderFile.getHeader(),
exportIntoFolder+File.separator+"package2",
kernelProviderFile.getKernelMap().getIni1Offset());
ini1Provider.export(exportIntoFolder);
validateChecksums(myFilePath, referenceCrc32);
validateSizes(referenceFilePath, myFilePath);
InFileStreamProducer producer = romFsProvider.getStreamProducer(package2FileSystemEntry); if (mainFlow)
System2Provider providerStream = new System2Provider(producer, keyChainHolder); mainFlow(exportIntoFolder, referenceFilePath, ownFilePath, romFsProvider, package2FileSystemEntry);
providerStream.getIni1Provider().export(exportIntoFolder); else
validateChecksums(myFilePath, referenceCrc32); altFlow(exportIntoFolder, referenceFilePath, ownFilePath);
validateSizes(referenceFilePath, myFilePath);
} }
long calculateReferenceCRC32(Path refPackage2Path) throws Exception{ void mainFlow(String exportIntoFolder,
byte[] refPackage2Bytes = Files.readAllBytes(refPackage2Path); Path referenceFilePath,
Path ownFilePath,
RomFsProvider romFsProvider,
FileSystemEntry package2FileSystemEntry) throws Exception{
long referenceCrc32 = calcCRC32(referenceFilePath);
InFileStreamProducer producer = romFsProvider.getStreamProducer(package2FileSystemEntry);
System2Provider kernelProvider1 = new System2Provider(producer, keyChainHolder);
kernelProvider1.getIni1Provider().export(exportIntoFolder);
long ownCrc32 = calcCRC32(ownFilePath);
Assertions.assertEquals(ownCrc32, referenceCrc32);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(ownFilePath));
}
void altFlow(String exportIntoFolder, Path referenceFilePath, Path ownFilePath) throws Exception{
final String PATH_TO_PACKAGE2 = exportIntoFolder+File.separator+"package2";
long referenceCrc32 = calcCRC32(referenceFilePath);
System2Provider kernelProvider = new System2Provider(PATH_TO_PACKAGE2, keyChainHolder);
Ini1Provider ini1Provider = new Ini1Provider(
kernelProvider.getHeader(),
PATH_TO_PACKAGE2,
kernelProvider.getKernelMap().getIni1Offset());
ini1Provider.export(exportIntoFolder);
long ownCrc32 = calcCRC32(ownFilePath);
Assertions.assertEquals(ownCrc32, referenceCrc32);
Assertions.assertEquals(Files.size(referenceFilePath), Files.size(ownFilePath));
}
long calcCRC32(Path package2Path) throws Exception{
byte[] package2Bytes = Files.readAllBytes(package2Path);
CRC32 crc32 = new CRC32(); CRC32 crc32 = new CRC32();
crc32.update(refPackage2Bytes, 0, refPackage2Bytes.length); crc32.update(package2Bytes, 0, package2Bytes.length);
return crc32.getValue(); return crc32.getValue();
} }
void validateChecksums(Path myPackage2Path, long refPackage2Crc32) throws Exception{
// Check CRC32 for package2 file only
byte[] myPackage2Bytes = Files.readAllBytes(myPackage2Path);
CRC32 crc32 = new CRC32();
crc32.update(myPackage2Bytes, 0, myPackage2Bytes.length);
long myPackage2Crc32 = crc32.getValue();
Assertions.assertEquals(myPackage2Crc32, refPackage2Crc32);
}
void validateSizes(Path a, Path b) throws Exception{
Assertions.assertEquals(Files.size(a), Files.size(b));
}
} }

30
src/test/java/libKonogonka/package2/KernelBinExtractTest.java
View file

@ -24,28 +24,25 @@ import java.util.zip.CRC32;
* */ * */
public class KernelBinExtractTest extends LKonPackage2Test { public class KernelBinExtractTest extends LKonPackage2Test {
private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819";
private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b";
@DisplayName("Kernel.bin extract test") @DisplayName("Kernel.bin extract test")
@Test @Test
void testSystem2() throws Exception{ void testSystem2() throws Exception{
String[] ncaFileNames = collectNcaFileNames(); String[] ncaFileNames = collectNcaFileNames();
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames); List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
NCAProvider system2FatNcaProvider = null; NCAProvider system2FatNcaProvider = ncaProviders.stream()
NCAProvider system2ExFatNcaProvider = null; .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
.findFirst().get();
for (NCAProvider ncaProvider : ncaProviders) { NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId()); .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
if (titleId.equals("0100000000000819")) .findFirst().get();
system2FatNcaProvider = ncaProvider;
else if (titleId.equals("010000000000081b"))
system2ExFatNcaProvider = ncaProvider;
}
Assertions.assertNotNull(system2FatNcaProvider); System.out.printf("FAT %s\nExFAT %s\n",
Assertions.assertNotNull(system2ExFatNcaProvider); system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca")); Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca")); Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));
@ -55,9 +52,8 @@ public class KernelBinExtractTest extends LKonPackage2Test {
} }
String[] collectNcaFileNames(){ String[] collectNcaFileNames(){
File firmware = new File(PATH_TO_FIRMWARE); String[] ncaFileNames = new File(PATH_TO_FIRMWARE)
Assertions.assertTrue(firmware.exists()); .list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
String[] ncaFileNames = firmware.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
Assertions.assertNotNull(ncaFileNames); Assertions.assertNotNull(ncaFileNames);
return ncaFileNames; return ncaFileNames;
} }

25
src/test/java/libKonogonka/package2/Kip1ExtractDecompressedTest.java
View file

@ -29,28 +29,25 @@ import java.util.zip.CRC32;
* */ * */
public class Kip1ExtractDecompressedTest extends LKonPackage2Test { public class Kip1ExtractDecompressedTest extends LKonPackage2Test {
private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819";
private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b";
@DisplayName("KIP1 extract test (case 'FS')") @DisplayName("KIP1 extract test (case 'FS')")
@Test @Test
void testSystem2() throws Exception{ void testSystem2() throws Exception{
String[] ncaFileNames = collectNcaFileNames(); String[] ncaFileNames = collectNcaFileNames();
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames); List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
NCAProvider system2FatNcaProvider = null; NCAProvider system2FatNcaProvider = ncaProviders.stream()
NCAProvider system2ExFatNcaProvider = null; .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
.findFirst().get();
for (NCAProvider ncaProvider : ncaProviders) { NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId()); .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
if (titleId.equals("0100000000000819")) .findFirst().get();
system2FatNcaProvider = ncaProvider;
else if (titleId.equals("010000000000081b"))
system2ExFatNcaProvider = ncaProvider;
}
Assertions.assertNotNull(system2FatNcaProvider); System.out.printf("FAT %s\nExFAT %s\n",
Assertions.assertNotNull(system2ExFatNcaProvider); system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca")); Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca")); Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));

25
src/test/java/libKonogonka/package2/Kip1ExtractTest.java
View file

@ -28,28 +28,25 @@ import java.util.zip.CRC32;
* */ * */
public class Kip1ExtractTest extends LKonPackage2Test { public class Kip1ExtractTest extends LKonPackage2Test {
private static final String SYSTEM2_FAT_NCA_PATTERN = "0100000000000819";
private static final String SYSTEM2_EXFAT_NCA_PATTERN = "010000000000081b";
@DisplayName("KIP1 extract test (case 'FS')") @DisplayName("KIP1 extract test (case 'FS')")
@Test @Test
void testSystem2() throws Exception{ void testSystem2() throws Exception{
String[] ncaFileNames = collectNcaFileNames(); String[] ncaFileNames = collectNcaFileNames();
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames); List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
NCAProvider system2FatNcaProvider = null; NCAProvider system2FatNcaProvider = ncaProviders.stream()
NCAProvider system2ExFatNcaProvider = null; .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
.findFirst().get();
for (NCAProvider ncaProvider : ncaProviders) { NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId()); .filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
if (titleId.equals("0100000000000819")) .findFirst().get();
system2FatNcaProvider = ncaProvider;
else if (titleId.equals("010000000000081b"))
system2ExFatNcaProvider = ncaProvider;
}
Assertions.assertNotNull(system2FatNcaProvider); System.out.printf("FAT %s\nExFAT %s\n",
Assertions.assertNotNull(system2ExFatNcaProvider); system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca")); Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca")); Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));

7
src/test/java/libKonogonka/package2/LKonPackage2Test.java
View file

@ -1,5 +1,6 @@
package libKonogonka.package2; package libKonogonka.package2;
import libKonogonka.Converter;
import libKonogonka.LKonTest; import libKonogonka.LKonTest;
import java.io.File; import java.io.File;
@ -10,4 +11,10 @@ public class LKonPackage2Test extends LKonTest {
protected String exportFat = TEMP_DIR+File.separator+"Exported_FAT"+File.separator+getClass().getSimpleName(); protected String exportFat = TEMP_DIR+File.separator+"Exported_FAT"+File.separator+getClass().getSimpleName();
protected String exportExFat = TEMP_DIR+File.separator+"Exported_ExFAT"+File.separator+getClass().getSimpleName(); protected String exportExFat = TEMP_DIR+File.separator+"Exported_ExFAT"+File.separator+getClass().getSimpleName();
protected boolean is(byte[] byteArray, String pattern){
return Converter.byteArrToHexStringAsLE(byteArray).equals(pattern);
}
} }