You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@karaf.apache.org by jb...@apache.org on 2019/02/14 15:30:53 UTC
[karaf] branch master updated: [KARAF-6153] Fix the instance
resources filtering and add new instance itest
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/karaf.git
The following commit(s) were added to refs/heads/master by this push:
new 9f3a6a4 [KARAF-6153] Fix the instance resources filtering and add new instance itest
new 0952a6e Merge pull request #768 from jbonofre/KARAF-6153
9f3a6a4 is described below
commit 9f3a6a4293bb3ff94c1fd3296bed807975f0fef8
Author: Jean-Baptiste Onofré <jb...@apache.org>
AuthorDate: Thu Feb 14 14:13:19 2019 +0100
[KARAF-6153] Fix the instance resources filtering and add new instance itest
---
instance/pom.xml | 18 ++++++++++++------
.../java/org/apache/karaf/itests/InstanceTest.java | 5 +++--
2 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/instance/pom.xml b/instance/pom.xml
index a6124b2..a9f167b 100644
--- a/instance/pom.xml
+++ b/instance/pom.xml
@@ -172,18 +172,24 @@
</resources>
</configuration>
</execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <useDefaultDelimiters>false</useDefaultDelimiters>
+ <delimiters>
+ <delimiter>@@</delimiter>
+ </delimiters>
+ </configuration>
+ <executions>
<execution>
<id>filter</id>
<phase>generate-resources</phase>
<goals>
<goal>resources</goal>
</goals>
- <configuration>
- <useDefaultDelimiters>false</useDefaultDelimiters>
- <delimiters>
- <delimiter>@@</delimiter>
- </delimiters>
- </configuration>
</execution>
</executions>
</plugin>
diff --git a/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java b/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java
index 5f60024..488ccba 100644
--- a/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java
+++ b/itests/test/src/test/java/org/apache/karaf/itests/InstanceTest.java
@@ -53,8 +53,8 @@ public class InstanceTest extends KarafTestSupport {
Assert.assertEquals(oldNum, getInstancesNum(mbeanServer, name));
}
- @Ignore
- public void createStartCommand() throws Exception {
+ @Test
+ public void createStartStopDestroyCommand() throws Exception {
System.out.println(executeCommand("instance:create itest666"));
assertContains("itest", executeCommand("instance:list"));
System.out.println(executeCommand("instance:start itest666"));
@@ -83,6 +83,7 @@ public class InstanceTest extends KarafTestSupport {
}
System.out.println("itest instance status: " + output);
assertContains("Stopped", output);
+ executeCommand("instance:destroy itest666");
}
private int getInstancesNum(MBeanServerConnection connection, ObjectName name) throws Exception {