Require KNIME 3.3 and higher version of testing plugin.

Re-enabled log checking.
3D-e-Chem · Jun 8, 2017 · ee62d9a · ee62d9a
1 parent c8aa49b
commit ee62d9a
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,10 @@ Formatted as described on http://keepachangelog.com/
 - Node to fetch pharmacophore from local db file (#12)
 - Node to fetch pharmacophore from webservice (#12)
 
+### Changed
+
+- Require KNIME 3.3
+
 ## [2.2.1] - 2017-03-07
 
 ### Fixes

diff --git a/plugin/META-INF/MANIFEST.MF b/plugin/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Bundle-SymbolicName: nl.esciencecenter.e3dchem.kripodb.plugin;singleton:=true
 Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Activator: nl.esciencecenter.e3dchem.kripodb.Activator
-Require-Bundle: org.knime.core;bundle-version="[3.1.0,4.0.0)",
- org.knime.base;bundle-version="[3.1.0,4.0.0)",
- org.knime.python;bundle-version="[3.1.0,4.0.0)",
- org.knime.chem.types;bundle-version="[3.1.0,4.0.0)",
+Require-Bundle: org.knime.core;bundle-version="[3.3.0,4.0.0)",
+ org.knime.base;bundle-version="[3.3.0,4.0.0)",
+ org.knime.python;bundle-version="[3.3.0,4.0.0)",
+ org.knime.chem.types;bundle-version="[3.3.0,4.0.0)",
  org.rdkit.knime.types;bundle-version="[3.0.0,4.0.0)",
  nl.esciencecenter.e3dchem.python.plugin;bundle-version="[1.1.0,2.0.0)",
  nl.esciencecenter.e3dchem.plugin;bundle-version="[1.0.0,2.0.0)"

diff --git a/pom.xml b/pom.xml
@@ -42,7 +42,7 @@
 	</prerequisites>
 
 	<properties>
-		<knime.version>3.1</knime.version>
+		<knime.version>3.3</knime.version>
 		<knime.update.site>http://update.knime.org/analytics-platform/${knime.version}/</knime.update.site>
 		<knime.community.trusted.update.site>http://update.knime.org/community-contributions/trusted/${knime.version}/</knime.community.trusted.update.site>
 		<tycho.version>1.0.0</tycho.version>

diff --git a/tests/META-INF/MANIFEST.MF b/tests/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Bundle-SymbolicName: nl.esciencecenter.e3dchem.kripodb.tests
 Bundle-Version: 2.2.1.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.12.0",
- org.knime.core;bundle-version="[3.1.0,4.0.0)",
- org.knime.base;bundle-version="[3.1.0,4.0.0)",
- org.knime.testing;bundle-version="[3.1.0,4.0.0)",
- org.knime.python;bundle-version="[3.1.0,4.0.0)",
- nl.esciencecenter.e3dchem.knime.testing.plugin;bundle-version="[1.0.0,2.0.0)",
+ org.knime.core;bundle-version="[3.3.0,4.0.0)",
+ org.knime.base;bundle-version="[3.3.0,4.0.0)",
+ org.knime.testing;bundle-version="[3.3.0,4.0.0)",
+ org.knime.python;bundle-version="[3.3.0,4.0.0)",
+ nl.esciencecenter.e3dchem.knime.testing.plugin;bundle-version="[1.0.2,2.0.0)",
  nl.esciencecenter.e3dchem.python.plugin;bundle-version="[1.1.0,2.0.0)",
  nl.esciencecenter.e3dchem.kripodb.plugin
 Bundle-Vendor: Netherlands eScience Center

diff --git a/tests/src/java/nl/esciencecenter/e3dchem/kripodb/FragmentsByIdWorkflowTest.java b/tests/src/java/nl/esciencecenter/e3dchem/kripodb/FragmentsByIdWorkflowTest.java
@@ -64,12 +64,6 @@ public void test_default() throws IOException, InvalidSettingsException, Cancele
 	@Test
 	public void test_pdb() throws IOException, InvalidSettingsException, CanceledExecutionException,
 			UnsupportedWorkflowVersionException, LockFailedException, InterruptedException {
-		TestrunConfiguration runConfiguration = new TestrunConfiguration();
-		runConfiguration.setTestDialogs(true);
-		runConfiguration.setAllowedMemoryIncrease(4096000);
-		runConfiguration.setLoadSaveLoad(false);
-		runConfiguration.setCheckLogMessages(false);
-		runner = new TestFlowRunner(collector, runConfiguration);
 		runTestWorkflow("src/knime/kripo-fragment-information-test-pdb");
 	}
 

diff --git a/tests/src/java/nl/esciencecenter/e3dchem/kripodb/ws/JavaWsWorkflowTest.java b/tests/src/java/nl/esciencecenter/e3dchem/kripodb/ws/JavaWsWorkflowTest.java
@@ -63,11 +63,6 @@ public void test_fragmentInformation() throws IOException, InvalidSettingsExcept
 	public void test_pharmacophores() throws IOException, InvalidSettingsException, CanceledExecutionException,
 			UnsupportedWorkflowVersionException, LockFailedException, InterruptedException {
 		TestrunConfiguration runConfiguration = new TestrunConfiguration();
-		runConfiguration.setTestDialogs(true);
-		runConfiguration.setLoadSaveLoad(false);
-		runConfiguration.setCheckLogMessages(false);
-		runner = new TestFlowRunner(collector, runConfiguration);
-
 		File workflowDir = new File("src/knime/kripo-java-pharmacophore-test");
 		runner.runTestWorkflow(workflowDir);
 	}