Changeset 524

Timestamp:

04/14/07 18:48:26 (1 year ago)

Author:

mikey

Message:

do not add name of root variant to full qualified variant name

Files:

• trunk/docroot/variants.php (modified) (1 diff)
• trunk/src/main/php/net/stubbles/websites/variantmanager/types/stubAbstractVariant.php (modified) (1 diff)
• trunk/src/test/php/net/stubbles/websites/variantmanager/types/stubAbstractVariantTestCase.php (modified) (1 diff)

trunk/docroot/variants.php

@@ -14 +14 @@
-        $request = new stubWebRequest();
-        $session = new stubPHPSession($request, 'web');
-
+FullQualified
-    }
-}

trunk/src/main/php/net/stubbles/websites/variantmanager/types/stubAbstractVariant.php

@@ -81 +81 @@
-    public function getFullQualifiedName()
-    {
-
+ && ($this->parent instanceof stubRootVariant) == false
-            return $this->parent->getFullQualifiedName() . ':' . $this->name;
-        }

trunk/src/test/php/net/stubbles/websites/variantmanager/types/stubAbstractVariantTestCase.php

@@ -224 +224 @@
-        $this->assertEqual($this->abstractVariant->getFullQualifiedName(), 'foo:bar');
-    }
+    
+    /**
+     * test full qualified name when parent variant is root variant
+     */
+    public function testParentRoot()
+    {
+        $this->abstractVariant->setName('bar');
+        $rootVariant = new stubRootVariant();
+        $this->abstractVariant->setParent($rootVariant);
+        $this->assertEqual($this->abstractVariant->getFullQualifiedName(), 'bar');
+    }
-}
-?>