You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2009/06/08 14:16:36 UTC
svn commit: r782602 - in
/incubator/sling/trunk/contrib/extensions/jcrinstall/it: pom.xml
src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
Author: bdelacretaz
Date: Mon Jun 8 12:16:36 2009
New Revision: 782602
URL: http://svn.apache.org/viewvc?rev=782602&view=rev
Log:
SLING-996 - trying to change test bundle filenames, seems to be the only relevant difference with tests that pass..
Modified:
incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml
incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml?rev=782602&r1=782601&r2=782602&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/it/pom.xml Mon Jun 8 12:16:36 2009
@@ -169,36 +169,36 @@
</configuration>
</execution>
<execution>
- <id>otherbundleA-1.0</id>
+ <id>testA-1.0</id>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
- <classifier>otherbundleA-1.0</classifier>
+ <classifier>testA-1.0</classifier>
<archive>
<manifestEntries>
<Manifest-Version>2</Manifest-Version>
<Bundle-Name>JCRinstall test bundle</Bundle-Name>
- <Bundle-SymbolicName>jcrinstall-otherbundleA</Bundle-SymbolicName>
+ <Bundle-SymbolicName>jcrinstall-testA</Bundle-SymbolicName>
<Bundle-Version>1.0</Bundle-Version>
</manifestEntries>
</archive>
</configuration>
</execution>
<execution>
- <id>otherbundleB-1.0</id>
+ <id>testB-1.0</id>
<phase>compile</phase>
<goals>
<goal>jar</goal>
</goals>
<configuration>
- <classifier>otherbundleB-1.0</classifier>
+ <classifier>testB-1.0</classifier>
<archive>
<manifestEntries>
<Manifest-Version>2</Manifest-Version>
<Bundle-Name>JCRinstall test bundle</Bundle-Name>
- <Bundle-SymbolicName>jcrinstall-otherbundleB</Bundle-SymbolicName>
+ <Bundle-SymbolicName>jcrinstall-testB</Bundle-SymbolicName>
<Bundle-Version>1.0</Bundle-Version>
</manifestEntries>
</archive>
Modified: incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java?rev=782602&r1=782601&r2=782602&view=diff
==============================================================================
--- incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java (original)
+++ incubator/sling/trunk/contrib/extensions/jcrinstall/it/src/test/java/org/apache/sling/jcr/jcrinstall/it/OsgiControllerTest.java Mon Jun 8 12:16:36 2009
@@ -238,18 +238,18 @@
// Install two bundles, one started, one stopped
{
c.scheduleInstallOrUpdate("otherBundleA.jar",
- new SimpleFileInstallableData(getTestBundle("org.apache.sling.jcr.jcrinstall.it-" + POM_VERSION + "-otherBundleA-1.0.jar")));
+ new SimpleFileInstallableData(getTestBundle("org.apache.sling.jcr.jcrinstall.it-" + POM_VERSION + "-testA-1.0.jar")));
c.executeScheduledOperations();
}
{
- c.scheduleInstallOrUpdate("otherBundleB.jar",
- new SimpleFileInstallableData(getTestBundle("org.apache.sling.jcr.jcrinstall.it-" + POM_VERSION + "-otherBundleB-1.0.jar")));
+ c.scheduleInstallOrUpdate("testB.jar",
+ new SimpleFileInstallableData(getTestBundle("org.apache.sling.jcr.jcrinstall.it-" + POM_VERSION + "-testB-1.0.jar")));
c.executeScheduledOperations();
- findBundle("jcrinstall-otherbundleB").stop();
+ findBundle("jcrinstall-testB").stop();
}
- assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("jcrinstall-otherbundleA").getState());
- assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("jcrinstall-otherbundleB").getState());
+ assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("jcrinstall-testA").getState());
+ assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("jcrinstall-testB").getState());
// Execute some OsgiController operations
final String symbolicName = "jcrinstall-testbundle";
@@ -270,8 +270,8 @@
assertEquals("Version must be 1.2", "1.2", b.getHeaders().get(BUNDLE_VERSION));
// And check that bundles A and B have kept their states
- assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("jcrinstall-otherbundleA").getState());
- assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("jcrinstall-otherbundleB").getState());
+ assertEquals("Bundle A must be started", Bundle.ACTIVE, findBundle("jcrinstall-testA").getState());
+ assertEquals("Bundle B must be stopped", Bundle.RESOLVED, findBundle("jcrinstall-testB").getState());
}
@org.ops4j.pax.exam.junit.Configuration