Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormpotterc0k2013-08-19 15:36:25 +0000
committerGerrit Code Review @ Eclipse.org2013-08-29 16:13:13 +0000
commitb7c17cd7038b4adfc1e9b14f568540baed73b556 (patch)
tree880537cc77a652f721b2db17168dae276dce5e43 /plugins/org.eclipse.osee.framework.skynet.core.test
parent419c045952758bcd1c7a2aba685d890ea20db86a (diff)
downloadorg.eclipse.osee-b7c17cd7038b4adfc1e9b14f568540baed73b556.tar.gz
org.eclipse.osee-b7c17cd7038b4adfc1e9b14f568540baed73b556.tar.xz
org.eclipse.osee-b7c17cd7038b4adfc1e9b14f568540baed73b556.zip
feature[ats_GVNXN]: Update WORDML and DOORS to HTML conversions
Change-Id: I3467c58e808298b3706fe024618d5cf4796944ed Signed-off-by: mpotterc0k <marc.a.potter@boeing.com>
Diffstat (limited to 'plugins/org.eclipse.osee.framework.skynet.core.test')
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java3
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_converted.htm144
-rw-r--r--plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_test_doc.htm2
3 files changed, 68 insertions, 81 deletions
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java
index 3d31f0aa098..1e100be7cd2 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/NormalizeHtmlTest.java
@@ -15,8 +15,8 @@ import java.io.BufferedInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-import org.junit.Assert;
import org.eclipse.osee.framework.jdk.core.util.Lib;
+import org.junit.Assert;
import org.junit.Test;
/**
@@ -34,7 +34,6 @@ public class NormalizeHtmlTest {
String expected = getResource(CONVERTED_HTML);
input = NormalizeHtml.convertToNormalizedHTML(input);
-
input = bodyOnly(input);
expected = bodyOnly(expected);
input = input.replaceAll("\r", "");
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_converted.htm b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_converted.htm
index 092f5e515e8..075877b41d5 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_converted.htm
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_converted.htm
@@ -187,45 +187,39 @@
</span>
</span>
</p>
- <table width="4369" border="1" bordercolor="#000000" cellpadding="0" cellspacing="3">
- <colgroup>
- <col width="2180" />
- <col width="2178" />
- </colgroup>
- <tbody>
- <tr valign="TOP">
- <td width="2180">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: xx-large;">26 pt in table with border</span>
- </span>
- </p>
- </td>
- <td width="2178">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: xx-large;">26 pt in table with border</span>
- </span>
- </p>
- </td>
- </tr>
- <tr valign="TOP">
- <td width="2180">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: xx-large;">28 pt in table with border</span>
- </span>
- </p>
- </td>
- <td width="2178">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: xx-large;">28 pt in table with border</span>
- </span>
- </p>
- </td>
- </tr>
- </tbody>
+ <table border="1">
+ <tr valign="top">
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: xx-large;">26 pt in table with border</span>
+ </span>
+ </p>
+ </td>
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: xx-large;">26 pt in table with border</span>
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr valign="top">
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: xx-large;">28 pt in table with border</span>
+ </span>
+ </p>
+ </td>
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: xx-large;">28 pt in table with border</span>
+ </span>
+ </p>
+ </td>
+ </tr>
</table>
<p style="margin-top: 0.07in; margin-bottom: 0in; line-height: 100%">
<br />
@@ -239,45 +233,39 @@
</span>
</span>
</p>
- <table width="4369" border="1" bordercolor="#000000" cellpadding="0" cellspacing="0">
- <colgroup>
- <col width="2183" />
- <col width="2184" />
- </colgroup>
- <tbody>
- <tr valign="TOP">
- <td width="2183">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: 300%;">36 pt in table without border</span>
- </span>
- </p>
- </td>
- <td width="2184">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: 300%;">36 pt in table without border</span>
- </span>
- </p>
- </td>
- </tr>
- <tr valign="TOP">
- <td width="2183">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: 300%;">40 pt in table w/o border</span>
- </span>
- </p>
- </td>
- <td width="2184">
- <p style="margin-top: 0.07in">
- <span style=" font-family: Times New Roman, serif">
- <span style=" font-size: 300%;">40 pt in table w/o border</span>
- </span>
- </p>
- </td>
- </tr>
- </tbody>
+ <table>
+ <tr valign="top">
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: 300%;">36 pt in table without border</span>
+ </span>
+ </p>
+ </td>
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: 300%;">36 pt in table without border</span>
+ </span>
+ </p>
+ </td>
+ </tr>
+ <tr valign="top">
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: 300%;">40 pt in table w/o border</span>
+ </span>
+ </p>
+ </td>
+ <td>
+ <p style="margin-top: 0.07in">
+ <span style=" font-family: Times New Roman, serif">
+ <span style=" font-size: 300%;">40 pt in table w/o border</span>
+ </span>
+ </p>
+ </td>
+ </tr>
</table>
<p style="margin-top: 0.07in; margin-bottom: 0in; line-height: 100%">
<br />
diff --git a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_test_doc.htm b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_test_doc.htm
index ef338dbdb40..39b724f614f 100644
--- a/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_test_doc.htm
+++ b/plugins/org.eclipse.osee.framework.skynet.core.test/src/org/eclipse/osee/framework/skynet/core/utility/support/NormalizeHtml_test_doc.htm
@@ -90,7 +90,7 @@ pt font normal </SPAN></FONT></FONT></FONT>
</P>
<P STYLE="margin-top: 0.07in; margin-bottom: 0in; line-height: 100%"><FONT COLOR="#000000"><FONT FACE="Times New Roman, serif"><FONT SIZE=7 STYLE="font-size: 32pt"><SPAN STYLE="background: #ffffff">32
pt font</SPAN></FONT></FONT></FONT></P>
-<TABLE WIDTH=4369 BORDER=1 BORDERCOLOR="#000000" CELLPADDING=0 CELLSPACING=0>
+<TABLE WIDTH=4369 BORDER=0 BORDERCOLOR="#000000" CELLPADDING=0 CELLSPACING=0>
<COL WIDTH=2183>
<COL WIDTH=2184>
<TR VALIGN=TOP>

Back to the top