Permalink
Browse files

Configuration update

Signed-off-by: Indrek Jentson <indrek.jentson@cgi.com>
  • Loading branch information...
Indrek Jentson
Indrek Jentson committed Jun 30, 2017
1 parent 289e1e4 commit f033bd122bea7271d969c5713b7b1f21704f41ad
Showing with 5 additions and 34 deletions.
  1. +0 −6 .idea/ant.xml
  2. +0 −25 digidoc4j.iml
  3. +1 −1 pom.xml
  4. +4 −2 test/org/digidoc4j/impl/bdoc/tsl/TslLoaderTest.java
View

This file was deleted.

Oops, something went wrong.
View
@@ -14,31 +14,6 @@
</content>
<orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/lib/commons-lang-2.6.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/.ideaLibSources/commons-lang-2.6-sources.jar!/" />
<root url="jar://$USER_HOME$/.ideaLibSources/commons-lang-2.6-sources.jar!/" />
</SOURCES>
</library>
</orderEntry>
<orderEntry type="module-library">
<library>
<CLASSES>
<root url="file://$MODULE_DIR$/lib" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="file://$MODULE_DIR$/lib" />
</SOURCES>
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" />
<jarDirectory url="file://$MODULE_DIR$/lib" recursive="false" type="SOURCES" />
</library>
</orderEntry>
<orderEntry type="library" name="Maven: ee.sk.digidoc:jdigidoc:3.12.1" level="project" />
<orderEntry type="library" name="Maven: commons-cli:commons-cli:1.4" level="project" />
<orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.3" level="project" />
View
@@ -746,7 +746,7 @@
<copy todir="${dss.util.build}/util">
<fileset dir="resources" includes="logback.xml"/>
</copy>
<zip destfile="${project.basedir}/target/${project.artifactId}-util.zip"
<zip destfile="${project.basedir}/target/${project.artifactId}-${project.version}-util.zip"
basedir="${dss.util.build}/util"/>
<delete dir="${dss.util.build}/util"/>
</target>
@@ -141,8 +141,10 @@ private void assertTslValid(TSLRepository tslRepository) {
List<TSLValidationSummary> summaryList = tslRepository.getSummary();
for (TSLValidationSummary summary : summaryList) {
Indication indication = summary.getIndication();
String country = summary.getCountry();
Assert.assertEquals("TSL is not valid for country " + country, Indication.TOTAL_PASSED, indication);
if (indication != null) {
String country = summary.getCountry();
Assert.assertEquals("TSL is not valid for country " + country, Indication.TOTAL_PASSED, indication);
}
}
}

0 comments on commit f033bd1

Please sign in to comment.