Merge pull request #51 from rsearls/wise-273-html-body-fixed-size

Wise 273 html body fixed size
jboss-wise · Mar 24, 2016 · 614ec9f · 614ec9f
2 parents 0f6b24d + 46c0e96
commit 614ec9f
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 4 deletions.
diff --git a/gui/src/main/webapp/Main.css b/gui/src/main/webapp/Main.css
@@ -225,4 +225,16 @@ div.urlValidationError {
 
  .wise-credentials-error {
      color: red;
+ }
+
+ /* boarder around all screens */
+ #wise-boarder-control {
+     margin-left:auto;
+     margin-right:auto;
+     width:860px;
+     padding-bottom: 20px;
+     border-top: thin solid lightgrey;
+     border-left: thin solid lightgrey;
+     border-right: thin solid lightgrey;
+     border-bottom: thin solid lightgrey;
  }
diff --git a/gui/src/main/webapp/Main.html b/gui/src/main/webapp/Main.html
@@ -33,7 +33,7 @@
   <!-- you can leave the body empty if you want  -->
   <!-- to create a completely dynamic UI.        -->
   <!--                                           -->
-  <body>
+  <body id="wise-boarder-control">
     <div id="wise-banner">
       <a href="." style="border:0px">
           <img src="images/wise-banner.png" border="0"/>

diff --git a/...ite/basic/src/test/java/org/jboss/wise/test/endpoints/EndpointAuthenticationTestCase.java b/...ite/basic/src/test/java/org/jboss/wise/test/endpoints/EndpointAuthenticationTestCase.java
@@ -13,6 +13,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.Assert;
 import org.openqa.selenium.WebDriver;
 
 /**
@@ -33,12 +34,25 @@ public class EndpointAuthenticationTestCase extends WiseTest {
    @Before
    public void before() {
       setBrowser(browser);
+
       userAuthentication(baseURL.toString());
 
       Graphene.goTo(StartPage.class);
       Graphene.waitModel().withTimeout(30, TimeUnit.SECONDS);
 
-      loadStepOneOfThree(PropUtils.get("homepage.securityDomain3.input.url"));
+      try {
+         // trick integration-test phase into running this test correctly.
+         String value = System.setProperty("suite.url", "");
+
+         loadStepOneOfThree(PropUtils.get("homepage.securityDomain3.input.url"));
+
+         // reset original value
+         if (value != null) {
+            System.setProperty("suite.url", value);
+         }
+      } catch (java.lang.RuntimeException e) {
+         Assert.fail("Unsetting or Resetting system property failed.\n" + e);
+      }
    }
 
    @Test

diff --git a/testsuite/basic/src/test/java/org/jboss/wise/test/endpoints/NotNillableDataTypeTestCase.java b/testsuite/basic/src/test/java/org/jboss/wise/test/endpoints/NotNillableDataTypeTestCase.java
@@ -13,6 +13,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.junit.Assert;
 import org.openqa.selenium.WebDriver;
 
 /**
@@ -38,7 +39,19 @@ public void before() {
       Graphene.goTo(StartPage.class);
       Graphene.waitModel().withTimeout(30, TimeUnit.SECONDS);
 
-      loadStepOneOfThree(PropUtils.get("homepage.jbws2278.input.url"));
+      try {
+         // trick integration-test phase into running this test correctly.
+         String value = System.setProperty("suite.url", "");
+
+         loadStepOneOfThree(PropUtils.get("homepage.jbws2278.input.url"));
+
+         // reset original value
+         if (value != null) {
+            System.setProperty("suite.url", value);
+         }
+      } catch (java.lang.RuntimeException e) {
+         Assert.fail("Unsetting or Resetting system property failed.\n" + e);
+      }
    }
 
    @Test

diff --git a/testsuite/basic/src/test/java/org/jboss/wise/test/utils/WiseTest.java b/testsuite/basic/src/test/java/org/jboss/wise/test/utils/WiseTest.java
@@ -85,9 +85,11 @@ protected void loadStepOneOfThree(String homepageInputUrl) {
             // property runs test with 2 different URLs
             // One requires input be set the other does not
             String value = System.getProperty("suite.url");
-            if (value == null || value.endsWith("wise")) {
+            if (value == null || value.isEmpty() || value.endsWith("wise")) {
+                inputBox.clear();
                 inputBox.sendKeys(homepageInputUrl);
             }
+
             readWSDLButton.click();
             Graphene.waitModel().withTimeout(30, TimeUnit.SECONDS).until()
                 .element(By.className(PropUtils.get("tag.tree.item"))).is().visible();