summaryrefslogtreecommitdiff
path: root/vcl/qa/complex
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-08-05 09:54:58 +0200
committerNoel Grandin <noel@peralex.com>2014-08-05 11:31:50 +0200
commit0c5f51ebbcb7e22baa913e2012e3dcfcc6cf7897 (patch)
tree3d441110176e37c1a6ba2d15a3653d5023863075 /vcl/qa/complex
parentd26540bb05b0443e7988da34372c86f88cbf1f6c (diff)
java: remove commented out code
Change-Id: I44e2043e5da23bc9421c03e550ef1d8b7ebaad36
Diffstat (limited to 'vcl/qa/complex')
-rw-r--r--vcl/qa/complex/memCheck/CheckMemoryUsage.java38
-rw-r--r--vcl/qa/complex/persistent_window_states/PersistentWindowTest.java41
2 files changed, 0 insertions, 79 deletions
diff --git a/vcl/qa/complex/memCheck/CheckMemoryUsage.java b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
index 3b5bc61338ec..24ebf5f41c82 100644
--- a/vcl/qa/complex/memCheck/CheckMemoryUsage.java
+++ b/vcl/qa/complex/memCheck/CheckMemoryUsage.java
@@ -96,12 +96,7 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
private final String sWriterDoc = "sxw,writer_pdf_Export";
private final String sCalcDoc = "sxc,calc_pdf_Export";
private final String sImpressDoc = "sxi,impress_pdf_Export";
- // private String sProcessIdCommand = null;
TempDir m_aTempDir;
- // private String sFS = null;
- // private String sMemoryMap1 = null;
- // private String sMemoryMap2 = null;
- // private String sDocumentPath = "";
private String[][] sDocTypeExportFilter;
private String[][] sDocuments;
private int iAllowMemoryIncrease = 10;
@@ -112,13 +107,6 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
private static TestParameters param = null;
/**
- * Get all test methods
- * @return The test methods.
- // */
-// public String[] getTestMethodNames() {
-// return new String[] {"loadAndSaveDocuments"};
-// }
- /**
* Collect all documents to load and all filters used for export.
*/
@Before
@@ -186,11 +174,8 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
}
// get files to load and export
-// sDocumentPath = (String) param.get("TestDocumentPath");
String sDocumentPath = TestDocument.getUrl();
File f = new File(FileHelper.getJavaCompatibleFilename(sDocumentPath));
- // sDocumentPath = f.getAbsolutePath();
- // String sFS = System.getProperty("file.separator");
sDocuments = new String[sDocTypeExportFilter.length][];
for (int j = 0; j < sDocTypeExportFilter.length; j++)
{
@@ -199,8 +184,6 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
sDocuments[j] = new String[doc.length];
for (int i = 0; i < doc.length; i++)
{
- // final String sDocument = FileHelper.appendPath(sDocumentPath, doc[i]);
- // sDocuments[j][i] = utils.getFullURL(sDocuments[j][i]);
sDocuments[j][i] = TestDocument.getUrl(doc[i]);
}
}
@@ -212,19 +195,6 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
@After
public void after()
{
- // delete the constructed files.
-// we don't need to delete anything, all is stored in $USER_TREE
-// for (int i = 0; i < iExportDocCount; i++)
-// {
-// final String sDocumentName = "DocExport" + i + ".pdf";
-// final String sFilename = FileHelper.appendPath(m_sTempDir, sDocumentName);
-// File f = new File(FileHelper.getJavaCompatibleFilename(sFilename));
-// f.delete();
-// }
- // File f = new File(sProcessIdCommand);
- // f.delete();
- // f = new File(sOfficeMemoryCommand);
- // f.delete();
}
/**
@@ -252,15 +222,8 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
final String sDocument = sDocuments[k][i];
final String sExtension = sDocTypeExportFilter[k][1];
-// OfficeMemchecker aChecker = new OfficeMemchecker();
-// aChecker.setDocumentName(FileHelper.getBasename(sDocument));
-// aChecker.setExtension(sExtension);
-// aChecker.start();
-
loadAndSaveNTimesDocument(sDocument, 1, sExtension);
-// nOk += checkMemory(aChecker);
-// nRunThrough ++;
}
System.out.println();
System.out.println();
@@ -335,7 +298,6 @@ public class CheckMemoryUsage /* extends ComplexTestCase */
{
final String sDocumentName = FileHelper.getBasename(_sDocument) + "_" + j + ".pdf";
final String sFilename = FileHelper.appendPath(m_aTempDir.getOfficeTempDir(), sDocumentName);
- // String url = utils.getFullURL(sFilename);
String url = sFilename; // graphical.FileHelper.getFileURLFromSystemPath(sFilename);
try
{
diff --git a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
index 3f0c52485000..b35bd6b7c14d 100644
--- a/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
+++ b/vcl/qa/complex/persistent_window_states/PersistentWindowTest.java
@@ -31,9 +31,7 @@ import helper.ConfigurationRead;
-// import org.junit.After;
import org.junit.AfterClass;
-// import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.openoffice.test.OfficeConnection;
@@ -48,26 +46,6 @@ import static org.junit.Assert.*;
public class PersistentWindowTest
{
- // private XMultiServiceFactory xMSF;
-// private OfficeProvider oProvider;
-
- /**
- * A frunction to tell the framework, which test functions are available.
- * Right now, it's only 'checkPersistentWindowState'.
- * @return All test methods.
- */
-// public String[] getTestMethodNames()
-// {
-// return new String[]
-// {
-// "checkPersistentWindowState"
-// };
-// }
-
- /**
- * The test parameters
- */
- // private static TestParameters param = null;
/**
* Test if all available document types change the
@@ -92,33 +70,14 @@ public class PersistentWindowTest
*/
@Test public void checkPersistentWindowState()
{
- // final XMultiServiceFactory xMsf = getMSF();
-
- // some Tests need the qadevOOo TestParameters, it is like a Hashmap for Properties.
-// param = new TestParameters();
-// param.put("ServiceFactory", xMsf); // some qadevOOo functions need the ServiceFactory
-
try
{
- // At first we are already connected
- // if (!connect())
- // {
- // return;
- // }
-
- // fetch the multi service factory for setup
- // XMultiServiceFactory xCP = getMSF();
-
- // create the configuration reader
- // ConfigurationRead cfgRead = new ConfigurationRead(xCP);
-
// just test the wrong ones, not all.
String[] els = new String[]
{
"Office/Factories/com.sun.star.drawing.DrawingDocument",
"Office/Factories/com.sun.star.formula.FormulaProperties",
- //"Office/Factories/com.sun.star.presentation.PresentationDocument",
"Office/Factories/com.sun.star.sheet.SpreadsheetDocument",
"Office/Factories/com.sun.star.text.GlobalDocument",
"Office/Factories/com.sun.star.text.TextDocument",