From 75da69288bf98d0ad444c7dd420e8bf40519db44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Dietisheim?= <adietish@redhat.com>
Date: Tue, 7 May 2013 15:00:41 +0200
Subject: [PATCH] [JBIDE-14393] added int test for app type not being reported
 as embedded cartr

---
 ...eddedCartridgeResourceIntegrationTest.java | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/test/java/com/openshift/internal/client/EmbeddedCartridgeResourceIntegrationTest.java b/src/test/java/com/openshift/internal/client/EmbeddedCartridgeResourceIntegrationTest.java
index 84bcdd97..9efbb9f0 100755
--- a/src/test/java/com/openshift/internal/client/EmbeddedCartridgeResourceIntegrationTest.java
+++ b/src/test/java/com/openshift/internal/client/EmbeddedCartridgeResourceIntegrationTest.java
@@ -18,7 +18,9 @@
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.net.URISyntaxException;
+import java.util.List;
 
+import org.fest.assertions.Condition;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -27,7 +29,9 @@
 import com.openshift.client.IUser;
 import com.openshift.client.OpenShiftEndpointException;
 import com.openshift.client.OpenShiftException;
+import com.openshift.client.cartridge.ICartridge;
 import com.openshift.client.cartridge.IEmbeddableCartridge;
+import com.openshift.client.cartridge.IEmbeddedCartridge;
 import com.openshift.client.cartridge.IStandaloneCartridge;
 import com.openshift.client.cartridge.selector.LatestVersionOf;
 import com.openshift.client.utils.ApplicationAssert;
@@ -59,9 +63,36 @@ public void shouldReturnEmbeddedCartridges() throws SocketTimeoutException, Open
 		IApplication application = ApplicationTestUtils.ensureHasExactly1Application(jbossAs, domain);
 
 		// operation
+		List<IEmbeddedCartridge> embeddedCartridges = application.getEmbeddedCartridges();
+		// verification
+		assertThat(embeddedCartridges).isNotNull();
+	}
+
+	@Test
+	public void shouldNotContainTypeInEmbeddedCartridges() throws SocketTimeoutException, OpenShiftException {
+		// pre-conditions
+		final IStandaloneCartridge jbossAs = LatestVersionOf.jbossAs().get(user);
+		assertThat(jbossAs).isNotNull();
+		IApplication application = ApplicationTestUtils.ensureHasExactly1Application(jbossAs, domain);
 
+		// operation
+		List<IEmbeddedCartridge> embeddedCartridges = application.getEmbeddedCartridges();
 		// verification
-		assertThat(application.getEmbeddedCartridges()).isNotNull();
+		assertThat(embeddedCartridges).doesNotSatisfy(new Condition<List<?>>() {
+			
+			@Override
+			public boolean matches(List<?> values) {
+				for(Object value : values) {
+					if (!(value instanceof ICartridge)) {
+						continue;
+					}
+					if (jbossAs.getName().equals(((ICartridge)value).getName())) {
+						return true;
+					};
+				}
+				return false;
+			}
+		});
 	}
 
 	@Test