Fix test failure due to wait timeout

THe Avro and Java context integration tests waited for one second for APEX
to produce the output event to file before stopping APEX. This timeout is
usually fine. However, occasionally in the ONAP Jenkins build jobs, the
test ocassionally times out.

The tests are amended to wait for the file to exist and have content or for 10
seconds, whichever comes sooner.

Also consolidated two test classes into a single class and improved
temporary file handling.

Issue-ID: POLICY-905
Change-Id: I5e370353d2b627203e270cb6efeb560af7dc2acf
Signed-off-by: liamfallon <liam.fallon@ericsson.com>

3 files changed, 129 insertions, 178 deletions

diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/AvroEventAlbumContextTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/AvroEventAlbumContextTest.java
deleted file mode 100644
index 5360a2148..000000000
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/AvroEventAlbumContextTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.apps.uservice.test.context;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-import org.onap.policy.apex.auth.clieditor.ApexCLIEditorMain;
-import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.service.ModelService;
-import org.onap.policy.apex.model.basicmodel.service.ParameterService;
-import org.onap.policy.apex.model.utilities.ResourceUtils;
-import org.onap.policy.apex.model.utilities.TextFileUtils;
-import org.onap.policy.apex.service.engine.main.ApexMain;
-
-/**
- * The Class AvroEventAlbumContextTest.
- */
-public class AvroEventAlbumContextTest {
-
-    /**
-     * Test avro event fields, by starting an engine, send event in, test event out.
-     *
-     * @throws IOException Signals that an I/O exception has occurred.
-     * @throws ApexException the apex exception
-     */
-    @Test
-    public void testAvroEventAlbumContextTest() throws IOException, ApexException {
-        final File tempCommandFile = File.createTempFile("TestPolicyAvroEventContext", ".apex");
-        final File tempLogFile = File.createTempFile("TestPolicyAvroEventContext", ".log");
-        final File tempModelFile = File.createTempFile("TestPolicyAvroEventContext", ".json");
-
-        final String javaEventContextString =
-                ResourceUtils.getResourceAsString("examples/scripts/TestPolicyAvroEventContext.apex");
-        TextFileUtils.putStringAsFile(javaEventContextString, tempCommandFile);
-
-        final String[] cliArgs = new String[] {"-c", tempCommandFile.getCanonicalPath(), "-l",
-                tempLogFile.getAbsolutePath(), "-o", tempModelFile.getAbsolutePath()};
-
-        ModelService.clear();
-
-        new ApexCLIEditorMain(cliArgs);
-
-        tempCommandFile.delete();
-        tempLogFile.delete();
-
-        ModelService.clear();
-
-        final String[] args = new String[] {"-m", tempModelFile.getAbsolutePath(), "-c",
-                "src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json"};
-        final ApexMain apexMain = new ApexMain(args);
-        ThreadUtilities.sleep(1000);
-        apexMain.shutdown();
-        
-        ParameterService.clear();
-        // The output event is in this file
-        final File outputEventFile = new File("src/test/resources/events/Context_AvroEventAlbum_EventOut.json");
-        final String outputEventString =
-                TextFileUtils.getTextFileAsString(outputEventFile.getCanonicalPath()).replaceAll("\\s+", "");
-
-        // We compare the output to what we expect to get
-        final String outputEventCompareString = TextFileUtils
-                .getTextFileAsString("src/test/resources/events/Context_AvroEventAlbum_EventOutCompare.json")
-                .replaceAll("\\s+", "");
-
-        // Check what we got is what we expected to get
-        assertEquals(outputEventCompareString, outputEventString);
-
-        
-        tempModelFile.delete();
-        outputEventFile.delete();
-    }
-}
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java
new file mode 100644
index 000000000..284f31013
--- /dev/null
+++ b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/EventAlbumContextTest.java
@@ -0,0 +1,129 @@
+/*-
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.apex.apps.uservice.test.context;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.IOException;
+
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.TemporaryFolder;
+import org.onap.policy.apex.auth.clieditor.ApexCLIEditorMain;
+import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
+import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
+import org.onap.policy.apex.model.basicmodel.service.ModelService;
+import org.onap.policy.apex.model.basicmodel.service.ParameterService;
+import org.onap.policy.apex.model.utilities.ResourceUtils;
+import org.onap.policy.apex.model.utilities.TextFileUtils;
+import org.onap.policy.apex.service.engine.main.ApexMain;
+
+public class EventAlbumContextTest {
+    private File tempCommandFile;
+    private File tempLogFile;
+    private File tempModelFile;
+    private String eventContextString;
+    private String configFile;
+    private String outputFile;
+    private String compareFile;
+
+    @Rule
+    public TemporaryFolder tempTestDir = new TemporaryFolder();
+
+    @Test
+    public void testJavaEventAlbumContextTest() throws IOException, ApexException {
+        tempCommandFile = tempTestDir.newFile("TestPolicyJavaEventContext.apex");
+        tempLogFile = tempTestDir.newFile("TestPolicyJavaEventContext.log");
+        tempModelFile = tempTestDir.newFile("TestPolicyJavaEventContext.json");
+
+        eventContextString = ResourceUtils.getResourceAsString("examples/scripts/TestPolicyJavaEventContext.apex");
+
+        configFile = "src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json";
+        outputFile = "src/test/resources/events/Context_JavaEventAlbum_EventOut.json";
+        compareFile = "src/test/resources/events/Context_JavaEventAlbum_EventOutCompare.json";
+        
+        testEventAlbumContextTest();
+    }
+
+    @Test
+    public void testAvroEventAlbumContextTest() throws IOException, ApexException {
+        tempCommandFile = tempTestDir.newFile("TestPolicyAvroEventContext.apex");
+        tempLogFile = tempTestDir.newFile("TestPolicyAvroEventContext.log");
+        tempModelFile = tempTestDir.newFile("TestPolicyAvroEventContext.json");
+
+        eventContextString = ResourceUtils.getResourceAsString("examples/scripts/TestPolicyAvroEventContext.apex");
+
+        configFile = "src/test/resources/prodcons/Context_AvroEventAlbum_file2file.json";
+        outputFile = "src/test/resources/events/Context_AvroEventAlbum_EventOut.json";
+        compareFile = "src/test/resources/events/Context_AvroEventAlbum_EventOutCompare.json";
+        
+        testEventAlbumContextTest();
+    }
+
+    private void testEventAlbumContextTest() throws IOException, ApexException {
+        TextFileUtils.putStringAsFile(eventContextString, tempCommandFile);
+
+        final String[] cliArgs = new String[] { "-c", tempCommandFile.getCanonicalPath(), "-l",
+                        tempLogFile.getAbsolutePath(), "-o", tempModelFile.getAbsolutePath() };
+
+        ModelService.clear();
+
+        new ApexCLIEditorMain(cliArgs);
+
+        ModelService.clear();
+
+        final String[] args = new String[] { "-m", tempModelFile.getAbsolutePath(), "-c", configFile };
+        final ApexMain apexMain = new ApexMain(args);
+
+        // The output event will be in this file
+        final File outputEventFile = new File(outputFile);
+        String receivedApexOutputString = "";
+        for (int tenthsOfSecondsToWait = 100; tenthsOfSecondsToWait > 0; tenthsOfSecondsToWait--) {
+            if (outputEventFile.exists() && outputEventFile.length() > 0) {
+                // The output event is in this file
+                receivedApexOutputString = TextFileUtils.getTextFileAsString(outputEventFile.getCanonicalPath())
+                                .replaceAll("\\s+", "");
+                break;
+            }
+
+            ThreadUtilities.sleep(100);
+        }
+
+        // Shut down Apex
+        apexMain.shutdown();
+        ParameterService.clear();
+
+        assertTrue("Test failed, the output event file was not created", outputEventFile.exists());
+        outputEventFile.delete();
+
+        assertTrue("Test failed, the output event file was empty", receivedApexOutputString.length() > 0);
+
+        // We compare the output to what we expect to get
+        final String expectedFileContent = TextFileUtils
+                        .getTextFileAsString(compareFile);
+        final String outputEventCompareString = expectedFileContent.replaceAll("\\s+", "");
+
+        assertEquals(outputEventCompareString, receivedApexOutputString);
+    }
+
+}
diff --git a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/JavaEventAlbumContextTest.java b/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/JavaEventAlbumContextTest.java
deleted file mode 100644
index 242a9415c..000000000
--- a/testsuites/integration/integration-uservice-test/src/test/java/org/onap/policy/apex/apps/uservice/test/context/JavaEventAlbumContextTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-package org.onap.policy.apex.apps.uservice.test.context;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.File;
-import java.io.IOException;
-
-import org.junit.Test;
-import org.onap.policy.apex.auth.clieditor.ApexCLIEditorMain;
-import org.onap.policy.apex.core.infrastructure.threading.ThreadUtilities;
-import org.onap.policy.apex.model.basicmodel.concepts.ApexException;
-import org.onap.policy.apex.model.basicmodel.service.ModelService;
-import org.onap.policy.apex.model.basicmodel.service.ParameterService;
-import org.onap.policy.apex.model.utilities.ResourceUtils;
-import org.onap.policy.apex.model.utilities.TextFileUtils;
-import org.onap.policy.apex.service.engine.main.ApexMain;
-
-public class JavaEventAlbumContextTest {
-    @Test
-    public void testJavaEventAlbumContextTest() throws IOException, ApexException {
-        final File tempCommandFile = File.createTempFile("TestPolicyJavaEventContext", ".apex");
-        final File tempLogFile = File.createTempFile("TestPolicyJavaEventContext", ".log");
-        final File tempModelFile = File.createTempFile("TestPolicyJavaEventContext", ".json");
-
-        final String javaEventContextString =
-                ResourceUtils.getResourceAsString("examples/scripts/TestPolicyJavaEventContext.apex");
-        TextFileUtils.putStringAsFile(javaEventContextString, tempCommandFile);
-
-        final String[] cliArgs = new String[] {"-c", tempCommandFile.getCanonicalPath(), "-l",
-                tempLogFile.getAbsolutePath(), "-o", tempModelFile.getAbsolutePath()};
-
-        ModelService.clear();
-
-        new ApexCLIEditorMain(cliArgs);
-
-        tempCommandFile.delete();
-        tempLogFile.delete();
-
-        ModelService.clear();
-
-        final String[] args = new String[] {"-m", tempModelFile.getAbsolutePath(), "-c",
-                "src/test/resources/prodcons/Context_JavaEventAlbum_file2file.json"};
-        final ApexMain apexMain = new ApexMain(args);
-        ThreadUtilities.sleep(1000);
-        apexMain.shutdown();
-        ParameterService.clear();
-
-        // The output event is in this file
-        final File outputEventFile = new File("src/test/resources/events/Context_JavaEventAlbum_EventOut.json");
-        final String actualFileContent = TextFileUtils.getTextFileAsString(outputEventFile.getCanonicalPath());
-        final String outputEventString = actualFileContent.replaceAll("\\s+", "");
-
-        // We compare the output to what we expect to get
-        final String expectedFileContent = TextFileUtils
-                .getTextFileAsString("src/test/resources/events/Context_JavaEventAlbum_EventOutCompare.json");
-        final String outputEventCompareString = expectedFileContent.replaceAll("\\s+", "");
-
-        assertEquals(outputEventCompareString, outputEventString);
-
-        tempModelFile.delete();
-        outputEventFile.delete();
-    }
-}