Author: fmeschbe
Date: Tue Apr 24 17:16:07 2012
New Revision: 1329868
URL: http://svn.apache.org/viewvc?rev=1329868&view=rev
Log:
FELIX-3479 implement and test Configuration.getChangeCount
Modified:
felix/sandbox/fmeschbe/configadmin-R5/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
Modified:
felix/sandbox/fmeschbe/configadmin-R5/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/fmeschbe/configadmin-R5/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java?rev=1329868&r1=1329867&r2=1329868&view=diff
==============================================================================
---
felix/sandbox/fmeschbe/configadmin-R5/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
(original)
+++
felix/sandbox/fmeschbe/configadmin-R5/src/main/java/org/apache/felix/cm/impl/ConfigurationAdapter.java
Tue Apr 24 17:16:07 2012
@@ -132,9 +132,6 @@ public class ConfigurationAdapter implem
}
- /**
- * @see org.apache.felix.cm.impl.ConfigurationImpl#getProperties()
- */
public Dictionary getProperties()
{
delegatee.getConfigurationManager().log( LogService.LOG_DEBUG,
"getProperties()", ( Throwable ) null );
@@ -147,6 +144,16 @@ public class ConfigurationAdapter implem
}
+ public long getChangeCount()
+ {
+ delegatee.getConfigurationManager().log( LogService.LOG_DEBUG,
"getChangeCount()", ( Throwable ) null );
+
+ checkDeleted();
+
+ return delegatee.getRevision();
+ }
+
+
/**
* @throws IOException
* @see org.apache.felix.cm.impl.ConfigurationImpl#delete()
Modified:
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
URL:
http://svn.apache.org/viewvc/felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java?rev=1329868&r1=1329867&r2=1329868&view=diff
==============================================================================
---
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
(original)
+++
felix/sandbox/fmeschbe/configadmin-R5/src/test/java/org/apache/felix/cm/integration/ConfigurationBaseTest.java
Tue Apr 24 17:16:07 2012
@@ -386,6 +386,24 @@ public class ConfigurationBaseTest exten
@Test
+ public void test_configuration_change_counter() throws IOException
+ {
+ // 1. create config with pid and locationA
+ // 2. update config with properties
+ final String pid = "test_configuration_change_counter";
+ final Configuration config = configure( pid, null, false );
+
+ TestCase.assertEquals("Expect first version to be 1", 1,
config.getChangeCount());
+
+ config.update(new Hashtable(){{put("x", "x");}});
+ TestCase.assertEquals("Expect second version to be 2", 2,
config.getChangeCount());
+
+ // delete
+ config.delete();
+ }
+
+
+ @Test
public void test_basic_configuration_configure_then_start() throws
BundleException, IOException
{
// 1. create config with pid and locationA
