Commit 20336dc4 authored by Jonathan Haas's avatar Jonathan Haas
Browse files

Merge branch 'bugfix/findbugs' into 'develop' 

Diverse Kosmetik-Korrekturen

See merge request ERZ/SWE_de.bsvrz.ars.ars!16
parents ae2f9c85 9e21922b

config/findbugs/findbugs-exclude.xml

+0 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<FindBugsFilter>



	<Match><Bug pattern="MS_MUTABLE_ARRAY"/></Match>

	<Match><Bug pattern="MS_SHOULD_BE_FINAL"/></Match>



	<!-- Tests -->

src/integrationtest/java/de/bsvrz/ars/ars/ArchiveTest.java

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ public abstract class ArchiveTest { 
	/** Für die Methoden {@link #waitTillDone()} und {@link #iAmDone()} */

	private boolean iAmDone = false;



	protected String[] objs = ArchiveTestApplication.testObjectPids;

	protected String[] objs = ArchiveTestApplication.getTestObjectPids();



	/**

	 * @param time Anmeldezeit Quelle

src/integrationtest/java/de/bsvrz/ars/ars/bugreports/TestSubscriptionDelay.java

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class TestSubscriptionDelay { 
		_archiveApplication.archSettings(getStdSettings());

		_archiveApplication.archContSettings(200, TEN_MB, ONE_DAY);



		_archiveApplication.archParam(new ArSRemoteControl.ParamSatz(E, new ArSRemoteControl.Datenspez(Arrays.copyOf(_archiveApplication.testObjectPids, 100), TEST_ATG, TEST_ASP), new ArSRemoteControl.Einst(true, null, true, null, 2)));

		_archiveApplication.archParam(new ArSRemoteControl.ParamSatz(E, new ArSRemoteControl.Datenspez(Arrays.copyOf(getTestObjectPids(), 100), TEST_ATG, TEST_ASP), new ArSRemoteControl.Einst(true, null, true, null, 2)));



		long current = System.nanoTime();

		_archiveApplication.startAndWaitUntilReady(); // Auf Fertigmeldung warten

src/integrationtest/java/de/bsvrz/ars/ars/persistence/TestPersistenceManagerRebuildIndex.java

+5 −2
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ import java.io.File; 
import java.io.IOException;

import java.io.InputStream;

import java.net.URL;

import java.nio.file.Paths;



/**

 * JUnit-Test der Klasse {@link PersistenceManager}.
@@ -68,7 +69,8 @@ public class TestPersistenceManagerRebuildIndex { 
	@Before

	public void setUp() throws Exception {

		tempDir = _davTestEnvironment.getTemporaryDirectory();

		persistenceManager = new PersistenceManager(null, tempDir.getAbsolutePath() + File.separator + "archiv");

		String archPath = Paths.get(tempDir.getAbsolutePath(), "archiv").toString();

		persistenceManager = new PersistenceManager(null, archPath);

	}



	@After
@@ -79,7 +81,8 @@ public class TestPersistenceManagerRebuildIndex { 
	/** Testet die Methode {@link PersistenceManager#getLastContainerID()}. */

	@Test(timeout = 200000)

	public void testRebuildIndex() throws IndexException, PersistenceException, IOException {

		final String dataIdentificationPath = persistenceManager.getArchivePath() + File.separator + "obj309/obj622/obj474/obj381/obj862/obj255/atg291/asp700/sv0/oa";

		final String dataIdentificationPath =

				Paths.get(persistenceManager.getArchivePath(),"obj309/obj622/obj474/obj381/obj862/obj255/atg291/asp700/sv0/oa").toString();



		final String[] allFiles = {

				"dc0000000056564.dat", "dc0000000063573.dat", "dc0000000144288.dat", "dc0000000451336.dat", "dc0000000451338.dat",

src/integrationtest/java/de/bsvrz/ars/ars/testenvironment/ArchiveTestApplication.java

+5 −1
Original line number Diff line number Diff line
@@ -235,7 +235,7 @@ public class ArchiveTestApplication extends DafApplication<ArchiveManager> { 


	public static final String[] E = new String[0];



	public static final String[] testObjectPids = new String[NUM_TESTMQ];

	private static final String[] testObjectPids = new String[NUM_TESTMQ];



	static {

		for(int i = 0; i < testObjectPids.length; i++) {
@@ -243,6 +243,10 @@ public class ArchiveTestApplication extends DafApplication<ArchiveManager> { 
		}

	}



	public static String[] getTestObjectPids() {

		return testObjectPids.clone();

	}



	/**

	 * @param time Anmeldezeit Quelle

	 *