Simplifying tests somehow... or not
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
parent
abe078612b
commit
d1e18d1e51
6 changed files with 111 additions and 107 deletions
|
@ -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_FILE2_PATH = File.separator+"package2";
|
||||
|
||||
private boolean is(byte[] byteArray, String pattern){
|
||||
return Converter.byteArrToHexStringAsLE(byteArray).equals(pattern);
|
||||
}
|
||||
|
||||
@Disabled
|
||||
@DisplayName("Extract package2 test")
|
||||
@Test
|
||||
|
@ -70,9 +66,8 @@ public class ExtractPackage2Test extends LKonPackage2Test {
|
|||
}
|
||||
|
||||
String[] collectNcaFileNames(){
|
||||
File firmware = new File(PATH_TO_FIRMWARE);
|
||||
Assertions.assertTrue(firmware.exists());
|
||||
String[] ncaFileNames = firmware.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
|
||||
String[] ncaFileNames = new File(PATH_TO_FIRMWARE)
|
||||
.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
|
||||
Assertions.assertNotNull(ncaFileNames);
|
||||
return ncaFileNames;
|
||||
}
|
||||
|
|
|
@ -16,6 +16,7 @@ import java.nio.file.Files;
|
|||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
import java.util.stream.Collectors;
|
||||
import java.util.zip.CRC32;
|
||||
|
@ -27,6 +28,12 @@ import java.util.zip.CRC32;
|
|||
* */
|
||||
|
||||
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")
|
||||
@Test
|
||||
void testSystem2() throws Exception{
|
||||
|
@ -34,39 +41,37 @@ public class Ini1ExtractTest extends LKonPackage2Test {
|
|||
String[] ncaFileNames = collectNcaFileNames();
|
||||
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
|
||||
|
||||
NCAProvider system2FatNcaProvider = null;
|
||||
NCAProvider system2ExFatNcaProvider = null;
|
||||
NCAProvider system2FatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
for (NCAProvider ncaProvider : ncaProviders) {
|
||||
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId());
|
||||
if (titleId.equals("0100000000000819"))
|
||||
system2FatNcaProvider = ncaProvider;
|
||||
else if (titleId.equals("010000000000081b"))
|
||||
system2ExFatNcaProvider = ncaProvider;
|
||||
}
|
||||
NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
Assertions.assertNotNull(system2FatNcaProvider);
|
||||
Assertions.assertNotNull(system2ExFatNcaProvider);
|
||||
|
||||
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
|
||||
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
|
||||
System.out.printf("FAT %s\nExFAT %s\n",
|
||||
system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
|
||||
|
||||
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
|
||||
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));
|
||||
|
||||
testExportedFiles(system2FatNcaProvider, exportFat, REFERENCE_FAT);
|
||||
testExportedFiles(system2ExFatNcaProvider, exportExFat, REFERENCE_EXFAT);
|
||||
testExportedFiles(system2FatNcaProvider, exportFat, REFERENCE_FAT, true);
|
||||
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(){
|
||||
File firmware = new File(PATH_TO_FIRMWARE);
|
||||
Assertions.assertTrue(firmware.exists());
|
||||
String[] ncaFileNames = firmware.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
|
||||
String[] ncaFileNames = new File(PATH_TO_FIRMWARE)
|
||||
.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
|
||||
Assertions.assertNotNull(ncaFileNames);
|
||||
return ncaFileNames;
|
||||
}
|
||||
List<NCAProvider> makeNcaProviders(String[] ncaFileNames) throws Exception{
|
||||
List<NCAProvider> ncaProviders = new ArrayList<>();
|
||||
|
||||
for (String ncaFileName : ncaFileNames){
|
||||
File nca = new File(PATH_TO_FIRMWARE +File.separator+ncaFileName);
|
||||
NCAProvider provider = new NCAProvider(nca, keyChainHolder.getRawKeySet());
|
||||
|
@ -78,7 +83,10 @@ public class Ini1ExtractTest extends LKonPackage2Test {
|
|||
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();
|
||||
|
||||
FileSystemEntry package2FileSystemEntry = romFsProvider.getRootEntry().getContent()
|
||||
|
@ -92,47 +100,51 @@ public class Ini1ExtractTest extends LKonPackage2Test {
|
|||
.collect(Collectors.toList())
|
||||
.get(0);
|
||||
|
||||
Path referenceFilePath = Paths.get(referenceFilesFolder+File.separator+"package2"+File.separator+"INI1.bin");
|
||||
Path myFilePath = Paths.get(exportIntoFolder+File.separator+"INI1.bin");
|
||||
Path referenceFilePath = Paths.get(referenceFilesFolder+REFERENCE_FILE_PATH);
|
||||
Path ownFilePath = Paths.get(exportIntoFolder+OWN_FILE_PATH);
|
||||
|
||||
System.out.println("\n" +
|
||||
"\nReference : " + referenceFilePath +
|
||||
"\nOwn : " + myFilePath);
|
||||
long referenceCrc32 = calculateReferenceCRC32(referenceFilePath);
|
||||
System.out.printf("\nReference : %s\nOwn : %s\n", referenceFilePath, ownFilePath);
|
||||
|
||||
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);
|
||||
System2Provider providerStream = new System2Provider(producer, keyChainHolder);
|
||||
providerStream.getIni1Provider().export(exportIntoFolder);
|
||||
validateChecksums(myFilePath, referenceCrc32);
|
||||
validateSizes(referenceFilePath, myFilePath);
|
||||
if (mainFlow)
|
||||
mainFlow(exportIntoFolder, referenceFilePath, ownFilePath, romFsProvider, package2FileSystemEntry);
|
||||
else
|
||||
altFlow(exportIntoFolder, referenceFilePath, ownFilePath);
|
||||
}
|
||||
long calculateReferenceCRC32(Path refPackage2Path) throws Exception{
|
||||
byte[] refPackage2Bytes = Files.readAllBytes(refPackage2Path);
|
||||
void mainFlow(String exportIntoFolder,
|
||||
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.update(refPackage2Bytes, 0, refPackage2Bytes.length);
|
||||
crc32.update(package2Bytes, 0, package2Bytes.length);
|
||||
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));
|
||||
}
|
||||
}
|
||||
|
|
|
@ -24,28 +24,25 @@ import java.util.zip.CRC32;
|
|||
* */
|
||||
|
||||
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")
|
||||
@Test
|
||||
void testSystem2() throws Exception{
|
||||
String[] ncaFileNames = collectNcaFileNames();
|
||||
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
|
||||
|
||||
NCAProvider system2FatNcaProvider = null;
|
||||
NCAProvider system2ExFatNcaProvider = null;
|
||||
NCAProvider system2FatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
for (NCAProvider ncaProvider : ncaProviders) {
|
||||
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId());
|
||||
if (titleId.equals("0100000000000819"))
|
||||
system2FatNcaProvider = ncaProvider;
|
||||
else if (titleId.equals("010000000000081b"))
|
||||
system2ExFatNcaProvider = ncaProvider;
|
||||
}
|
||||
NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
Assertions.assertNotNull(system2FatNcaProvider);
|
||||
Assertions.assertNotNull(system2ExFatNcaProvider);
|
||||
|
||||
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
|
||||
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
|
||||
System.out.printf("FAT %s\nExFAT %s\n",
|
||||
system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
|
||||
|
||||
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
|
||||
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));
|
||||
|
@ -55,9 +52,8 @@ public class KernelBinExtractTest extends LKonPackage2Test {
|
|||
}
|
||||
|
||||
String[] collectNcaFileNames(){
|
||||
File firmware = new File(PATH_TO_FIRMWARE);
|
||||
Assertions.assertTrue(firmware.exists());
|
||||
String[] ncaFileNames = firmware.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
|
||||
String[] ncaFileNames = new File(PATH_TO_FIRMWARE)
|
||||
.list((File directory, String file) -> ( ! file.endsWith(".cnmt.nca") && file.endsWith(".nca")));
|
||||
Assertions.assertNotNull(ncaFileNames);
|
||||
return ncaFileNames;
|
||||
}
|
||||
|
|
|
@ -29,28 +29,25 @@ import java.util.zip.CRC32;
|
|||
* */
|
||||
|
||||
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')")
|
||||
@Test
|
||||
void testSystem2() throws Exception{
|
||||
String[] ncaFileNames = collectNcaFileNames();
|
||||
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
|
||||
|
||||
NCAProvider system2FatNcaProvider = null;
|
||||
NCAProvider system2ExFatNcaProvider = null;
|
||||
NCAProvider system2FatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
for (NCAProvider ncaProvider : ncaProviders) {
|
||||
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId());
|
||||
if (titleId.equals("0100000000000819"))
|
||||
system2FatNcaProvider = ncaProvider;
|
||||
else if (titleId.equals("010000000000081b"))
|
||||
system2ExFatNcaProvider = ncaProvider;
|
||||
}
|
||||
NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
Assertions.assertNotNull(system2FatNcaProvider);
|
||||
Assertions.assertNotNull(system2ExFatNcaProvider);
|
||||
|
||||
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
|
||||
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
|
||||
System.out.printf("FAT %s\nExFAT %s\n",
|
||||
system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
|
||||
|
||||
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
|
||||
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));
|
||||
|
|
|
@ -28,28 +28,25 @@ import java.util.zip.CRC32;
|
|||
* */
|
||||
|
||||
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')")
|
||||
@Test
|
||||
void testSystem2() throws Exception{
|
||||
String[] ncaFileNames = collectNcaFileNames();
|
||||
List<NCAProvider> ncaProviders = makeNcaProviders(ncaFileNames);
|
||||
|
||||
NCAProvider system2FatNcaProvider = null;
|
||||
NCAProvider system2ExFatNcaProvider = null;
|
||||
NCAProvider system2FatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_FAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
for (NCAProvider ncaProvider : ncaProviders) {
|
||||
String titleId = Converter.byteArrToHexStringAsLE(ncaProvider.getTitleId());
|
||||
if (titleId.equals("0100000000000819"))
|
||||
system2FatNcaProvider = ncaProvider;
|
||||
else if (titleId.equals("010000000000081b"))
|
||||
system2ExFatNcaProvider = ncaProvider;
|
||||
}
|
||||
NCAProvider system2ExFatNcaProvider = ncaProviders.stream()
|
||||
.filter(ncaProv -> is(ncaProv.getTitleId(), SYSTEM2_EXFAT_NCA_PATTERN))
|
||||
.findFirst().get();
|
||||
|
||||
Assertions.assertNotNull(system2FatNcaProvider);
|
||||
Assertions.assertNotNull(system2ExFatNcaProvider);
|
||||
|
||||
System.out.println("FAT " + system2FatNcaProvider.getFile().getName() +
|
||||
"\nExFAT " + system2ExFatNcaProvider.getFile().getName());
|
||||
System.out.printf("FAT %s\nExFAT %s\n",
|
||||
system2FatNcaProvider.getFile().getName(), system2ExFatNcaProvider.getFile().getName());
|
||||
|
||||
Assertions.assertTrue(system2FatNcaProvider.getFile().getName().endsWith("1212c.nca"));
|
||||
Assertions.assertTrue(system2ExFatNcaProvider.getFile().getName().endsWith("cc081.nca"));
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
package libKonogonka.package2;
|
||||
|
||||
import libKonogonka.Converter;
|
||||
import libKonogonka.LKonTest;
|
||||
|
||||
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 exportExFat = TEMP_DIR+File.separator+"Exported_ExFAT"+File.separator+getClass().getSimpleName();
|
||||
|
||||
|
||||
protected boolean is(byte[] byteArray, String pattern){
|
||||
return Converter.byteArrToHexStringAsLE(byteArray).equals(pattern);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue