YARN-30. Fixed tests verifying web-services to work on JDK7. Contributed by Thomas Graves.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1396391 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
bca57d471f
commit
a5ebccd7bc
|
@ -71,6 +71,9 @@ Release 2.0.3-alpha - Unreleased
|
||||||
YARN-134. ClientToAMSecretManager creates keys without checking for
|
YARN-134. ClientToAMSecretManager creates keys without checking for
|
||||||
validity of the appID. (Vinod Kumar Vavilapalli via sseth)
|
validity of the appID. (Vinod Kumar Vavilapalli via sseth)
|
||||||
|
|
||||||
|
YARN-30. Fixed tests verifying web-services to work on JDK7. (Thomas Graves
|
||||||
|
via vinodkv)
|
||||||
|
|
||||||
Release 2.0.2-alpha - 2012-09-07
|
Release 2.0.2-alpha - 2012-09-07
|
||||||
|
|
||||||
INCOMPATIBLE CHANGES
|
INCOMPATIBLE CHANGES
|
||||||
|
|
|
@ -79,4 +79,11 @@ public class WebServicesTestUtils {
|
||||||
got.matches(expected));
|
got.matches(expected));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void checkStringContains(String print, String expected, String got) {
|
||||||
|
assertTrue(
|
||||||
|
print + " doesn't contain expected string, got: " + got + " expected: " + expected,
|
||||||
|
got.contains(expected));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -382,7 +382,7 @@ public class TestNMWebServicesApps extends JerseyTest {
|
||||||
String message = exception.getString("message");
|
String message = exception.getString("message");
|
||||||
String type = exception.getString("exception");
|
String type = exception.getString("exception");
|
||||||
String classname = exception.getString("javaClassName");
|
String classname = exception.getString("javaClassName");
|
||||||
verifyStatInvalidException(message, type, classname);
|
verifyStateInvalidException(message, type, classname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -412,7 +412,7 @@ public class TestNMWebServicesApps extends JerseyTest {
|
||||||
String message = exception.getString("message");
|
String message = exception.getString("message");
|
||||||
String type = exception.getString("exception");
|
String type = exception.getString("exception");
|
||||||
String classname = exception.getString("javaClassName");
|
String classname = exception.getString("javaClassName");
|
||||||
verifyStatInvalidException(message, type, classname);
|
verifyStateInvalidException(message, type, classname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -450,16 +450,16 @@ public class TestNMWebServicesApps extends JerseyTest {
|
||||||
String type = WebServicesTestUtils.getXmlString(element, "exception");
|
String type = WebServicesTestUtils.getXmlString(element, "exception");
|
||||||
String classname = WebServicesTestUtils.getXmlString(element,
|
String classname = WebServicesTestUtils.getXmlString(element,
|
||||||
"javaClassName");
|
"javaClassName");
|
||||||
verifyStatInvalidException(message, type, classname);
|
verifyStateInvalidException(message, type, classname);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void verifyStatInvalidException(String message, String type,
|
private void verifyStateInvalidException(String message, String type,
|
||||||
String classname) {
|
String classname) {
|
||||||
WebServicesTestUtils
|
WebServicesTestUtils
|
||||||
.checkStringMatch(
|
.checkStringContains(
|
||||||
"exception message",
|
"exception message",
|
||||||
"No enum const class org.apache.hadoop.yarn.server.nodemanager.containermanager.application.ApplicationState.FOO_STATE",
|
"org.apache.hadoop.yarn.server.nodemanager.containermanager.application.ApplicationState.FOO_STATE",
|
||||||
message);
|
message);
|
||||||
WebServicesTestUtils.checkStringMatch("exception type",
|
WebServicesTestUtils.checkStringMatch("exception type",
|
||||||
"IllegalArgumentException", type);
|
"IllegalArgumentException", type);
|
||||||
|
|
|
@ -280,9 +280,9 @@ public class TestRMWebServicesApps extends JerseyTest {
|
||||||
String type = exception.getString("exception");
|
String type = exception.getString("exception");
|
||||||
String classname = exception.getString("javaClassName");
|
String classname = exception.getString("javaClassName");
|
||||||
WebServicesTestUtils
|
WebServicesTestUtils
|
||||||
.checkStringMatch(
|
.checkStringContains(
|
||||||
"exception message",
|
"exception message",
|
||||||
"No enum const class org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState.INVALID_test",
|
"org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState.INVALID_test",
|
||||||
message);
|
message);
|
||||||
WebServicesTestUtils.checkStringMatch("exception type",
|
WebServicesTestUtils.checkStringMatch("exception type",
|
||||||
"IllegalArgumentException", type);
|
"IllegalArgumentException", type);
|
||||||
|
@ -359,9 +359,9 @@ public class TestRMWebServicesApps extends JerseyTest {
|
||||||
String type = exception.getString("exception");
|
String type = exception.getString("exception");
|
||||||
String classname = exception.getString("javaClassName");
|
String classname = exception.getString("javaClassName");
|
||||||
WebServicesTestUtils
|
WebServicesTestUtils
|
||||||
.checkStringMatch(
|
.checkStringContains(
|
||||||
"exception message",
|
"exception message",
|
||||||
"No enum const class org.apache.hadoop.yarn.api.records.FinalApplicationStatus.INVALID_test",
|
"org.apache.hadoop.yarn.api.records.FinalApplicationStatus.INVALID_test",
|
||||||
message);
|
message);
|
||||||
WebServicesTestUtils.checkStringMatch("exception type",
|
WebServicesTestUtils.checkStringMatch("exception type",
|
||||||
"IllegalArgumentException", type);
|
"IllegalArgumentException", type);
|
||||||
|
|
|
@ -229,9 +229,9 @@ public class TestRMWebServicesNodes extends JerseyTest {
|
||||||
String type = exception.getString("exception");
|
String type = exception.getString("exception");
|
||||||
String classname = exception.getString("javaClassName");
|
String classname = exception.getString("javaClassName");
|
||||||
WebServicesTestUtils
|
WebServicesTestUtils
|
||||||
.checkStringMatch(
|
.checkStringContains(
|
||||||
"exception message",
|
"exception message",
|
||||||
"No enum const class org.apache.hadoop.yarn.api.records.NodeState.BOGUSSTATE",
|
"org.apache.hadoop.yarn.api.records.NodeState.BOGUSSTATE",
|
||||||
message);
|
message);
|
||||||
WebServicesTestUtils.checkStringMatch("exception type",
|
WebServicesTestUtils.checkStringMatch("exception type",
|
||||||
"IllegalArgumentException", type);
|
"IllegalArgumentException", type);
|
||||||
|
|
Loading…
Reference in New Issue