Axiom: fixed tests failing to duplicate defitions

Signed-off-by: Tony Tkacik <tonydamage@gmail.com>
Evolveum · May 25, 2020 · eb7d929 · eb7d929
1 parent fc21899
commit eb7d929
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ValueContext.java b/infra/axiom/src/main/java/com/evolveum/axiom/lang/impl/ValueContext.java
@@ -12,7 +12,6 @@
 import com.evolveum.axiom.lang.spi.AxiomItemStreamTreeBuilder.ValueBuilder;
 import com.evolveum.axiom.reactor.Dependency;
 import com.google.common.base.Preconditions;
-
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Optional;
@@ -24,6 +23,7 @@
 public class ValueContext<V> extends AbstractContext<ItemContext<V>> implements AxiomValueContext<V>, ValueBuilder, Dependency<AxiomItemValue<V>> {
 
     private Dependency<AxiomItemValue<V>> result;
+    V originalValue;
     Collection<Dependency<?>> dependencies = new HashSet<>();
 
     public ValueContext(SourceLocation loc, IdentifierSpaceHolder space) {
@@ -33,6 +33,7 @@ public ValueContext(SourceLocation loc, IdentifierSpaceHolder space) {
 
     public ValueContext(ItemContext<V> itemContext, V value, SourceLocation loc) {
         super(itemContext, loc, AxiomIdentifierDefinition.Scope.LOCAL);
+        originalValue = value;
         result = new Result(parent().type(), value);
     }
 
@@ -220,8 +221,10 @@ public boolean isMutable() {
 
     @Override
     public String toString() {
-        return "value("+ parent().name() +";" + result +")";
+        return new StringBuffer().append(parent().definition().name().getLocalName())
+                .append(" ")
+                .append(originalValue != null ? originalValue : "")
+                .toString();
     }
 
-
 }
diff --git a/infra/axiom/src/test/resources/base-example.axiom b/infra/axiom/src/test/resources/base-example.axiom
@@ -50,11 +50,6 @@ model model-header {
         }
     }
 
-    object {
-        name User2;
-        itemName user;
-    }
-
     // Alternative representation of a prism object definition
     // (doesn't interfere with item <name> { type ... } in structured types)
     object {

diff --git a/infra/axiom/src/test/resources/common-core.axiom b/infra/axiom/src/test/resources/common-core.axiom
@@ -1192,7 +1192,7 @@ model common-core {
     type ReferentialIntegrity;
 
     // ???
-    type Extension;
+    // type Extension;
 
     // common-3
     type OperationResult;
@@ -1205,7 +1205,8 @@ model common-core {
     type Activation;
 
     // should exist because of "container XXX"
-    type Trigger;
-    type Assignment;
+    // Already defined
+    // type Trigger;
+    // type Assignment;
 
 }