Commit 86258aa6 authored by Maxime Lefrançois's avatar Maxime Lefrançois
Browse files

errors come before warnings in the report

parent 748e7c1c

src/main/java/fr/emse/gitlab/saref/CMDConfigurations.java

+1 −1
Original line number Diff line number Diff line
@@ -68,9 +68,9 @@ public class CMDConfigurations { 
				.addOption(ARG_DIRECTORY, ARG_DIRECTORY_LONG, true, ARG_DIRECTORY_MAN)

				.addOption(ARG_REMOTE_ONLY, ARG_REMOTE_ONLY_LONG, false, ARG_REMOTE_ONLY_MAN)

				.addOption(ARG_IGNORE_EXAMPLES, ARG_IGNORE_EXAMPLES_LONG, false, ARG_IGNORE_EXAMPLES_MAN)

				.addOption(ARG_IGNORE_TERMS, ARG_IGNORE_TERMS_LONG, false, ARG_IGNORE_TERMS_MAN)

				.addOption(ARG_IGNORE_GIT, ARG_IGNORE_GIT_LONG, false, ARG_IGNORE_GIT_MAN)

				.addOption(ARG_NO_SITE, ARG_NO_SITE_LONG, false, ARG_NO_SITE_MAN)

				.addOption(ARG_IGNORE_TERMS, ARG_IGNORE_TERMS_LONG, false, ARG_INCLUDE_MASTER_MAN)

				.addOption(ARG_INCLUDE_MASTER, ARG_INCLUDE_MASTER_LONG, false, ARG_INCLUDE_MASTER_MAN)

				.addOption(ARG_VERBOSE, ARG_VERBOSE_LONG, false, ARG_VERBOSE_MAN);

	}

src/main/java/fr/emse/gitlab/saref/Main.java

+5 −1
Original line number Diff line number Diff line
@@ -119,6 +119,10 @@ public class Main { 


		String dirName = cl.getOptionValue(ARG_DIRECTORY, ARG_DIRECTORY_DEFAULT);

		directory = new File(dirName).getCanonicalFile();

		if(!directory.isDirectory()) {

			LOG.error("The directory does not exist " + directory);

			System.exit(-1);

		}



		remoteOnly = cl.hasOption(ARG_REMOTE_ONLY);

		ignoreGit = cl.hasOption(ARG_IGNORE_GIT);
@@ -170,7 +174,7 @@ public class Main { 


		testSuites.clean();

		

		reportAndExit((int) -Math.signum(testSuites.getErrors()));

		reportAndExit((int) -Math.signum(testSuites.getErrors() + testSuites.getFailures()));

	}



	private static void setLogAppenders() throws IOException {

src/main/java/fr/emse/gitlab/saref/entities/tests/TestSuites.java

+4 −4
Original line number Diff line number Diff line
@@ -93,13 +93,13 @@ public class TestSuites implements Serializable { 
			Collections.sort(ts.getTestCases(), new Comparator<TestCase>() {

				@Override

				public int compare(TestCase o1, TestCase o2) {

					if (o1.getStatus() == o2.getStatus()) {

					if (o1.getStatus().equals(o2.getStatus())) {

						return 0;

					}

					if (o1.getStatus() == TestCase.Status.ERROR.getName()) {

						return 1;

					if (o1.getStatus().equals(TestCase.Status.ERROR.getName())) {

						return -1;

					}

					if (o2.getStatus() == TestCase.Status.ERROR.getName()) {

					if (o2.getStatus().equals(TestCase.Status.ERROR.getName())) {

						return 1;

					}

					return 0;

src/main/java/fr/emse/gitlab/saref/jobs/CheckOWLProfile.java

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ import org.semanticweb.owlapi.model.OWLOntologyManager; 
import org.semanticweb.owlapi.profiles.OWL2DLProfile;

import org.semanticweb.owlapi.profiles.OWLProfileReport;

import org.semanticweb.owlapi.profiles.OWLProfileViolation;

import org.semanticweb.owlapi.reasoner.OWLReasonerConfiguration;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

src/main/java/fr/emse/gitlab/saref/jobs/CheckRepositoryStructure.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ public class CheckRepositoryStructure extends JobRunner { 
	public static final PathMatcher ttlMatcher = FileSystems.getDefault().getPathMatcher("glob:**/*.ttl");



	private final Set<String> gitignoreLines = new HashSet<>(

			Arrays.asList("target", "*~", ".DS_Store", "catalog-v001.xml"));

			Arrays.asList("target", "*~", ".DS_Store", "catalog-v001.xml", "saref-pipeline.jar"));



	private Version version;

	private File directory;