Skip to content

Commit febeff0

Browse files
adietishadietish
committed
[OSJC-121] added test to assert that destroyed app is not found by name
1 parent 5acc248 commit febeff0

3 files changed

Lines changed: 55 additions & 6 deletions

File tree

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<!-- Artifact Information -->
1818
<groupId>com.openshift</groupId>
1919
<artifactId>openshift-java-client</artifactId>
20-
<version>2.6.0.Final</version>
20+
<version>2.7.0-SNAPSHOT</version>
2121
<packaging>jar</packaging>
2222
<name>OpenShift Java Client</name>
2323
<url>http://openshift.redhat.com</url>

‎src/test/java/com/openshift/internal/client/ApplicationResourceIntegrationTest.java‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,21 @@ public void shouldDestroyApplication() throws Exception {
8888
application.destroy();
8989

9090
// verification
91-
assertThat(domain.hasApplicationByName(application.getName())).isFalse();
91+
assertThat(domain.getApplications()).excludes(application);
92+
}
93+
94+
@Test
95+
public void shouldNotFindApplicationByNameIfApplicationIsDestroyed() throws Throwable {
96+
// pre-conditions
97+
IApplication application = ApplicationTestUtils.getOrCreateApplication(domain);
98+
assertThat(application).isNotNull();
99+
String name = application.getName();
100+
101+
// operation
102+
application.destroy();
92103

104+
// verifications
105+
assertThat(domain.getApplicationByName(name)).isNull();
93106
}
94107

95108
@Test

‎src/test/java/com/openshift/internal/client/ApplicationResourceTest.java‎

Lines changed: 40 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,48 @@
1212

1313
import static com.openshift.client.utils.CartridgeTestUtils.FOREMAN_URL;
1414
import static com.openshift.client.utils.CartridgeTestUtils.MYSQL_51_NAME;
15-
import static com.openshift.client.utils.Samples.*;
15+
import static com.openshift.client.utils.Samples.GET_0_ENVIRONMENT_VARIABLES_FOOBARZ_SPRINGEAP6;
16+
import static com.openshift.client.utils.Samples.GET_1_ENVIRONMENT_VARIABLES_FOOBARZ_SPRINGEAP6;
17+
import static com.openshift.client.utils.Samples.GET_2_ENVIRONMENT_VARIABLES_FOOBARZ_SPRINGEAP6;
18+
import static com.openshift.client.utils.Samples.GET_4_ENVIRONMENT_VARIABLES_FOOBARZ_SPRINGEAP6;
19+
import static com.openshift.client.utils.Samples.GET_DOMAINS;
20+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_1EMBEDDED;
21+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_2EMBEDDED;
22+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_NOENVVARS;
23+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_0ALIAS;
24+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_1EMBEDDED;
25+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_2ALIAS;
26+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_2EMBEDDED;
27+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_CARTRIDGES_1EMBEDDED;
28+
import static com.openshift.client.utils.Samples.GET_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_CARTRIDGES_2EMBEDDED;
29+
import static com.openshift.client.utils.Samples.POST_ADD_2_ENVIRONMENT_VARIABLES_TO_FOOBARZ_SPRINGEAP6;
30+
import static com.openshift.client.utils.Samples.POST_ADD_ENVIRONMENT_VARIABLE_FOO_TO_FOOBARZ_SPRINGEAP6;
31+
import static com.openshift.client.utils.Samples.POST_MYSQL_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_CARTRIDGES;
32+
import static com.openshift.client.utils.Samples.POST_STOP_DOMAINS_FOOBARZ_APPLICATIONS_SPRINGEAP6_EVENT;
33+
import static com.openshift.client.utils.Samples.PUT_FOO_ENVIRONMENT_VARIABLE_FOOBARZ_SPRINGEAP6;
1634
import static org.fest.assertions.Assertions.assertThat;
1735
import static org.junit.Assert.assertFalse;
1836
import static org.junit.Assert.assertTrue;
1937
import static org.junit.Assert.fail;
2038

2139
import java.net.SocketTimeoutException;
2240
import java.net.URL;
23-
import java.util.Arrays;
2441
import java.util.HashMap;
2542
import java.util.List;
2643
import java.util.Map;
2744

28-
import com.jcraft.jsch.JSch;
29-
import com.openshift.client.*;
3045
import org.junit.Before;
3146
import org.junit.Ignore;
3247
import org.junit.Test;
3348
import org.mockito.Mockito;
3449

50+
import com.openshift.client.IApplication;
51+
import com.openshift.client.IDomain;
52+
import com.openshift.client.IEnvironmentVariable;
53+
import com.openshift.client.IField;
54+
import com.openshift.client.OpenShiftEndpointException;
55+
import com.openshift.client.OpenShiftException;
56+
import com.openshift.client.OpenShiftTimeoutException;
3557
import com.openshift.client.cartridge.EmbeddableCartridge;
3658
import com.openshift.client.cartridge.IEmbeddableCartridge;
3759
import com.openshift.client.cartridge.IEmbeddedCartridge;
@@ -80,6 +102,20 @@ public void shouldDestroyApplication() throws Throwable {
80102
assertThat(domain.getApplications()).hasSize(1).excludes(app);
81103
}
82104

105+
@Test
106+
public void shouldNotFindApplicationByNameIfApplicationIsDestroyed() throws Throwable {
107+
// pre-conditions
108+
assertThat(domain).isNotNull();
109+
final IApplication app = domain.getApplicationByName("springeap6");
110+
assertThat(app).isNotNull();
111+
112+
// operation
113+
app.destroy();
114+
115+
// verifications
116+
assertThat(domain.getApplicationByName("springeap6")).isNull();
117+
}
118+
83119
@Test
84120
public void shouldStopApplication() throws Throwable {
85121
// pre-conditions

0 commit comments

Comments
 (0)