Skip to content

Commit

Permalink
#4 : Organized files under testFiles
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrei <andrei.smirnov@cgi.com>
  • Loading branch information
Andrei Smirnov committed Apr 25, 2017
1 parent 9a264b9 commit 7901fa2
Show file tree
Hide file tree
Showing 142 changed files with 541 additions and 426 deletions.
2 changes: 1 addition & 1 deletion src/org/digidoc4j/utils/TokenAlgorithmSupport.java
View file
Expand Up @@ -29,4 +29,4 @@ public static DigestAlgorithm determineSignatureDigestAlgorithm(X509Certificate
}
return DigestAlgorithm.SHA256;
}
}
}
115 changes: 57 additions & 58 deletions test/org/digidoc4j/ConfigurationTest.java
View file

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions test/org/digidoc4j/ContainerBuilderTest.java
View file
Expand Up @@ -45,8 +45,8 @@
public class ContainerBuilderTest extends DigiDoc4JTestHelper {

public static final Configuration TEST_CONFIGURATION = new Configuration(Configuration.Mode.TEST);
private static final String BDOC_TEST_FILE = "testFiles/one_signature.bdoc";
private static final String DDOC_TEST_FILE = "testFiles/ddoc_for_testing.ddoc";
private static final String BDOC_TEST_FILE = "testFiles/valid-containers/one_signature.bdoc";
private static final String DDOC_TEST_FILE = "testFiles/valid-containers/ddoc_for_testing.ddoc";
private File tempFolder;

@Rule
Expand Down Expand Up @@ -165,7 +165,7 @@ public void buildContainer_withInvalidMimeType_shouldThrowException() throws Exc
String mimeType = "application\\rtf";
ContainerBuilder.
aContainer().
withDataFile("testFiles/test.txt", mimeType).
withDataFile("testfiles/helper-files/test.txt", mimeType).
build();
}

Expand Down Expand Up @@ -512,7 +512,7 @@ public void openDDocContainerWithTempDirectory() throws Exception {
assertTrue(tempFolder.list().length == 0);
ContainerBuilder.
aContainer(DDOC_CONTAINER_TYPE).
fromExistingFile("testFiles/ddoc_for_testing.ddoc").
fromExistingFile("testFiles/valid-containers/ddoc_for_testing.ddoc").
usingTempDirectory(tempFolder.getPath()).
build();
assertTrue(tempFolder.list().length > 0);
Expand All @@ -523,7 +523,7 @@ public void openDDocContainerWithTempDirectoryAndConfiguration() throws Exceptio
assertTrue(tempFolder.list().length == 0);
ContainerBuilder.
aContainer(DDOC_CONTAINER_TYPE).
fromExistingFile("testFiles/ddoc_for_testing.ddoc").
fromExistingFile("testFiles/valid-containers/ddoc_for_testing.ddoc").
withConfiguration(TEST_CONFIGURATION).
usingTempDirectory(tempFolder.getPath()).
build();
Expand Down
22 changes: 20 additions & 2 deletions test/org/digidoc4j/ContainerOpenerTest.java
View file
Expand Up @@ -17,13 +17,16 @@
import java.io.FileInputStream;

import org.apache.commons.io.FileUtils;
import org.digidoc4j.exceptions.DigiDoc4JException;
import org.digidoc4j.impl.DigiDoc4JTestHelper;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;

public class ContainerOpenerTest extends DigiDoc4JTestHelper {

private static final String BDOC_TEST_FILE = "testFiles/one_signature.bdoc";
private static final String DDOC_TEST_FILE = "testFiles/ddoc_for_testing.ddoc";
private static final String BDOC_TEST_FILE = "testFiles/valid-containers/one_signature.bdoc";
private static final String DDOC_TEST_FILE = "testFiles/valid-containers/ddoc_for_testing.ddoc";
Configuration configuration = new Configuration(Configuration.Mode.TEST);

@Test
Expand Down Expand Up @@ -65,4 +68,19 @@ private void assertContainerOpened(Container container, String containerType) {
assertFalse(container.getDataFiles().isEmpty());
assertFalse(container.getSignatures().isEmpty());
}

@Test
@Ignore
public void validate(){
try {
Container container = ContainerBuilder.
aContainer().
fromExistingFile("testFiles/invalid-containers/invalid-file-format.ddoc").
build();

} catch (DigiDoc4JException e){
Assert.assertTrue( e.getMessage().contains("Invalid input file format."));
}
}

}
60 changes: 30 additions & 30 deletions test/org/digidoc4j/ContainerTest.java
View file
Expand Up @@ -79,7 +79,7 @@ public class ContainerTest extends DigiDoc4JTestHelper {

@Before
public void setUp() throws Exception {
PKCS12_SIGNER = new PKCS12SignatureToken("testFiles/signout.p12", "test".toCharArray());
PKCS12_SIGNER = new PKCS12SignatureToken("testFiles/p12/signout.p12", "test".toCharArray());
tempFile = testFolder.newFile("tempFile.txt");
}

Expand Down Expand Up @@ -121,18 +121,18 @@ public void createDDocContainer() {

@Test
public void openBDocContainerWhenTheFileIsAZipAndTheExtensionIsBDoc() {
assertTrue(ContainerOpener.open("testFiles/zip_file_without_asics_extension.bdoc") instanceof BDocContainer);
assertTrue(ContainerOpener.open("testFiles/invalid-containers/zip_file_without_asics_extension.bdoc") instanceof BDocContainer);
}

@Test
public void openDDocContainerForAllOtherFiles() {
assertTrue(ContainerOpener.open("testFiles/changed_digidoc_test.ddoc") instanceof DDocContainer);
assertTrue(ContainerOpener.open("testFiles/invalid-containers/changed_digidoc_test.ddoc") instanceof DDocContainer);
}

@Test
public void testAddOneFileToContainerForBDoc() throws Exception {
Container container = createContainer();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
List<DataFile> dataFiles = container.getDataFiles();
assertEquals(1, dataFiles.size());
assertEquals("test.txt", dataFiles.get(0).getName());
Expand All @@ -142,15 +142,15 @@ public void testAddOneFileToContainerForBDoc() throws Exception {
@Test
public void testRemovesOneFileFromContainerWhenFileExistsForBDoc() throws Exception {
Container bDocContainer = createContainer();
bDocContainer.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
bDocContainer.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
bDocContainer.removeDataFile("test.txt");
assertEquals(0, bDocContainer.getDataFiles().size());
}

@Test
public void testCreateBDocContainerSpecifiedByDocumentTypeForBDoc() throws Exception {
Container asicContainer = createBDoc();
asicContainer.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
asicContainer.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
TestDataBuilder.signContainer(asicContainer);
asicContainer.save("test.bdoc");
assertTrue(Helper.isZipFile(new File("test.bdoc")));
Expand All @@ -159,7 +159,7 @@ public void testCreateBDocContainerSpecifiedByDocumentTypeForBDoc() throws Excep
@Test
public void testCreateDDocContainer() throws Exception {
Container dDocContainer = createDDoc();
dDocContainer.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
dDocContainer.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
dDocContainer.sign(PKCS12_SIGNER);
dDocContainer.save("testCreateDDocContainer.ddoc");

Expand All @@ -169,7 +169,7 @@ public void testCreateDDocContainer() throws Exception {
@Test
public void testAddOneFileToContainerForDDoc() throws Exception {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
List<DataFile> dataFiles = container.getDataFiles();
assertEquals(1, dataFiles.size());
assertEquals("test.txt", dataFiles.get(0).getName());
Expand All @@ -179,11 +179,11 @@ public void testAddOneFileToContainerForDDoc() throws Exception {
@Test
public void testRemovesOneFileFromContainerWhenFileExistsForDDoc() throws Exception {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
container.save("testRemovesOneFileFromContainerWhenFileExistsFor.ddoc");

Container container1 = ContainerOpener.open("testRemovesOneFileFromContainerWhenFileExistsFor.ddoc");
container1.removeDataFile("testFiles/test.txt");
container1.removeDataFile("testfiles/helper-files/test.txt");
assertEquals(0, container1.getDataFiles().size());
}

Expand Down Expand Up @@ -213,7 +213,7 @@ public void addLargeFileToDDoc() throws Exception {
@Test
public void testOpenCreatedDDocFile() throws Exception {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
container.save("testOpenCreatedDDocFile.ddoc");
Container containerForReading = ContainerOpener.open("testOpenCreatedDDocFile.ddoc");
assertEquals(DDOC, containerForReading.getDocumentType());
Expand All @@ -223,12 +223,12 @@ public void testOpenCreatedDDocFile() throws Exception {

@Test(expected = DigiDoc4JException.class)
public void testOpenInvalidFileReturnsError() {
ContainerOpener.open("testFiles/test.txt");
ContainerOpener.open("testfiles/helper-files/test.txt");
}

@Test
public void testValidateDDoc() throws Exception {
Container dDocContainer = ContainerOpener.open("testFiles/ddoc_for_testing.ddoc");
Container dDocContainer = ContainerOpener.open("testFiles/valid-containers/ddoc_for_testing.ddoc");
assertFalse(dDocContainer.validate().hasErrors());
assertFalse(dDocContainer.validate().hasWarnings());
}
Expand All @@ -240,18 +240,18 @@ public void testOpenNotExistingFileThrowsException() {

@Test(expected = DigiDoc4JException.class)
public void testOpenEmptyFileThrowsException() {
ContainerOpener.open("emptyFile.ddoc");
ContainerOpener.open("testFiles/invalid-containers/emptyFile.ddoc");
}

@Test(expected = DigiDoc4JException.class)
public void testFileTooShortToVerifyIfItIsZipFileThrowsException() {
ContainerOpener.open("testFiles/tooShortToVerifyIfIsZip.ddoc");
ContainerOpener.open("testFiles/invalid-containers/tooShortToVerifyIfIsZip.ddoc");
}

@Test(expected = DigiDoc4JException.class)
public void testOpenFromStreamTooShortToVerifyIfIsZip() {
try {
FileInputStream stream = new FileInputStream(new File("testFiles/tooShortToVerifyIfIsZip.ddoc"));
FileInputStream stream = new FileInputStream(new File("testFiles/invalid-containers/tooShortToVerifyIfIsZip.ddoc"));
ContainerOpener.open(stream, true);
IOUtils.closeQuietly(stream);
} catch (FileNotFoundException e) {
Expand All @@ -273,7 +273,7 @@ public void testAddFileFromStreamToDDoc() throws IOException {
@Test
public void openContainerFromStreamAsBDoc() throws IOException {
Container container = createContainer();
container.addDataFile("testFiles/test.txt", "text/plain");
container.addDataFile("testfiles/helper-files/test.txt", "text/plain");
Signature signature = SignatureBuilder.
aSignature(container).
withSignatureToken(PKCS12_SIGNER).
Expand All @@ -291,7 +291,7 @@ public void openContainerFromStreamAsBDoc() throws IOException {

@Test
public void openContainerFromStreamAsDDoc() throws IOException {
FileInputStream stream = new FileInputStream("testFiles/ddoc_for_testing.ddoc");
FileInputStream stream = new FileInputStream("testFiles/valid-containers/ddoc_for_testing.ddoc");
Container container = ContainerOpener.open(stream, false);
stream.close();

Expand All @@ -301,7 +301,7 @@ public void openContainerFromStreamAsDDoc() throws IOException {
@Test
public void testGetSignatureFromDDoc() {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
container.sign(PKCS12_SIGNER);
List<Signature> signatures = container.getSignatures();

Expand All @@ -317,7 +317,7 @@ public void testAddRawSignatureThrowsException() {
@Test
public void testAddRawSignatureAsByteArrayForDDoc() throws CertificateEncodingException, IOException, SAXException {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
container.sign(PKCS12_SIGNER);
byte[] signatureBytes = FileUtils.readFileToByteArray(new File(("testFiles/xades/test-bdoc-tm.xml")));
container.addRawSignature(signatureBytes);
Expand All @@ -340,7 +340,7 @@ public void throwsErrorWhenCreatesDDOCContainerWithConfiguration() throws Except
@Test
public void testExtendToForBDOC() {
Container container = createContainer();
container.addDataFile("testFiles/test.txt", "text/plain");
container.addDataFile("testfiles/helper-files/test.txt", "text/plain");
Signature signature = SignatureBuilder.
aSignature(container).
withSignatureProfile(B_BES).
Expand All @@ -356,7 +356,7 @@ public void testExtendToForBDOC() {
@Test
public void testExtendToForDDOC() {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", "text/plain");
container.addDataFile("testfiles/helper-files/test.txt", "text/plain");
container.setSignatureProfile(B_BES);
container.sign(PKCS12_SIGNER);

Expand All @@ -368,7 +368,7 @@ public void testExtendToForDDOC() {
@Test
public void addRawSignatureToBDocContainer() throws Exception {
Container container = createBDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
byte[] signatureBytes = FileUtils.readFileToByteArray(new File("testFiles/xades/valid-bdoc-tm.xml"));
container.addRawSignature(signatureBytes);
String containerPath = testFolder.newFile("test-container.bdoc").getPath();
Expand All @@ -380,7 +380,7 @@ public void addRawSignatureToBDocContainer() throws Exception {

@Test
public void addRawSignatureToExistingBDocContainer() throws Exception {
Container container = TestDataBuilder.createContainerWithFile("testFiles/test.txt");
Container container = TestDataBuilder.createContainerWithFile("testfiles/helper-files/test.txt");
TestDataBuilder.signContainer(container);
byte[] signatureBytes = FileUtils.readFileToByteArray(new File("testFiles/xades/valid-bdoc-tm.xml"));
container.addRawSignature(signatureBytes);
Expand All @@ -394,7 +394,7 @@ public void addRawSignatureToExistingBDocContainer() throws Exception {
@Test(expected = InvalidSignatureException.class)
public void testAddRawSignatureAsByteArrayForBDoc() throws CertificateEncodingException, IOException, SAXException {
Container container = createBDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
TestDataBuilder.signContainer(container);
container.addRawSignature(Base64.decodeBase64("fo4aA1PVI//1agzBm2Vcxj7sk9pYQJt+9a7xLFSkfF10RocvGjVPBI65RMqyxGIsje" +
"LoeDERfTcjHdNojoK/gEdKtme4z6kvkZzjMjDuJu7krK/3DHBtW3XZleIaWZSWySahUiPNNIuk5ykACUolh+K/UK2aWL3Nh64EWvC8aznLV0" +
Expand All @@ -405,7 +405,7 @@ public void testAddRawSignatureAsByteArrayForBDoc() throws CertificateEncodingEx
@Test
public void testAddRawSignatureAsStreamArray() throws CertificateEncodingException, IOException {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
FileInputStream fileInputStream = new FileInputStream("testFiles/xades/test-bdoc-tm.xml");
container.addRawSignature(fileInputStream);

Expand All @@ -422,7 +422,7 @@ private byte[] getSigningCertificateAsBytes(Container container, int index) thro
@Ignore("jDigidoc fails to save a container after a raw signature has been added")
public void testRemoveSignature() throws IOException {
Container container = createDDoc();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
container.sign(PKCS12_SIGNER);
FileInputStream fileInputStream = new FileInputStream("testFiles/xades/test-bdoc-tm.xml");
container.addRawSignature(fileInputStream);
Expand All @@ -445,7 +445,7 @@ public void testRemovingNotExistingSignatureThrowsException() {
@Test
public void testSigningWithSignerInfo() throws Exception {
Container container = createContainer();
container.addDataFile("testFiles/test.txt", TEXT_MIME_TYPE);
container.addDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE);
Signature signature = SignatureBuilder.
aSignature(container).
withCity("myCity").
Expand All @@ -472,7 +472,7 @@ public void testSetConfigurationForBDoc() throws Exception {
Container container = ContainerBuilder.
aContainer(BDOC_CONTAINER_TYPE).
withConfiguration(conf).
withDataFile("testFiles/test.txt", TEXT_MIME_TYPE).
withDataFile("testfiles/helper-files/test.txt", TEXT_MIME_TYPE).
build();
SignatureBuilder.
aSignature(container).
Expand All @@ -483,7 +483,7 @@ public void testSetConfigurationForBDoc() throws Exception {
@Test
public void mustBePossibleToCreateAndVerifyContainerWhereDigestAlgorithmIsSHA224() throws Exception {
Container container = createContainer();
container.addDataFile("testFiles/test.txt", "text/plain");
container.addDataFile("testfiles/helper-files/test.txt", "text/plain");
Signature signature = SignatureBuilder.
aSignature(container).
withSignatureDigestAlgorithm(DigestAlgorithm.SHA224).
Expand Down
10 changes: 6 additions & 4 deletions test/org/digidoc4j/DataFileTest.java
View file
Expand Up @@ -15,7 +15,9 @@
import org.digidoc4j.exceptions.DigiDoc4JException;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Expand All @@ -36,7 +38,7 @@ public class DataFileTest {

@Before
public void setUp() throws Exception {
dataFile = new DataFile("testFiles/test.txt", "text/plain");
dataFile = new DataFile("testfiles/helper-files/test.txt", "text/plain");
}

@Test
Expand Down Expand Up @@ -82,7 +84,7 @@ public void testSaveToFile() throws IOException {
dataFile.saveAs(fileName);
assertTrue(new File(fileName).exists());

byte[] testFileContent = FileUtils.readFileToByteArray(new File("testFiles/test.txt"));
byte[] testFileContent = FileUtils.readFileToByteArray(new File("testfiles/helper-files/test.txt"));

byte[] savedFileContent = FileUtils.readFileToByteArray(new File(fileName));
assertArrayEquals(testFileContent, savedFileContent);
Expand All @@ -102,12 +104,12 @@ public void testSaveToOutputStream() throws IOException {

@Test(expected = DigiDoc4JException.class)
public void incorrectMimeType() {
dataFile = new DataFile("testFiles/test.txt", "incorrect");
dataFile = new DataFile("testfiles/helper-files/test.txt", "incorrect");
}

@Test(expected = DigiDoc4JException.class)
public void incorrectMimeTypeByteArrayConstructor() {
dataFile = new DataFile(new byte[]{0x041}, "testFiles/test.txt", "incorrect");
dataFile = new DataFile(new byte[]{0x041}, "testfiles/helper-files/test.txt", "incorrect");
}

@Test(expected = DigiDoc4JException.class)
Expand Down

0 comments on commit 7901fa2

Please sign in to comment.