From 41daa057d88ae5bc8cdd207fdf8c7e6bed360a54 Mon Sep 17 00:00:00 2001
From: Adrian Cole <adrian@jclouds.org>
Date: Thu, 15 Mar 2012 13:59:32 -0700
Subject: [PATCH] Issue 871: corrected invalid toString message

---
 .../org/jclouds/compute/domain/internal/LocationPredicate.java  | 2 +-
 .../compute/domain/internal/TemplateBuilderImplTest.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/LocationPredicate.java b/compute/src/main/java/org/jclouds/compute/domain/internal/LocationPredicate.java
index d9a7949183..c12035e925 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/LocationPredicate.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/LocationPredicate.java
@@ -51,6 +51,6 @@ public class LocationPredicate implements Predicate<ComputeMetadata> {
 
    @Override
    public String toString() {
-      return locationSupplier.get() == null ? "anyLocation()" : "locationEqualsOrChildOf(" + locationSupplier.get().getId() + ")";
+      return locationSupplier.get() == null ? "anyLocation()" : "locationEqualsParentOrGrandparentOf(" + locationSupplier.get().getId() + ")";
    }
 }
\ No newline at end of file
diff --git a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
index 1537916bcc..d9230ae3ae 100644
--- a/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
+++ b/compute/src/test/java/org/jclouds/compute/domain/internal/TemplateBuilderImplTest.java
@@ -680,7 +680,7 @@ public class TemplateBuilderImplTest {
          assert false;
       } catch (NoSuchElementException e) {
          // make sure big data is not in the exception message
-         assertEquals(e.getMessage(), "no image matched predicate: And(locationEqualsOrChildOf(us-east-1),imageDescription(description))");
+         assertEquals(e.getMessage(), "no image matched predicate: And(locationEqualsParentOrGrandparentOf(us-east-1),imageDescription(description))");
       }
 
       verify(defaultOptions);