mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-04-22 14:12:10 +02:00
Releng: Fix Terminal Unittests under Tycho with Jacoco
Change-Id: Ib4daa2402917122edb4b561dbf1ae696c80f0c7c Signed-off-by: Martin Oberhuber <mober.at+eclipse@gmail.com>
This commit is contained in:
Martin Oberhuber
parent
b2a7eec797
commit
3e539b7331
11 changed files with 301 additions and 53 deletions
|
|
@ -80,6 +80,64 @@
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
|
<artifactId>target-platform-configuration</artifactId>
|
||||||
|
<configuration>
|
||||||
|
<dependency-resolution>
|
||||||
|
<extraRequirements>
|
||||||
|
<!-- product IU under test -->
|
||||||
|
<requirement>
|
||||||
|
<type>p2-installable-unit</type>
|
||||||
|
<id>org.eclipse.platform.ide</id>
|
||||||
|
<versionRange>0.0.0</versionRange>
|
||||||
|
</requirement>
|
||||||
|
<requirement>
|
||||||
|
<type>eclipse-feature</type>
|
||||||
|
<id>org.eclipse.sdk</id>
|
||||||
|
<versionRange>0.0.0</versionRange>
|
||||||
|
</requirement>
|
||||||
|
<requirement>
|
||||||
|
<type>eclipse-feature</type>
|
||||||
|
<id>org.eclipse.cdt.platform</id>
|
||||||
|
<versionRange>0.0.0</versionRange>
|
||||||
|
</requirement>
|
||||||
|
<requirement>
|
||||||
|
<type>eclipse-feature</type>
|
||||||
|
<id>org.eclipse.remote</id>
|
||||||
|
<versionRange>0.0.0</versionRange>
|
||||||
|
</requirement>
|
||||||
|
<requirement>
|
||||||
|
<type>eclipse-feature</type>
|
||||||
|
<id>org.eclipse.swtbot.eclipse</id>
|
||||||
|
<versionRange>0.0.0</versionRange>
|
||||||
|
</requirement>
|
||||||
|
</extraRequirements>
|
||||||
|
</dependency-resolution>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.jacoco</groupId>
|
||||||
|
<artifactId>jacoco-maven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<goals>
|
||||||
|
<goal>prepare-agent</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<includes>
|
||||||
|
<include>org.eclipse.tm.terminal*</include>
|
||||||
|
</includes>
|
||||||
|
<!--
|
||||||
|
<excludes>
|
||||||
|
<exclude>org.eclipse.tm.terminal.test.*</exclude>
|
||||||
|
</excludes>
|
||||||
|
-->
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
<!--
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
<artifactId>tycho-surefire-plugin</artifactId>
|
<artifactId>tycho-surefire-plugin</artifactId>
|
||||||
|
|
@ -91,14 +149,15 @@
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<type>p2-installable-unit</type>
|
<type>p2-installable-unit</type>
|
||||||
<artifactId>org.eclipse.sdk.feature.group</artifactId>
|
<artifactId>org.eclipse.platform.feature.group</artifactId>
|
||||||
<version>${sdk-version}</version>
|
<version>${sdk-version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<product>org.eclipse.sdk.ide</product>
|
<product>org.eclipse.platform.ide</product>
|
||||||
<argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine>
|
<argLine>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true</argLine>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
-->
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
</profile>
|
</profile>
|
||||||
|
|
|
||||||
|
|
@ -40,18 +40,27 @@
|
||||||
<!-- We stick to tycho-0.22 since it supports Java 7 for building -->
|
<!-- We stick to tycho-0.22 since it supports Java 7 for building -->
|
||||||
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
|
<!-- See https://bugs.eclipse.org/bugs/show_bug.cgi?id=518104 for reference -->
|
||||||
<tycho-version>0.22.0</tycho-version>
|
<tycho-version>0.22.0</tycho-version>
|
||||||
<tycho-extras-version>0.22.0</tycho-extras-version>
|
<tycho-extras-version>${tycho-version}</tycho-extras-version>
|
||||||
<maven-resources-version>2.7</maven-resources-version>
|
<maven-resources-version>2.7</maven-resources-version>
|
||||||
<maven-antrun-version>1.8</maven-antrun-version>
|
<maven-antrun-version>1.8</maven-antrun-version>
|
||||||
<gmaven-version>1.5</gmaven-version>
|
<gmaven-version>1.5</gmaven-version>
|
||||||
<!-- Stick to Findbugs 2.5.2 until newer versions are supported by hudson.eclipse.org -->
|
<!-- Stick to Findbugs 2.5.2 until newer versions are supported by hudson.eclipse.org -->
|
||||||
<findbugs-version>2.5.2</findbugs-version>
|
<findbugs-version>2.5.2</findbugs-version>
|
||||||
|
<!-- Check available versions at https://repository.sonatype.org/content/repositories/public/org/jacoco/jacoco-maven-plugin -->
|
||||||
|
<jacoco-version>0.7.4.201502262128</jacoco-version>
|
||||||
|
<!-- Needed by Jacoco, see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
|
||||||
|
<tycho.testArgLine></tycho.testArgLine>
|
||||||
<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
|
<eclipse-jarsigner-version>1.1.2</eclipse-jarsigner-version>
|
||||||
|
|
||||||
<!-- Common global properties -->
|
<!-- Common global properties -->
|
||||||
<adminDir>${env.WORKSPACE}/admin</adminDir>
|
<adminDir>${env.WORKSPACE}/admin</adminDir>
|
||||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||||
|
|
||||||
|
<!-- JaCoCo global properties -->
|
||||||
|
<jacoco.skip>false</jacoco.skip>
|
||||||
|
<jacoco.output>file</jacoco.output>
|
||||||
|
<jacoco.dumpOnExit>true</jacoco.dumpOnExit>
|
||||||
|
|
||||||
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
|
<tycho.scmUrl>scm:git:git://git.eclipse.org/gitroot/tm/org.eclipse.tm.terminal.git</tycho.scmUrl>
|
||||||
|
|
||||||
<terminal-stream>development</terminal-stream>
|
<terminal-stream>development</terminal-stream>
|
||||||
|
|
@ -62,15 +71,15 @@
|
||||||
<!-- Set up Mars as the default target platform to build against, -->
|
<!-- Set up Mars as the default target platform to build against, -->
|
||||||
<!-- Because it supports Java 7, but also already has the cdt.native.serial plugin. -->
|
<!-- Because it supports Java 7, but also already has the cdt.native.serial plugin. -->
|
||||||
<!-- Also, PTP o.e.remote-2.0 from Mars is the oldes remote version that we can support. -->
|
<!-- Also, PTP o.e.remote-2.0 from Mars is the oldes remote version that we can support. -->
|
||||||
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
|
|
||||||
<platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
|
<platform-site>http://download.eclipse.org/eclipse/updates/4.5</platform-site>
|
||||||
<platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
|
<platform-release-site>http://download.eclipse.org/releases/mars</platform-release-site>
|
||||||
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
|
<license-site>http://download.eclipse.org/cbi/updates/license</license-site>
|
||||||
<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
|
<cdt-site>http://download.eclipse.org/tools/cdt/releases/8.8.1</cdt-site>
|
||||||
<rse-site>http://download.eclipse.org/tm/updates/4.0</rse-site>
|
<tm-site>http://download.eclipse.org/tm/updates/4.0</tm-site>
|
||||||
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/mars/milestones</remote-site>
|
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/2.0.0</remote-site>
|
||||||
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
|
|
||||||
<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
|
<rxtx-site>http://archive.eclipse.org/tm/updates/rxtx</rxtx-site>
|
||||||
|
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository</orbit-site>
|
||||||
|
<swtbot-site>http://download.eclipse.org/technology/swtbot/releases/latest/</swtbot-site>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<repositories>
|
<repositories>
|
||||||
|
|
@ -100,13 +109,8 @@
|
||||||
<layout>p2</layout>
|
<layout>p2</layout>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>rse</id>
|
<id>tm</id>
|
||||||
<url>${rse-site}</url>
|
<url>${tm-site}</url>
|
||||||
<layout>p2</layout>
|
|
||||||
</repository>
|
|
||||||
<repository>
|
|
||||||
<id>remote</id>
|
|
||||||
<url>${remote-site}</url>
|
|
||||||
<layout>p2</layout>
|
<layout>p2</layout>
|
||||||
</repository>
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
|
|
@ -114,6 +118,11 @@
|
||||||
<url>${swtbot-site}</url>
|
<url>${swtbot-site}</url>
|
||||||
<layout>p2</layout>
|
<layout>p2</layout>
|
||||||
</repository>
|
</repository>
|
||||||
|
<repository>
|
||||||
|
<id>remote</id>
|
||||||
|
<url>${remote-site}</url>
|
||||||
|
<layout>p2</layout>
|
||||||
|
</repository>
|
||||||
<repository>
|
<repository>
|
||||||
<id>rxtx</id>
|
<id>rxtx</id>
|
||||||
<url>${rxtx-site}</url>
|
<url>${rxtx-site}</url>
|
||||||
|
|
@ -205,7 +214,7 @@
|
||||||
<platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
|
<platform-site>http://download.eclipse.org/eclipse/updates/4.6</platform-site>
|
||||||
<platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
|
<platform-release-site>http://download.eclipse.org/releases/neon</platform-release-site>
|
||||||
<orbit-site>http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository</orbit-site>
|
<orbit-site>http://download.eclipse.org/tools/orbit/R-builds/R20170307180635/repository</orbit-site>
|
||||||
<rse-site>http://download.eclipse.org/tm/updates/4.2</rse-site>
|
<tm-site>http://download.eclipse.org/tm/updates/4.2</tm-site>
|
||||||
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones</remote-site>
|
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/neon/milestones</remote-site>
|
||||||
<cdt-site>http://download.eclipse.org/tools/cdt/releases/9.2</cdt-site>
|
<cdt-site>http://download.eclipse.org/tools/cdt/releases/9.2</cdt-site>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
@ -220,7 +229,7 @@
|
||||||
<platform-site>http://download.eclipse.org/eclipse/updates/4.7</platform-site>
|
<platform-site>http://download.eclipse.org/eclipse/updates/4.7</platform-site>
|
||||||
<platform-release-site>http://download.eclipse.org/releases/oxygen</platform-release-site>
|
<platform-release-site>http://download.eclipse.org/releases/oxygen</platform-release-site>
|
||||||
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
|
<orbit-site>http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository</orbit-site>
|
||||||
<rse-site>http://download.eclipse.org/tm/updates/4.3milestones</rse-site>
|
<tm-site>http://download.eclipse.org/tm/updates/4.3milestones</tm-site>
|
||||||
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
|
<remote-site>http://download.eclipse.org/tools/ptp/builds/remote/oxygen/milestones</remote-site>
|
||||||
<cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
|
<cdt-site>http://download.eclipse.org/tools/cdt/builds/oxygen/milestones</cdt-site>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: %pluginName
|
Bundle-Name: %pluginName
|
||||||
Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true
|
Bundle-SymbolicName: org.eclipse.tm.terminal.control; singleton:=true
|
||||||
Bundle-Version: 4.2.0.qualifier
|
Bundle-Version: 4.3.0.qualifier
|
||||||
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
|
Bundle-Activator: org.eclipse.tm.internal.terminal.control.impl.TerminalPlugin
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
################################################################################
|
################################################################################
|
||||||
# Copyright (c) 2006, 2016 Wind River Systems, Inc. and others.
|
# Copyright (c) 2006, 2017 Wind River Systems, Inc. and others.
|
||||||
# All rights reserved. This program and the accompanying materials
|
# All rights reserved. This program and the accompanying materials
|
||||||
# are made available under the terms of the Eclipse Public License v1.0
|
# are made available under the terms of the Eclipse Public License v1.0
|
||||||
# which accompanies this distribution, and is available at
|
# which accompanies this distribution, and is available at
|
||||||
|
|
@ -20,5 +20,5 @@ blurb=Target Management Terminal Widget\n\
|
||||||
\n\
|
\n\
|
||||||
Version: {featureVersion}\n\
|
Version: {featureVersion}\n\
|
||||||
\n\
|
\n\
|
||||||
(c) Copyright Wind River Systems, Inc. and others 2003, 2016. All rights reserved.\n\
|
(c) Copyright Wind River Systems, Inc. and others 2003, 2017. All rights reserved.\n\
|
||||||
Visit http://www.eclipse.org/tm
|
Visit http://www.eclipse.org/tm
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
<relativePath>../../admin/pom-build.xml</relativePath>
|
<relativePath>../../admin/pom-build.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<version>4.2.0-SNAPSHOT</version>
|
<version>4.3.0-SNAPSHOT</version>
|
||||||
<artifactId>org.eclipse.tm.terminal.control</artifactId>
|
<artifactId>org.eclipse.tm.terminal.control</artifactId>
|
||||||
<packaging>eclipse-plugin</packaging>
|
<packaging>eclipse-plugin</packaging>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2008, 2015 Wind River Systems, Inc. and others.
|
* Copyright (c) 2008, 2017 Wind River Systems, Inc. and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
|
@ -15,7 +15,13 @@ import java.io.FilterOutputStream;
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.OutputStream;
|
import java.io.OutputStream;
|
||||||
|
|
||||||
class TerminalToRemoteInjectionOutputStream extends FilterOutputStream {
|
/**
|
||||||
|
* @noextend This class is not intended to be subclassed by clients.
|
||||||
|
* @noreference This class is not intended to be referenced by clients.
|
||||||
|
* @noinstantiate This class is not intended to be instantiated by clients.
|
||||||
|
* This class used to be package-protected. It is public only for access by the Unit Tests.
|
||||||
|
*/
|
||||||
|
public class TerminalToRemoteInjectionOutputStream extends FilterOutputStream {
|
||||||
/**
|
/**
|
||||||
* This class handles bytes written to the {@link TerminalToRemoteInjectionOutputStream}.
|
* This class handles bytes written to the {@link TerminalToRemoteInjectionOutputStream}.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2007, 2015 Wind River Systems, Inc. and others.
|
* Copyright (c) 2007, 2017 Wind River Systems, Inc. and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
|
@ -18,6 +18,9 @@ import org.eclipse.tm.terminal.model.ITerminalTextData;
|
||||||
import org.eclipse.tm.terminal.model.Style;
|
import org.eclipse.tm.terminal.model.Style;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* @noextend This class is not intended to be subclassed by clients.
|
||||||
|
* @noreference This class not intended to be referenced by clients.
|
||||||
|
* It used to be package protected, and it is public only for Unit Tests.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
public class VT100EmulatorBackend implements IVT100EmulatorBackend {
|
public class VT100EmulatorBackend implements IVT100EmulatorBackend {
|
||||||
|
|
@ -138,7 +141,12 @@ public class VT100EmulatorBackend implements IVT100EmulatorBackend {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int toAbsoluteLine(int line) {
|
/**
|
||||||
|
* @nooverride This method is not intended to be re-implemented or extended by clients.
|
||||||
|
* @noreference This method is not intended to be referenced by clients.
|
||||||
|
* It used to be package protected, and it is public only for Unit Tests.
|
||||||
|
*/
|
||||||
|
public int toAbsoluteLine(int line) {
|
||||||
synchronized (fTerminal) {
|
synchronized (fTerminal) {
|
||||||
return fTerminal.getHeight()-fLines+line;
|
return fTerminal.getHeight()-fLines+line;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* Copyright (c) 2007, 2015 Wind River Systems, Inc. and others.
|
* Copyright (c) 2007, 2017 Wind River Systems, Inc. and others.
|
||||||
* All rights reserved. This program and the accompanying materials
|
* All rights reserved. This program and the accompanying materials
|
||||||
* are made available under the terms of the Eclipse Public License v1.0
|
* are made available under the terms of the Eclipse Public License v1.0
|
||||||
* which accompanies this distribution, and is available at
|
* which accompanies this distribution, and is available at
|
||||||
|
|
@ -16,6 +16,10 @@ import org.eclipse.tm.terminal.model.ITerminalTextData;
|
||||||
/**
|
/**
|
||||||
* Collects the changes of the {@link ITerminalTextData}
|
* Collects the changes of the {@link ITerminalTextData}
|
||||||
*
|
*
|
||||||
|
* @noextend This class is not intended to be subclassed by clients.
|
||||||
|
* @noreference This class is not intended to be referenced by clients.
|
||||||
|
* @noinstantiate This class is not intended to be instantiated by clients.
|
||||||
|
* This class used to be package-protected. It is public only for access by the Unit Tests.
|
||||||
*/
|
*/
|
||||||
public class SnapshotChanges implements ISnapshotChanges {
|
public class SnapshotChanges implements ISnapshotChanges {
|
||||||
/**
|
/**
|
||||||
|
|
@ -71,8 +75,11 @@ public class SnapshotChanges implements ISnapshotChanges {
|
||||||
* @param line
|
* @param line
|
||||||
* @param size
|
* @param size
|
||||||
* @return true if the range overlaps with the interest window
|
* @return true if the range overlaps with the interest window
|
||||||
|
* @nooverride This method is not intended to be re-implemented or extended by clients.
|
||||||
|
* @noreference This method is not intended to be referenced by clients.
|
||||||
|
* It used to be package protected, and it is public only for Unit Tests.
|
||||||
*/
|
*/
|
||||||
boolean isInInterestWindow(int line, int size) {
|
public boolean isInInterestWindow(int line, int size) {
|
||||||
if(fInterestWindowSize<=0)
|
if(fInterestWindowSize<=0)
|
||||||
return true;
|
return true;
|
||||||
if(line+size<=fInterestWindowStartLine || line>=fInterestWindowStartLine+fInterestWindowSize)
|
if(line+size<=fInterestWindowStartLine || line>=fInterestWindowStartLine+fInterestWindowSize)
|
||||||
|
|
@ -82,8 +89,11 @@ public class SnapshotChanges implements ISnapshotChanges {
|
||||||
/**
|
/**
|
||||||
* @param line
|
* @param line
|
||||||
* @return true if the line is within the interest window
|
* @return true if the line is within the interest window
|
||||||
|
* @nooverride This method is not intended to be re-implemented or extended by clients.
|
||||||
|
* @noreference This method is not intended to be referenced by clients.
|
||||||
|
* It used to be package protected, and it is public only for Unit Tests.
|
||||||
*/
|
*/
|
||||||
boolean isInInterestWindow(int line) {
|
public boolean isInInterestWindow(int line) {
|
||||||
if(fInterestWindowSize<=0)
|
if(fInterestWindowSize<=0)
|
||||||
return true;
|
return true;
|
||||||
if(line<fInterestWindowStartLine || line>=fInterestWindowStartLine+fInterestWindowSize)
|
if(line<fInterestWindowStartLine || line>=fInterestWindowStartLine+fInterestWindowSize)
|
||||||
|
|
@ -93,8 +103,11 @@ public class SnapshotChanges implements ISnapshotChanges {
|
||||||
/**
|
/**
|
||||||
* @param line
|
* @param line
|
||||||
* @return the line within the window
|
* @return the line within the window
|
||||||
|
* @nooverride This method is not intended to be re-implemented or extended by clients.
|
||||||
|
* @noreference This method is not intended to be referenced by clients.
|
||||||
|
* It used to be package protected, and it is public only for Unit Tests.
|
||||||
*/
|
*/
|
||||||
int fitLineToWindow(int line) {
|
public int fitLineToWindow(int line) {
|
||||||
if(fInterestWindowSize<=0)
|
if(fInterestWindowSize<=0)
|
||||||
return line;
|
return line;
|
||||||
if(line<fInterestWindowStartLine)
|
if(line<fInterestWindowStartLine)
|
||||||
|
|
@ -106,10 +119,14 @@ public class SnapshotChanges implements ISnapshotChanges {
|
||||||
* @param line the line <b>before</b> {@link #fitLineToWindow(int)} has been called!
|
* @param line the line <b>before</b> {@link #fitLineToWindow(int)} has been called!
|
||||||
* @param size
|
* @param size
|
||||||
* @return the adjusted size.
|
* @return the adjusted size.
|
||||||
|
* @nooverride This method is not intended to be re-implemented or extended by clients.
|
||||||
|
* @noreference This method is not intended to be referenced by clients.
|
||||||
|
* It used to be package protected, and it is public only for Unit Tests.
|
||||||
|
*
|
||||||
* <p>Note:</p> {@link #fitLineToWindow(int)} has to be called on the line to
|
* <p>Note:</p> {@link #fitLineToWindow(int)} has to be called on the line to
|
||||||
* move the window correctly!
|
* move the window correctly!
|
||||||
*/
|
*/
|
||||||
int fitSizeToWindow(int line, int size) {
|
public int fitSizeToWindow(int line, int size) {
|
||||||
if(fInterestWindowSize<=0)
|
if(fInterestWindowSize<=0)
|
||||||
return size;
|
return size;
|
||||||
if(line<fInterestWindowStartLine) {
|
if(line<fInterestWindowStartLine) {
|
||||||
|
|
|
||||||
|
|
@ -2,7 +2,7 @@ Manifest-Version: 1.0
|
||||||
Bundle-ManifestVersion: 2
|
Bundle-ManifestVersion: 2
|
||||||
Bundle-Name: %pluginName
|
Bundle-Name: %pluginName
|
||||||
Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true
|
Bundle-SymbolicName: org.eclipse.tm.terminal.test;singleton:=true
|
||||||
Bundle-Version: 4.0.100.qualifier
|
Bundle-Version: 4.3.0.qualifier
|
||||||
Bundle-Vendor: %providerName
|
Bundle-Vendor: %providerName
|
||||||
Bundle-Localization: plugin
|
Bundle-Localization: plugin
|
||||||
Require-Bundle: org.junit,
|
Require-Bundle: org.junit,
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
###############################################################################
|
###############################################################################
|
||||||
# Copyright (c) 2007, 2015 Wind River Systems, Inc. and others.
|
# Copyright (c) 2007, 2017 Wind River Systems, Inc. and others.
|
||||||
# All rights reserved. This program and the accompanying materials
|
# All rights reserved. This program and the accompanying materials
|
||||||
# are made available under the terms of the Eclipse Public License v1.0
|
# are made available under the terms of the Eclipse Public License v1.0
|
||||||
# which accompanies this distribution, and is available at
|
# which accompanies this distribution, and is available at
|
||||||
|
|
@ -20,5 +20,5 @@ blurb=TM Terminal Unit Tests\n\
|
||||||
\n\
|
\n\
|
||||||
Version: {featureVersion}\n\
|
Version: {featureVersion}\n\
|
||||||
\n\
|
\n\
|
||||||
(c) Copyright Wind River Systems, Inc. and others 2007, 2015. All rights reserved.\n\
|
(c) Copyright Wind River Systems, Inc. and others 2007, 2017. All rights reserved.\n\
|
||||||
Visit http://www.eclipse.org/tm
|
Visit http://www.eclipse.org/tm
|
||||||
|
|
|
||||||
|
|
@ -11,25 +11,174 @@
|
||||||
<relativePath>../../admin/pom-build.xml</relativePath>
|
<relativePath>../../admin/pom-build.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<version>4.0.100-SNAPSHOT</version>
|
<version>4.3.0-SNAPSHOT</version>
|
||||||
<artifactId>org.eclipse.tm.terminal.test</artifactId>
|
<artifactId>org.eclipse.tm.terminal.test</artifactId>
|
||||||
<packaging>eclipse-test-plugin</packaging>
|
<packaging>eclipse-test-plugin</packaging>
|
||||||
|
|
||||||
<build>
|
<properties>
|
||||||
<plugins>
|
<jacoco.append>true</jacoco.append>
|
||||||
<plugin>
|
<ui.test.vmargs>-ea -Xmx512m -XX:MaxPermSize=256m -Drse.enableSecureStoreAccess=false -Dorg.eclipse.swt.browser.UseWebKitGTK=true</ui.test.vmargs>
|
||||||
<groupId>org.eclipse.tycho</groupId>
|
</properties>
|
||||||
<artifactId>tycho-surefire-plugin</artifactId>
|
|
||||||
<version>${tycho-version}</version>
|
<profiles>
|
||||||
<configuration>
|
<profile>
|
||||||
<testSuite>org.eclipse.tm.terminal.test</testSuite>
|
<id>tests</id>
|
||||||
<testClass>org.eclipse.tm.terminal.test.AutomatedPluginTests</testClass>
|
|
||||||
<useUIHarness>false</useUIHarness>
|
<build>
|
||||||
<useUIThread>false</useUIThread>
|
<plugins>
|
||||||
<testFailureIgnore>true</testFailureIgnore>
|
<plugin>
|
||||||
<product>org.eclipse.sdk.ide</product>
|
<groupId>org.eclipse.tycho</groupId>
|
||||||
</configuration>
|
<artifactId>tycho-surefire-plugin</artifactId>
|
||||||
</plugin>
|
<version>${tycho-version}</version>
|
||||||
</plugins>
|
<configuration>
|
||||||
</build>
|
<useUIHarness>true</useUIHarness>
|
||||||
|
<useUIThread>false</useUIThread>
|
||||||
|
<product>org.eclipse.platform.ide</product>
|
||||||
|
<!-- For Jacoco, see http://www.eclemma.org/jacoco/trunk/doc/prepare-agent-mojo.html -->
|
||||||
|
<argLine>${tycho.testArgLine} ${ui.test.vmargs}</argLine>
|
||||||
|
<application>org.eclipse.ui.ide.workbench</application>
|
||||||
|
<testFailureIgnore>true</testFailureIgnore>
|
||||||
|
<showEclipseLog>true</showEclipseLog>
|
||||||
|
<testRuntime>p2Installed</testRuntime>
|
||||||
|
<!--
|
||||||
|
<debugPort>8003</debugPort>
|
||||||
|
-->
|
||||||
|
<systemProperties>
|
||||||
|
<osgi.debug>${basedir}/tracing/.options</osgi.debug>
|
||||||
|
</systemProperties>
|
||||||
|
|
||||||
|
<!--
|
||||||
|
<testSuite>org.eclipse.tm.terminal.test</testSuite>
|
||||||
|
<testClass>org.eclipse.tm.terminal.test.AutomatedPluginTests</testClass>
|
||||||
|
-->
|
||||||
|
<includes>
|
||||||
|
<include>**/AutomatedPluginTests.*</include>
|
||||||
|
<include>**/AutomatedTests.*</include>
|
||||||
|
</includes>
|
||||||
|
</configuration>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.codehaus.gmaven</groupId>
|
||||||
|
<artifactId>gmaven-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<phase>validate</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>execute</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<source>
|
||||||
|
project.properties['qualified.bundle.version'] = project.properties['unqualifiedVersion'].replace('qualifier', project.properties['buildQualifier'])
|
||||||
|
</source>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
|
||||||
|
<plugin>
|
||||||
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
|
<artifactId>maven-antrun-plugin</artifactId>
|
||||||
|
<executions>
|
||||||
|
<execution>
|
||||||
|
<id>generate-report</id>
|
||||||
|
<phase>post-integration-test</phase>
|
||||||
|
<goals>
|
||||||
|
<goal>run</goal>
|
||||||
|
</goals>
|
||||||
|
<configuration>
|
||||||
|
<target>
|
||||||
|
<typedef resource="org/jacoco/ant/antlib.xml"/>
|
||||||
|
<echo message="Coverage report"/>
|
||||||
|
<report>
|
||||||
|
<executiondata>
|
||||||
|
<fileset dir="${project.build.directory}" includes="jacoco.exec"/>
|
||||||
|
</executiondata>
|
||||||
|
<structure name="Code Coverage - TM Terminal">
|
||||||
|
<group name="org.eclipse.tm.terminal.control">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.control/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.control/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group name="org.eclipse.tm.terminal.view.ui">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.ui/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.ui/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group name="org.eclipse.tm.terminal.view.core">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.core/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.view.core/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group name="org.eclipse.tm.terminal.connector.process">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.process/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.process/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group name="org.eclipse.tm.terminal.connector.local">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.local/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.local/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group name="org.eclipse.tm.terminal.connector.ssh">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.ssh/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.connector.ssh/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
|
||||||
|
<group name="org.eclipse.tm.terminal.test">
|
||||||
|
<classfiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.test/target/classes"/>
|
||||||
|
</classfiles>
|
||||||
|
<sourcefiles>
|
||||||
|
<fileset dir="${basedir}/../org.eclipse.tm.terminal.test/src"/>
|
||||||
|
</sourcefiles>
|
||||||
|
</group>
|
||||||
|
</structure>
|
||||||
|
|
||||||
|
<html destdir="${project.build.directory}/coverage"
|
||||||
|
footer="Code Coverage Report for TM Terminal ${qualified.bundle.version}"
|
||||||
|
locale="de"/>
|
||||||
|
<csv destfile="${project.build.directory}/coverage/coverage.csv"/>
|
||||||
|
<xml destfile="${project.build.directory}/coverage/coverage.xml"/>
|
||||||
|
</report>
|
||||||
|
</target>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.jacoco</groupId>
|
||||||
|
<artifactId>org.jacoco.ant</artifactId>
|
||||||
|
<version>${jacoco-version}</version>
|
||||||
|
</dependency>
|
||||||
|
</dependencies>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue