Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Escobar2012-12-12 00:50:48 +0000
committerRoberto E. Escobar2012-12-12 00:50:48 +0000
commit40eb9ac0829e6f77ccdb3d59606e1cff735e16a6 (patch)
treeda5d9e42461e7e18ff0019ab2bd73b92db23d769
parentb733144b6a8a79781579842ec7db0a813a75be88 (diff)
downloadorg.eclipse.osee-40eb9ac0829e6f77ccdb3d59606e1cff735e16a6.tar.gz
org.eclipse.osee-40eb9ac0829e6f77ccdb3d59606e1cff735e16a6.tar.xz
org.eclipse.osee-40eb9ac0829e6f77ccdb3d59606e1cff735e16a6.zip
bug[ats_WXGH5]: Remove use of XResultDataFile from ATS integration tests
Fix resource leak created by XResultDataFile Move XResultDataFile to coverage bundle Change-Id: I6364d9e8eedd4fca7ab4fcb9ec535d2f6fb2b5bc
-rw-r--r--plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java7
-rw-r--r--plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java2
-rw-r--r--plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultDataFile.java45
3 files changed, 39 insertions, 15 deletions
diff --git a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java
index 6597fc53998..14b3b6d7d36 100644
--- a/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java
+++ b/plugins/org.eclipse.osee.ats.client.integration.tests/src/org/eclipse/osee/ats/client/integration/tests/ats/core/client/task/createTasks/CreateTasksOperationTest.java
@@ -42,7 +42,7 @@ import org.eclipse.osee.framework.core.operation.NullOperationLogger;
import org.eclipse.osee.framework.core.operation.OperationLogger;
import org.eclipse.osee.framework.core.operation.Operations;
import org.eclipse.osee.framework.core.util.Result;
-import org.eclipse.osee.framework.core.util.XResultDataFile;
+import org.eclipse.osee.framework.core.util.XResultData;
import org.eclipse.osee.framework.jdk.core.util.Collections;
import org.eclipse.osee.framework.logging.OseeLog;
import org.eclipse.osee.framework.skynet.core.artifact.Artifact;
@@ -122,7 +122,7 @@ public class CreateTasksOperationTest {
SkynetTransaction transaction =
TransactionManager.createTransaction(AtsUtilCore.getAtsBranch(),
artifactNamePrefix + " - testCreateTasksOperation");
- XResultDataFile resultData = new XResultDataFile();
+ XResultData resultData = new XResultData();
resultData.clear();
//Notice that the Actionable Item used is what will determine which TeamWF the CreateTasksOperation will chose
@@ -248,8 +248,11 @@ public class CreateTasksOperationTest {
IAtsVersion verArt4 = AtsTestUtil.getVerArt4();
verArt4.setBaselineBranchGuid(DemoSawBuilds.SAW_Bld_1.getGuid());
verArt4.setAllowCreateBranch(true);
+
reqTeamWf = AtsTestUtil.getTeamWf4();
Result result = AtsBranchManagerCore.createWorkingBranch_Validate(reqTeamWf);
+ Assert.assertTrue(result.isTrue());
+
Job createBranchJob = AtsBranchManagerCore.createWorkingBranch_Create(reqTeamWf);
createBranchJob.join();
int count = 0;
diff --git a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java
index c16c05c6b68..cdc698b55a0 100644
--- a/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java
+++ b/plugins/org.eclipse.osee.coverage/src/org/eclipse/osee/coverage/model/CoveragePackageBase.java
@@ -34,7 +34,7 @@ import org.eclipse.osee.framework.ui.swt.KeyedImage;
*/
public abstract class CoveragePackageBase extends NamedIdentity<String> implements ICoverage, ICoverageUnitProvider {
protected final List<CoverageUnit> coverageUnits = new CopyOnWriteArrayList<CoverageUnit>();
- final XResultDataFile logResultData = new XResultDataFile(false);
+ private final XResultDataFile logResultData = new XResultDataFile(false);
boolean editable = true;
protected final CoverageOptionManager coverageOptionManager;
protected ICoverageUnitFileContentsProvider coverageUnitFileContentsProvider;
diff --git a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultDataFile.java b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultDataFile.java
index 1417d06e6ad..17311b0d725 100644
--- a/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultDataFile.java
+++ b/plugins/org.eclipse.osee.framework.core/src/org/eclipse/osee/framework/core/util/XResultDataFile.java
@@ -15,8 +15,12 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStreamWriter;
+import java.util.logging.Level;
+import org.eclipse.osee.framework.core.internal.Activator;
import org.eclipse.osee.framework.jdk.core.util.GUID;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.eclipse.osee.framework.jdk.core.util.Strings;
+import org.eclipse.osee.framework.logging.OseeLog;
/**
* Used to log Info, Warning and Errors to multiple locations (logger, stderr/out and XResultView). Upon completion, a
@@ -30,7 +34,7 @@ import org.eclipse.osee.framework.jdk.core.util.Lib;
*/
public final class XResultDataFile extends XResultData {
- OutputStreamWriter out = null;
+ private OutputStreamWriter out;
private File file;
public XResultDataFile() {
@@ -46,25 +50,35 @@ public final class XResultDataFile extends XResultData {
clear();
}
+ private File getDirectory() {
+ File directory = new File(System.getProperty("java.io.tmpdir"));
+ if (!directory.canWrite()) {
+ directory = new File(System.getProperty("user.home"));
+ }
+ return directory;
+
+ }
+
@Override
public void clear() {
super.clear();
- String filename = System.getProperty("java.io.tmpdir") + GUID.create() + ".txt";
- file = new File(filename);
+ String filename = String.format("%s.txt", GUID.create());
+ file = new File(getDirectory(), filename);
try {
out = new OutputStreamWriter(new FileOutputStream(file), "UTF-8");
} catch (Exception ex) {
- System.out.println("Execption - " + ex.getLocalizedMessage());
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
}
@Override
public void addRaw(String str) {
- char[] chars = str.toCharArray();
- try {
- out.write(chars, 0, chars.length);
- } catch (IOException ex) {
- System.out.println("Execption - " + ex.getLocalizedMessage());
+ if (Strings.isValid(str)) {
+ try {
+ out.write(str);
+ } catch (IOException ex) {
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
+ }
}
}
@@ -79,12 +93,19 @@ public final class XResultDataFile extends XResultData {
@Override
public String toString() {
Lib.close(out);
+ String toReturn = null;
try {
- return Lib.fileToString(file);
+ toReturn = Lib.fileToString(file);
} catch (IOException ex) {
- System.out.println("Execption - " + ex.getLocalizedMessage());
+ OseeLog.log(Activator.class, Level.SEVERE, ex);
}
- return null;
+ return toReturn;
+ }
+
+ @Override
+ protected void finalize() throws Throwable {
+ dispose();
+ super.finalize();
}
}

Back to the top