qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kw...@apache.org
Subject [2/2] qpid-broker-j git commit: NO-JIRA: [Model] [Unit Tests] Improve unit tests related to the resolution of context variables
Date Sun, 01 Oct 2017 06:31:50 GMT
NO-JIRA: [Model] [Unit Tests] Improve unit tests related to the resolution of context variables

Exposes inconsistency in the expansion of 'this:'.


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/b34cf9e1
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/b34cf9e1
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/b34cf9e1

Branch: refs/heads/master
Commit: b34cf9e116bcfb6bc806f71acec2c129e7e616fe
Parents: b2cc03f
Author: Keith Wall <keith.wall@gmail.com>
Authored: Sat Sep 30 15:06:41 2017 +0100
Committer: Keith Wall <keith.wall@gmail.com>
Committed: Sun Oct 1 07:30:30 2017 +0100

----------------------------------------------------------------------
 .../hierarchy/AbstractConfiguredObjectTest.java | 103 ++++++++++++++++---
 .../model/testmodels/hierarchy/TestCar.java     |  10 +-
 2 files changed, 97 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b34cf9e1/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
index aabb260..1f8e8ff 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/AbstractConfiguredObjectTest.java
@@ -51,7 +51,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
     public void testCreateCategoryDefault()
     {
         final String objectName = "testCreateCategoryDefault";
-        Map<String, Object> attributes = Collections.<String, Object>singletonMap(ConfiguredObject.NAME,
objectName);
+        Map<String, Object> attributes = Collections.singletonMap(ConfiguredObject.NAME,
objectName);
 
         TestCar object = _model.getObjectFactory().create(TestCar.class, attributes, null);
 
@@ -210,9 +210,9 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
 
     public void testCreateAwaitsAttainState()
     {
-        SettableFuture stateChangeFuture = SettableFuture.create();
+        SettableFuture<Void> stateChangeFuture = SettableFuture.create();
 
-        TestCar car = _model.getObjectFactory().create(TestCar.class, Collections.<String,
Object>singletonMap(ConfiguredObject.NAME, "myCar"), null);
+        TestCar car = _model.getObjectFactory().create(TestCar.class, Collections.singletonMap(ConfiguredObject.NAME,
"myCar"), null);
 
         Map<String, Object> engineAttributes = new HashMap<>();
         engineAttributes.put(ConfiguredObject.NAME, "myEngine");
@@ -288,8 +288,8 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
         SettableFuture<Void> engineCloseControllingFuture = SettableFuture.create();
 
         TestCar car = _model.getObjectFactory().create(TestCar.class,
-                                                       Collections.<String, Object>singletonMap(ConfiguredObject.NAME,
-                                                                                        
       "myCar"), null);
+                                                       Collections.singletonMap(ConfiguredObject.NAME,
+                                                                                "myCar"),
null);
 
         String engineName = "myEngine";
         Map<String, Object> engineAttributes = new HashMap<>();
@@ -308,7 +308,7 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
         assertNull("engine not deregistered", car.getChildById(TestEngine.class, engine.getId()));
     }
 
-    public void testDefaultContextVariableWhichRefersToAncestor()
+    public void testGlobalContextDefault()
     {
         final String carName = "myCar";
         Map<String, Object> carAttributes = new HashMap<>();
@@ -317,12 +317,25 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
 
         TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
 
-        assertEquals(carName, car.getName());
+        assertTrue("context var not in contextKeys",
+                   car.getContextKeys(true).contains(TestCar.TEST_CONTEXT_VAR));
 
-        assertEquals(0, car.getChildren(TestEngine.class).size());
+        String expected = "a value";
+        assertEquals("Context variable has unexpected value", expected, car.getContextValue(String.class,
TestCar.TEST_CONTEXT_VAR));
+    }
 
-        String engineName = "myEngine";
+    public void testGlobalContextDefaultWithThisRef()
+    {
+        final String carName = "myCar";
+        Map<String, Object> carAttributes = new HashMap<>();
+        carAttributes.put(ConfiguredObject.NAME, carName);
+        carAttributes.put(ConfiguredObject.TYPE, TestKitCarImpl.TEST_KITCAR_TYPE);
 
+        TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
+
+        assertEquals("Context variable has unexpected value", "a value myCar", car.getContextValue(String.class,
TestCar.TEST_CONTEXT_VAR_WITH_THIS_REF));
+
+        String engineName = "myEngine";
         Map<String, Object> engineAttributes = new HashMap<>();
         engineAttributes.put(ConfiguredObject.NAME, engineName);
         engineAttributes.put(ConfiguredObject.TYPE, TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE);
@@ -330,16 +343,76 @@ public class AbstractConfiguredObjectTest extends QpidTestCase
 
         TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
 
-        assertTrue("context var not in contextKeys",
-                   car.getContextKeys(true).contains(TestCar.TEST_CONTEXT_VAR));
+        assertEquals("Context variable has unexpected value", "a value myEngine", engine.getContextValue(String.class,
TestCar.TEST_CONTEXT_VAR_WITH_THIS_REF));
+    }
+
+    public void testHierarchyContextVariableWithThisRef()
+    {
+        final String contentVarName = "contentVar";
+        final String carName = "myCar";
+        Map<String, Object> carAttributes = new HashMap<>();
+        carAttributes.put(ConfiguredObject.NAME, carName);
+        carAttributes.put(ConfiguredObject.TYPE, TestKitCarImpl.TEST_KITCAR_TYPE);
+        carAttributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(contentVarName,
"name ${this:name}"));
+
+        TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
+
+        assertEquals("Context variable has unexpected value", "name myCar", car.getContextValue(String.class,
contentVarName));
+
+        String engineName = "myEngine";
+        Map<String, Object> engineAttributes = new HashMap<>();
+        engineAttributes.put(ConfiguredObject.NAME, engineName);
+        engineAttributes.put(ConfiguredObject.TYPE, TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE);
+
+        TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
+
+        // TODO: we have different behaviour depending on whether the variable is a  global
context default or hierarchy context variable.
+        assertEquals("Context variable has unexpected value", "name myCar", engine.getContextValue(String.class,
contentVarName));
+    }
+
+    public void testGlobalContextDefaultWithAncestorRef()
+    {
+        final String carName = "myCar";
+        Map<String, Object> carAttributes = new HashMap<>();
+        carAttributes.put(ConfiguredObject.NAME, carName);
+        carAttributes.put(ConfiguredObject.TYPE, TestKitCarImpl.TEST_KITCAR_TYPE);
+
+        TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
 
         String expected = "a value " + carName;
-        assertEquals(expected, car.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR));
+        assertEquals("Context variable has unexpected value", expected, car.getContextValue(String.class,
TestCar.TEST_CONTEXT_VAR_WITH_ANCESTOR_REF));
 
-        assertTrue("context var not in contextKeys",
-                   engine.getContextKeys(true).contains(TestCar.TEST_CONTEXT_VAR));
-        assertEquals(expected, engine.getContextValue(String.class, TestCar.TEST_CONTEXT_VAR));
+        String engineName = "myEngine";
+        Map<String, Object> engineAttributes = new HashMap<>();
+        engineAttributes.put(ConfiguredObject.NAME, engineName);
+        engineAttributes.put(ConfiguredObject.TYPE, TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE);
+
+        TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
+
+        assertEquals("Context variable has unexpected value", expected, engine.getContextValue(String.class,
TestCar.TEST_CONTEXT_VAR_WITH_ANCESTOR_REF));
+    }
+
+    public void testHierarchyContextVariableWithAncestorRef()
+    {
+        final String contentVarName = "contentVar";
+        final String carName = "myCar";
+        Map<String, Object> carAttributes = new HashMap<>();
+        carAttributes.put(ConfiguredObject.NAME, carName);
+        carAttributes.put(ConfiguredObject.TYPE, TestKitCarImpl.TEST_KITCAR_TYPE);
+        carAttributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(contentVarName,
"name ${ancestor:testcar:name}"));
+
+        TestCar car = _model.getObjectFactory().create(TestCar.class, carAttributes, null);
+
+        assertEquals("Context variable has unexpected value", "name myCar", car.getContextValue(String.class,
contentVarName));
+
+        String engineName = "myEngine";
+        Map<String, Object> engineAttributes = new HashMap<>();
+        engineAttributes.put(ConfiguredObject.NAME, engineName);
+        engineAttributes.put(ConfiguredObject.TYPE, TestElecEngineImpl.TEST_ELEC_ENGINE_TYPE);
+
+        TestEngine engine = (TestEngine) car.createChild(TestEngine.class, engineAttributes);
 
+        assertEquals("Context variable has unexpected value", "name myCar", engine.getContextValue(String.class,
contentVarName));
     }
 
     public void testUserPreferencesCreatedOnEngineCreation()

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/b34cf9e1/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
----------------------------------------------------------------------
diff --git a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
index 83ade73..c82105c 100644
--- a/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
+++ b/broker-core/src/test/java/org/apache/qpid/server/model/testmodels/hierarchy/TestCar.java
@@ -34,7 +34,15 @@ public interface TestCar<X extends TestCar<X>> extends ConfiguredObject<X>
 
     String TEST_CONTEXT_VAR = "TEST_CONTEXT_VAR";
     @ManagedContextDefault(name = TEST_CONTEXT_VAR)
-    String testGlobalDefault = "a value ${ancestor:testcar:name}";
+    String testContextVar = "a value";
+
+    String TEST_CONTEXT_VAR_WITH_ANCESTOR_REF = "TEST_CONTEXT_VAR_WITH_ANCESTOR_REF";
+    @ManagedContextDefault(name = TEST_CONTEXT_VAR_WITH_ANCESTOR_REF)
+    String testContextVarWithAncestorRef = "a value ${ancestor:testcar:name}";
+
+    String TEST_CONTEXT_VAR_WITH_THIS_REF = "TEST_CONTEXT_VAR_WITH_THIS_REF";
+    @ManagedContextDefault(name = TEST_CONTEXT_VAR_WITH_THIS_REF)
+    String testContextVarWithThisRef = "a value ${this:name}";
 
     @ManagedAttribute
     Colour getBodyColour();


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message