Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Frost2012-09-11 07:00:28 -0400
committerChristopher Frost2012-09-11 07:00:28 -0400
commit2e75f7bd561368fb0c096f149b539a4c2d67041a (patch)
treed368750fe45046b9df6488a72edf212366170816 /org.eclipse.virgo.management.console
parent328469f4db48a9b753624116238cb5a8165f0af9 (diff)
downloadorg.eclipse.virgo.kernel-2e75f7bd561368fb0c096f149b539a4c2d67041a.tar.gz
org.eclipse.virgo.kernel-2e75f7bd561368fb0c096f149b539a4c2d67041a.tar.xz
org.eclipse.virgo.kernel-2e75f7bd561368fb0c096f149b539a4c2d67041a.zip
Fixing the unit test naming
Diffstat (limited to 'org.eclipse.virgo.management.console')
-rw-r--r--org.eclipse.virgo.management.console/src/main/webapp/WEB-INF/layouts/artifacts.html12
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java (renamed from org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationJSTests.java)4
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java (renamed from org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ExplorerJSTests.java)4
-rw-r--r--org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java7
4 files changed, 16 insertions, 11 deletions
diff --git a/org.eclipse.virgo.management.console/src/main/webapp/WEB-INF/layouts/artifacts.html b/org.eclipse.virgo.management.console/src/main/webapp/WEB-INF/layouts/artifacts.html
index 8b67ff93..51369700 100644
--- a/org.eclipse.virgo.management.console/src/main/webapp/WEB-INF/layouts/artifacts.html
+++ b/org.eclipse.virgo.management.console/src/main/webapp/WEB-INF/layouts/artifacts.html
@@ -11,18 +11,18 @@
<li><input name="1" type="file" size="70"></input></li>
</ul>
</form>
- <div id="add-upload-box" class="upload-control" onclick="uploadManager.addUploadBox()"></div>
- <div id="minus-upload-box" class="upload-control" onclick="uploadManager.minusUploadBox()"></div>
+ <div id="add-upload-box" class="upload-control" onclick="uploadHandler.addUploadBox()"></div>
+ <div id="minus-upload-box" class="upload-control" onclick="uploadHandler.minusUploadBox()"></div>
- <iframe id = "upload-target-id" name="upload-target" src="" onload="uploadManager.uploadComplete()"></iframe>
+ <iframe id = "upload-target-id" name="upload-target" src="" onload="uploadHandler.uploadComplete()"></iframe>
<div class="button-container">
<div class="control-cap-left"></div>
<div class="controls">
- <div class="button" onclick="uploadManager.startUpload()">
+ <div class="button" onclick="uploadHandler.startUpload()">
<div class="button-cap-left-blue"></div><div class="button-text">Deploy</div><div class="button-cap-right-blue"></div>
</div>
- <div class="button" onclick="uploadManager.resetForm()">
+ <div class="button" onclick="uploadHandler.resetForm()">
<div class="button-cap-left-blue"></div><div class="button-text">Reset Form</div><div class="button-cap-right-blue"></div>
</div>
</div>
@@ -33,7 +33,7 @@
<div class="button-container">
<div class="control-cap-left"></div>
<div class="controls">
- <div id="upload-toggle-button" class="button" onclick="uploadManager.toggle()">
+ <div id="upload-toggle-button" class="button" onclick="uploadHandler.toggle()">
<div class="button-cap-left-blue"></div><div class="button-text">Deployer</div><div class="button-cap-right-blue"></div>
</div>
</div>
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java
index c6eaf11e..6d7bedac 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ConfigurationsJSTests.java
@@ -31,7 +31,7 @@ import sun.org.mozilla.javascript.internal.Scriptable;
*
*
*/
-public class ConfigurationJSTests extends AbstractJSTests {
+public class ConfigurationsJSTests extends AbstractJSTests {
/**
* Test that the init script for the page reports back that the page is ready for display
@@ -44,7 +44,7 @@ public class ConfigurationJSTests extends AbstractJSTests {
@Ignore
public void testPageinit() throws ScriptException, IOException, NoSuchMethodException{
addCommonObjects();
- readFile("src/main/webapp/js/configuration.js");
+ readFile("src/main/webapp/js/configurations.js");
invokePageInit();
assertNotNull(commonUtil.getLastQueryCallBack());
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ExplorerJSTests.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java
index 69c48858..cc0992e4 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/ExplorerJSTests.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/WiringsJSTests.java
@@ -28,12 +28,12 @@ import sun.org.mozilla.javascript.internal.Scriptable;
*
*
*/
-public class ExplorerJSTests extends AbstractJSTests {
+public class WiringsJSTests extends AbstractJSTests {
@Test
public void testPageinit() throws ScriptException, IOException, NoSuchMethodException{
addCommonObjects();
- readFile("src/main/webapp/js/explorer.js");
+ readFile("src/main/webapp/js/wirings.js");
createTestLayoutManager();
createRaphael();
diff --git a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java
index ace1be78..69a4e770 100644
--- a/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java
+++ b/org.eclipse.virgo.management.console/src/test/java/org/eclipse/virgo/management/console/stubs/objects/Util.java
@@ -76,7 +76,12 @@ public class Util {
}
public Object makeTable(Scriptable properties) {
- this.lastMakeTableHeaders = (String[]) Context.jsToJava(ScriptableObject.getProperty(properties, "headers"), String[].class);
+ Object[] headers = (Object[]) Context.jsToJava(ScriptableObject.getProperty(properties, "headers"), Object[].class);
+ this.lastMakeTableHeaders = new String[headers.length];
+ for (int i = 0; i < headers.length; i++) {
+ this.lastMakeTableHeaders[i] = (String) Context.jsToJava(ScriptableObject.getProperty((Scriptable) headers[i], "title"), String.class);
+ }
+
this.lastMakeTableRows = (String[]) Context.jsToJava(ScriptableObject.getProperty(properties, "rows"), String[].class);
Function elementConstructor = (Function) SCOPE.get("Element", SCOPE);

Back to the top