Skip to content
Snippets Groups Projects
Commit d54fa3dc authored by Piotr Gawron's avatar Piotr Gawron
Browse files

move clipboard to celldesigner plugin module (it cannot be used on server side)

parent 4c6f4b22
No related branches found
No related tags found
3 merge requests!1579Link to Home page of API-docs added in the docs,!1570Merge pipeline fix,!1569Fix pipeline after number of services changed functionality
Pipeline #76246 failed
Showing
with 7 additions and 15 deletions
...@@ -31,7 +31,7 @@ test:frontend: ...@@ -31,7 +31,7 @@ test:frontend:
- npm test - npm test
.jdk_8_template: &jdk_8_definition .jdk_8_template: &jdk_8_definition
image: maven:3.6.0-jdk-8 image: maven:3.8.6-jdk-8
services: services:
- postgres:9.6 - postgres:9.6
stage: test stage: test
...@@ -61,11 +61,6 @@ test:frontend: ...@@ -61,11 +61,6 @@ test:frontend:
.test_backend_commons_template: .test_backend_commons_template:
script: &test_backend_commons_definition script: &test_backend_commons_definition
#xvfb is for X11 connection used by some parts of the java code: https://stackoverflow.com/a/47575851/1127920 #xvfb is for X11 connection used by some parts of the java code: https://stackoverflow.com/a/47575851/1127920
- apt-get update
- DEBIAN_FRONTEND=noninteractive apt-get install -y xvfb
- Xvfb :99 &
- export DISPLAY=:99
- mvn -DskipTests=true clean install -pl commons -am - mvn -DskipTests=true clean install -pl commons -am
- mvn test -pl commons - mvn test -pl commons
- awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv - awk -F"," '{ instructions += $4 + $5; covered += $5 } END { print covered, "/", instructions, "instructions covered"; print 100*covered/instructions,"% covered" }' commons/target/site/jacoco/jacoco.csv
......
...@@ -8,7 +8,6 @@ import jp.sbi.celldesigner.plugin.PluginReaction; ...@@ -8,7 +8,6 @@ import jp.sbi.celldesigner.plugin.PluginReaction;
import jp.sbi.celldesigner.plugin.PluginSBase; import jp.sbi.celldesigner.plugin.PluginSBase;
import jp.sbi.celldesigner.plugin.PluginSpecies; import jp.sbi.celldesigner.plugin.PluginSpecies;
import jp.sbi.celldesigner.plugin.PluginSpeciesAlias; import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
import lcsb.mapviewer.common.SystemClipboard;
import lcsb.mapviewer.common.exception.InvalidXmlSchemaException; import lcsb.mapviewer.common.exception.InvalidXmlSchemaException;
/** /**
......
...@@ -11,7 +11,6 @@ import jp.sbi.celldesigner.plugin.PluginSBase; ...@@ -11,7 +11,6 @@ import jp.sbi.celldesigner.plugin.PluginSBase;
import jp.sbi.celldesigner.plugin.PluginSpecies; import jp.sbi.celldesigner.plugin.PluginSpecies;
import jp.sbi.celldesigner.plugin.PluginSpeciesAlias; import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
import lcsb.mapviewer.common.Pair; import lcsb.mapviewer.common.Pair;
import lcsb.mapviewer.common.SystemClipboard;
import lcsb.mapviewer.converter.annotation.XmlAnnotationParser; import lcsb.mapviewer.converter.annotation.XmlAnnotationParser;
import lcsb.mapviewer.model.map.MiriamData; import lcsb.mapviewer.model.map.MiriamData;
......
package lcsb.mapviewer.common; package lcsb.mapviewer.cdplugin.copypaste;
import java.awt.Toolkit; import java.awt.Toolkit;
import java.awt.datatransfer.Clipboard; import java.awt.datatransfer.Clipboard;
......
...@@ -9,6 +9,7 @@ import org.junit.runners.Suite.SuiteClasses; ...@@ -9,6 +9,7 @@ import org.junit.runners.Suite.SuiteClasses;
CopyPasteAbstractActionTest.class, CopyPasteAbstractActionTest.class,
CopyPastePluginTest.class, CopyPastePluginTest.class,
PasteActionTest.class, PasteActionTest.class,
SystemClipboardTest.class,
}) })
public class AllCopyPasteTests { public class AllCopyPasteTests {
......
...@@ -8,7 +8,6 @@ import org.mockito.Mockito; ...@@ -8,7 +8,6 @@ import org.mockito.Mockito;
import jp.sbi.celldesigner.plugin.PluginListOf; import jp.sbi.celldesigner.plugin.PluginListOf;
import lcsb.mapviewer.cdplugin.CdPluginFunctions; import lcsb.mapviewer.cdplugin.CdPluginFunctions;
import lcsb.mapviewer.common.SystemClipboard;
public class CopyActionTest extends CdPluginFunctions { public class CopyActionTest extends CdPluginFunctions {
......
...@@ -11,7 +11,6 @@ import org.mockito.Mockito; ...@@ -11,7 +11,6 @@ import org.mockito.Mockito;
import jp.sbi.celldesigner.plugin.PluginListOf; import jp.sbi.celldesigner.plugin.PluginListOf;
import lcsb.mapviewer.cdplugin.CdPluginFunctions; import lcsb.mapviewer.cdplugin.CdPluginFunctions;
import lcsb.mapviewer.common.SystemClipboard;
public class CopyPastePluginTest extends CdPluginFunctions { public class CopyPastePluginTest extends CdPluginFunctions {
......
...@@ -13,7 +13,6 @@ import jp.sbi.celldesigner.plugin.PluginReaction; ...@@ -13,7 +13,6 @@ import jp.sbi.celldesigner.plugin.PluginReaction;
import jp.sbi.celldesigner.plugin.PluginSpecies; import jp.sbi.celldesigner.plugin.PluginSpecies;
import jp.sbi.celldesigner.plugin.PluginSpeciesAlias; import jp.sbi.celldesigner.plugin.PluginSpeciesAlias;
import lcsb.mapviewer.cdplugin.CdPluginFunctions; import lcsb.mapviewer.cdplugin.CdPluginFunctions;
import lcsb.mapviewer.common.SystemClipboard;
public class PasteActionTest extends CdPluginFunctions { public class PasteActionTest extends CdPluginFunctions {
......
package lcsb.mapviewer.common; package lcsb.mapviewer.cdplugin.copypaste;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNull;
...@@ -14,7 +14,9 @@ import org.junit.After; ...@@ -14,7 +14,9 @@ import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
public class SystemClipboardTest extends CommonTestFunctions { import lcsb.mapviewer.cdplugin.CdPluginFunctions;
public class SystemClipboardTest extends CdPluginFunctions {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
......
...@@ -17,7 +17,6 @@ import lcsb.mapviewer.common.geometry.AllGeometryTests; ...@@ -17,7 +17,6 @@ import lcsb.mapviewer.common.geometry.AllGeometryTests;
MimeTypeTest.class, MimeTypeTest.class,
ObjectUtilsTest.class, ObjectUtilsTest.class,
PairTest.class, PairTest.class,
SystemClipboardTest.class,
TextFileUtilsTest.class, TextFileUtilsTest.class,
XmlParserTest.class, XmlParserTest.class,
}) })
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment