better pre-test cleanup

Author: rainer-prosi

src/test/java/org/cip4/lib/jdf/jsonutil/JSONTestCaseBase.java

@@ -93,9 +93,10 @@ public abstract class JSONTestCaseBase
 	@BeforeAll
 	static void setTmpSchema()
 	{
+		getNewSchema(true);
 		for (int i = 2; i < 3; i++)
 		{
-			final File f = getNewSchema();
+			final File f = getNewSchema(false);
 			assertTrue(f.canRead());
 			final File f1 = new File(sm_dirTestDataTemp + "schema/Version_2_" + i + "/xjdf.json");
 			final File f2 = new File(sm_dirTestDataTemp + "schemakeep/Version_2_" + i + "/xjdf.json");
@@ -110,12 +111,16 @@ static void setTmpSchema()
 		}
 	}
 
-	protected static File getNewSchema()
+	protected static File getNewSchema(boolean force)
 	{
 		synchronized (JSONTestCaseBase.class)
 		{
 			final File file = new File(sm_dirTestDataTemp + "schema/Version_2_3/xjdf.json");
-			if (!file.exists())
+			if (force)
+			{
+				FileUtil.forceDelete(file);
+			}
+			if (force || !file.exists())
 			{
 				final File f = new File(sm_dirTestData + "schema/Version_2_3/xjdf.json");
 				assertTrue(f.canRead());
@@ -306,7 +311,7 @@ public JSONObjHelper writeBothJson(final KElement e, final JSONWriter jsonWriter
 		FileUtil.writeFile(jsonWriter, new File(sm_dirTestDataTemp + "xjdf/json", output));
 		FileUtil.writeFile(new JSONRtfWalker(jsonWriter), new File(sm_dirTestDataTemp + "xjdf/rtf", output + ".rtf"));
 
-		final JSONSchemaReader srf = new JSONSchemaReader(getNewSchema());
+		final JSONSchemaReader srf = new JSONSchemaReader(getNewSchema(false));
 		final Collection<Error> schemabugs = srf.checkJSON(jo.toJSONString());
 		if (checkJSONSchema)
 		{

src/test/java/org/cip4/lib/jdf/jsonutil/schema/JSONSchemaMergerTest.java

@@ -67,7 +67,7 @@ class JSONSchemaMergerTest extends JSONTestCaseBase
 	@Test
 	void testJSONSchemaUpdateBad() throws URISyntaxException
 	{
-		final File f = getNewSchema();
+		final File f = getNewSchema(false);
 		assertTrue(f.canRead());
 		final KElement e = KElement.createRoot("foo");
 		final JSONWriter jsonWriter = XJDFJSONWriterTest.getXJDFWriter(false);
@@ -80,16 +80,16 @@ void testJSONSchemaUpdateBad() throws URISyntaxException
 	@Test
 	void testJSONSchemaMerge() throws URISyntaxException
 	{
-		File f0 = getNewSchema();
+		File f0 = getNewSchema(false);
 		FileUtil.deleteAll(f0);
-		f0 = getNewSchema();
+		f0 = getNewSchema(false);
 		assertTrue(f0.canRead());
 	}
 
 	@Test
 	void testJSONSchemaReaderDigiPrint() throws URISyntaxException
 	{
-		final JSONSchemaReader sr = new JSONSchemaReader(UrlUtil.fileToUrl(getNewSchema(), true));
+		final JSONSchemaReader sr = new JSONSchemaReader(UrlUtil.fileToUrl(getNewSchema(false), true));
 		assertNotNull(sr.getTheSchema());
 		final String jos = FileUtil.fileToString(new File(sm_dirTestData + "json/Duplex-1Up.XJDF.json"), null);
 		assertNotNull(new JSONObjHelper(jos).getRoot());
@@ -100,7 +100,7 @@ void testJSONSchemaReaderDigiPrint() throws URISyntaxException
 	@Test
 	void testJSONSchemaReaderIntent() throws URISyntaxException
 	{
-		final File fs = getNewSchema();
+		final File fs = getNewSchema(false);
 		final JSONWriter w = new JSONWriter();
 		w.setXJDF();
 		for (final File f : FileUtil.listFilesWithExtension(new File(sm_dirTestData + "xjdf"), "xjdf"))
@@ -117,7 +117,7 @@ void testJSONSchemaReaderIntent() throws URISyntaxException
 	@Test
 	void testToString() throws URISyntaxException
 	{
-		final File f = getNewSchema();
+		final File f = getNewSchema(false);
 		assertTrue(f.canRead());
 		final JSONSchemaUpdate up = new JSONSchemaUpdate(f);
 		assertNotNull(up.toString());

src/test/java/org/cip4/lib/jdf/jsonutil/schema/JSONSchemaReaderTest.java

@@ -86,7 +86,7 @@ void testJSONSchemaReaderBad() throws URISyntaxException
 	@Test
 	void testCheckJSON() throws Exception
 	{
-		final JSONSchemaReader srf = new JSONSchemaReader(getNewSchema());
+		final JSONSchemaReader srf = new JSONSchemaReader(getNewSchema(false));
 		final XJMFHelper h = new XJMFHelper();
 		final JDFNotification n = (JDFNotification) h.appendMessage(EnumFamily.Signal, EnumType.Notification).appendElement(ElementName.NOTIFICATION);
 		n.setClass(EClass.Information);