[etunit.converter] removed Tex part

3 files changed, 0 insertions, 245 deletions

diff --git a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverterWithTex.java b/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverterWithTex.java
deleted file mode 100644
index 7f8d42152..000000000
--- a/plugins/org.eclipse.etrice.etunit.converter/src/org/eclipse/etrice/etunit/converter/EtUnitReportConverterWithTex.java
+++ /dev/null
@@ -1,192 +0,0 @@
-/*******************************************************************************

- * Copyright (c) 2012 protos software gmbh (http://www.protos.de).

- * All rights reserved. This program and the accompanying materials

- * are made available under the terms of the Eclipse Public License v1.0

- * which accompanies this distribution, and is available at

- * http://www.eclipse.org/legal/epl-v10.html

- * 

- * CONTRIBUTORS:

- * 		Henrik Rentz-Reichert (initial contribution)

- * 

- *******************************************************************************/

-

-package org.eclipse.etrice.etunit.converter;

-

-import java.io.File;

-import java.io.FileNotFoundException;

-import java.io.FileWriter;

-import java.io.IOException;

-

-import org.eclipse.emf.ecore.resource.ResourceSet;

-import org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot;

-import org.eclipse.etrice.etunit.converter.Etunit.TestcaseType;

-import org.eclipse.etrice.etunit.converter.Etunit.TestsuiteType;

-

-/**

- * @author Henrik Rentz-Reichert

- *

- */

-public class EtUnitReportConverterWithTex extends EtUnitReportConverter {

-

-	protected static class TexOptions extends EtUnitReportConverter.Options {

-		

-		private boolean texOutput = false;

-		private String texFile = null;

-

-		/* (non-Javadoc)

-		 * @see org.eclipse.etrice.etunit.converter.EtUnitReportConverter.Options#needCombined()

-		 */

-		@Override

-		public boolean needCombined() {

-			return isCombinedResults() || texOutput;

-		}

-

-		public boolean isTexOutput() {

-			return texOutput;

-		}

-

-		public void setTexOutput(boolean texOutput) {

-			this.texOutput = texOutput;

-		}

-

-		public String getTexFile() {

-			return texFile;

-		}

-

-		public void setTexFile(String texFile) {

-			this.texFile = texFile;

-		}

-		

-		/* (non-Javadoc)

-		 * @see org.eclipse.etrice.etunit.converter.EtUnitReportConverter.Options#parseOption(java.lang.String[], int)

-		 */

-		@Override

-		protected int parseOption(String[] args, int i) {

-			if (args[i].equals(OPTION_TEX_OUTPUT)) {

-				setTexOutput(true);

-				if (++i<args.length) {

-					setTexFile(args[i]);

-					return i;

-				}

-				else {

-					System.err.println("Error: "+OPTION_TEX_OUTPUT+" must be followed by filename");

-				}

-			}

-			return -1;

-		}

-	}

-	

-	public static final String OPTION_TEX_OUTPUT = "-tex";

-

-

-	protected void printUsage() {

-		System.err.println("usage: EtUnitReportConverterTex [("+OPTION_COMBINED+"|"+OPTION_ONLY_COMBINED+") <combined file>] ["+OPTION_TEX_OUTPUT+" <tex file>] ["+OPTION_SUITE_NAME+" <name>] <*"+ETU_EXTENSION+" files>\n"

-				+"    "+OPTION_COMBINED+" <combined file>: also save a combined result for all tests to the specified file\n"

-				+"    "+OPTION_ONLY_COMBINED+" <combined file>: don't create reports for every single test, only combined one to the specified file\n"

-				+"    "+OPTION_TEX_OUTPUT+" <tex file>: produce tex output to specified file\n"

-				+"    "+OPTION_SUITE_NAME+" <name>: replace the suite name in the result\n"

-			);

-	}

-	

-	/**

-	 * @param args

-	 */

-	public static void main(String[] args) {

-		new EtUnitReportConverterWithTex().run(args);

-	}

-	

-	/**

-	 * @param args

-	 * @return

-	 */

-	protected Options parseOptions(String[] args) {

-		TexOptions options = new TexOptions();

-		if (!options.parseOptions(args)) {

-			printUsage();

-			return null;

-		}

-		

-		return options;

-	}

-

-	/* (non-Javadoc)

-	 * @see org.eclipse.etrice.etunit.converter.EtUnitReportConverter#saveCombined(org.eclipse.etrice.etunit.converter.Etunit.DocumentRoot, org.eclipse.etrice.etunit.converter.EtUnitReportConverter.Options, org.eclipse.emf.ecore.resource.ResourceSet)

-	 */

-	@Override

-	protected void saveCombined(DocumentRoot root, Options options, ResourceSet rs) {

-		super.saveCombined(root, options, rs);

-		

-		if (options instanceof Options && ((TexOptions)options).isTexOutput()) {

-			File report = new File(((TexOptions)options).getTexFile());

-			saveTexReport(root, report);

-		}

-	}

-	

-	private String doEscape(String x){

-		int index = 0;

-		String c = "azAZ";

-		String ret = x;

-		while (index < x.length()-2)

-		{

-			if (ret.charAt(index) >= c.charAt(0) && 

-				ret.charAt(index) <= c.charAt(1) && 

-				ret.charAt(index+1) >= c.charAt(2) && 

-				ret.charAt(index+1) <= c.charAt(3)

-			)

-			{

-				ret = ret.substring(0,index+1) + "\\-" + ret.substring(index+1);

-			}

-			index = index + 1;

-		}

-		return ret.replaceAll("_","\\\\-\\\\_");

-	}

-

-	private void saveTexReport(DocumentRoot root, File report) {

-		StringBuilder contents = new StringBuilder();

-

-		contents.append("\\newcommand{\\ForAllTestCases}{}%\n");

-		contents.append("\\newcounter{FailCount}%\n");

-		contents.append("\\newcommand{\\ForAllSuites}{%\n");

-		contents.append("    %\\DoSuite{name}{nTests}{nPassed}{nFail}{time}%\n");

-		for (TestsuiteType ts : root.getTestsuites().getTestsuite()) {

-			contents.append("    \\setcounter{FailCount}{"+ts.getFailures()+"}%\n");

-			contents.append("    \\renewcommand{\\ForAllTestCases}{%\n");

-			contents.append("        %\\DoCase{name}{time}{status}{msg}{short}{long}%\n");

-			for (TestcaseType tc : ts.getTestcase()) {

-				String status = tc.getFailure()!=null?"fail":"pass";

-				String msg = tc.getFailure()!=null?

-						"expected "+tc.getFailure().getExpected()+" but was "+tc.getFailure().getActual()

-						:

-						"";

-				String combinedName = ts.getName()+tc.getName();

-				contents.append("        \\DoCase{" + tc.getName() + "}{" + doEscape(tc.getName()) + "}{" + tc.getTime() + "}{" + status + "}{" + msg

-						+ "}{\\" + combinedName + "shortdesc}{\\" + combinedName + "longdesc}%\n");

-			}

-			contents.append("    }%\n");

-			int nPassed = ts.getTests()-ts.getFailures();

-			contents.append("    \\DoSuite{"+ts.getName()+"}{" + doEscape(ts.getName()) + "}{"+ts.getTests()+"}{"+nPassed+"}{"+ts.getFailures()+"}{"+ts.getTime()+"}%\n");

-		}

-		contents.append("}%\n");

-		

-		FileWriter fos = null;

-		try {

-			fos = new FileWriter(report);

-			fos.append(contents.toString());

-		} catch (FileNotFoundException e) {

-			System.err.println("Error: file "+report.toString()+" could not be saved ("+e.getMessage()+")");

-			e.printStackTrace();

-		} catch (IOException e) {

-			System.err.println("Error: file "+report.toString()+" could not be written ("+e.getMessage()+")");

-			e.printStackTrace();

-		}

-		finally {

-			if (fos!=null)

-				try {

-					fos.close();

-				} catch (IOException e) {

-					System.err.println("Error: file "+report.toString()+" could not be closed ("+e.getMessage()+")");

-					e.printStackTrace();

-				}

-		}

-	}

-}

diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/reports/out.tex b/tests/org.eclipse.etrice.etunit.converter.tests/reports/out.tex
deleted file mode 100644
index 47ad49e1c..000000000
--- a/tests/org.eclipse.etrice.etunit.converter.tests/reports/out.tex
+++ /dev/null
@@ -1,41 +0,0 @@
-\newcommand{\ForAllTestCases}{}%
-\newcounter{FailCount}%
-\newcommand{\ForAllSuites}{%
-    %\DoSuite{name}{nTests}{nPassed}{nFail}{time}%
-    \setcounter{FailCount}{0}%
-    \renewcommand{\ForAllTestCases}{%
-        %\DoCase{name}{time}{status}{msg}{short}{long}%
-        \DoCase{TestEtMessage_testBasicMessage}{Test\-Et\-Message\-\_test\-BasicMessage}{0}{pass}{}{\TestMessageTestEtMessage_testBasicMessageshortdesc}{\TestMessageTestEtMessage_testBasicMessagelongdesc}%
-    }%
-    \DoSuite{TestMessage}{Test\-Message}{1}{1}{0}{0}%
-    \setcounter{FailCount}{1}%
-    \renewcommand{\ForAllTestCases}{%
-        %\DoCase{name}{time}{status}{msg}{short}{long}%
-        \DoCase{TestEtMessageQueue_testPushPop}{Test\-Et\-Message\-Queue\-\_testPushPop}{0}{fail}{expected 334 but was 333}{\TestEtMessageQueueTestEtMessageQueue_testPushPopshortdesc}{\TestEtMessageQueueTestEtMessageQueue_testPushPoplongdesc}%
-        \DoCase{TestEtMessageQueue_testMassiveMessaging}{Test\-Et\-Message\-Queue\-\_test\-MassiveMessaging}{187}{pass}{}{\TestEtMessageQueueTestEtMessageQueue_testMassiveMessagingshortdesc}{\TestEtMessageQueueTestEtMessageQueue_testMassiveMessaginglongdesc}%
-    }%
-    \DoSuite{TestEtMessageQueue}{Test\-Et\-MessageQueue}{2}{1}{1}{187}%
-    \setcounter{FailCount}{0}%
-    \renewcommand{\ForAllTestCases}{%
-        %\DoCase{name}{time}{status}{msg}{short}{long}%
-        \DoCase{TestEtMessageService_init}{Test\-Et\-Message\-Service\-\_init}{0}{pass}{}{\TestEtMessageServiceTestEtMessageService_initshortdesc}{\TestEtMessageServiceTestEtMessageService_initlongdesc}%
-        \DoCase{TestEtMessageService_GetPushPopReturn}{Test\-Et\-Message\-Service\-\_Get\-PushPopReturn}{0}{pass}{}{\TestEtMessageServiceTestEtMessageService_GetPushPopReturnshortdesc}{\TestEtMessageServiceTestEtMessageService_GetPushPopReturnlongdesc}%
-        \DoCase{TestEtMessageService_GetReturn}{Test\-Et\-Message\-Service\-\_GetReturn}{16}{pass}{}{\TestEtMessageServiceTestEtMessageService_GetReturnshortdesc}{\TestEtMessageServiceTestEtMessageService_GetReturnlongdesc}%
-        \DoCase{TestEtMessageService_execute}{Test\-Et\-Message\-Service\-\_execute}{0}{pass}{}{\TestEtMessageServiceTestEtMessageService_executeshortdesc}{\TestEtMessageServiceTestEtMessageService_executelongdesc}%
-        \DoCase{TestEtMessageService_getMessagePoolLowWaterMark}{Test\-Et\-Message\-Service\-\_get\-Message\-Pool\-LowWaterMark}{0}{pass}{}{\TestEtMessageServiceTestEtMessageService_getMessagePoolLowWaterMarkshortdesc}{\TestEtMessageServiceTestEtMessageService_getMessagePoolLowWaterMarklongdesc}%
-    }%
-    \DoSuite{TestEtMessageService}{Test\-Et\-Message\-Service}{5}{5}{0}{16}%
-    \setcounter{FailCount}{0}%
-    \renewcommand{\ForAllTestCases}{%
-        %\DoCase{name}{time}{status}{msg}{short}{long}%
-        \DoCase{TestEtUnit_Expect_Order}{Test\-Et\-Unit\-\_Expect\-\_Order}{0}{pass}{}{\TestEtUnitTestEtUnit_Expect_Ordershortdesc}{\TestEtUnitTestEtUnit_Expect_Orderlongdesc}%
-        \DoCase{TestEtUnit_Expect}{Test\-Et\-Unit\-\_Expect}{0}{pass}{}{\TestEtUnitTestEtUnit_Expectshortdesc}{\TestEtUnitTestEtUnit_Expectlongdesc}%
-    }%
-    \DoSuite{TestEtUnit}{Test\-Et\-Unit}{2}{2}{0}{0}%
-    \setcounter{FailCount}{0}%
-    \renewcommand{\ForAllTestCases}{%
-        %\DoCase{name}{time}{status}{msg}{short}{long}%
-        \DoCase{openAll and closeAll}{open\-All and closeAll}{0}{pass}{}{\etUnitopenAll and closeAllshortdesc}{\etUnitopenAll and closeAlllongdesc}%
-    }%
-    \DoSuite{etUnit}{et\-Unit}{1}{1}{0}{0}%
-}%
diff --git a/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java b/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java
index 3908d62b6..fcdee141d 100644
--- a/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java
+++ b/tests/org.eclipse.etrice.etunit.converter.tests/src/org/eclipse/etrice/etunit/converter/ConverterTest.java
@@ -84,18 +84,6 @@ public class ConverterTest {
 	}

 

 	@Test

-	public void testTex() {

-		ArrayList<String> args = new ArrayList<String>();

-		args.add(basePath+"report3.etu");

-		args.add(basePath+"report4.etu");

-		args.add(EtUnitReportConverterWithTex.OPTION_TEX_OUTPUT);

-		args.add(basePath+"out.tex");

-		

-		String[] arguments = new String[args.size()];

-		EtUnitReportConverterWithTex.main(args.toArray(arguments));

-	}

-

-	@Test

 	public void testChangeSuiteName() {

 		ArrayList<String> args = new ArrayList<String>();

 		args.add(basePath+"report5.etu");