From 1a0a8a47e58b2cdb9ac3f5a0d057de323e653bd1 Mon Sep 17 00:00:00 2001
From: Gary Williams <gary.williams@forgerock.com>
Date: Fri, 30 Sep 2011 17:09:09 +0000
Subject: [PATCH] Fix typos in virtualAttributes functional tests
---
opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
index 10300f3..af70b9d 100644
--- a/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
+++ b/opendj-sdk/opends/tests/staf-tests/functional-tests/testcases/virtualAttributes/virtualAttributes_cos.xml
@@ -720,7 +720,7 @@
<!-- ========================================= -->
<message>
'++++ Create user defined virtual attribute with \
- conflict-behavior prop set to virtual-overrides-real'
+ conflict-behavior prop set to real-overrides-virtual'
</message>
<script>
arg1 = '--type user-defined --name %s' % cosName
@@ -819,7 +819,7 @@
<!-- ========================================= -->
<message>
'++++ Create user defined virtual attribute with \
- conflict-behavior prop set to virtual-overrides-real'
+ conflict-behavior prop set to merge-real-and-virtual'
</message>
<script>
arg1 = '--type user-defined --name %s' % cosName
--
Gitblit v1.10.0