[Libreoffice-commits] core.git: sw/JunitTest_sw_complex.mk sw/qa
David Ostrovsky
david at ostrovsky.org
Tue Oct 15 01:48:25 PDT 2013
sw/JunitTest_sw_complex.mk | 6
sw/qa/complex/writer/CheckFields.java | 153 ------------------------
sw/qa/complex/writer/CheckIndex.java | 160 -------------------------
sw/qa/complex/writer/VarFields.java | 213 ----------------------------------
4 files changed, 532 deletions(-)
New commits:
commit b122ec243bc5aff15a8e3e9c06aea65d61337ee9
Author: David Ostrovsky <david at ostrovsky.org>
Date: Sun Sep 22 22:31:04 2013 +0200
Remove Java unit tests migrated to Python
Change-Id: I6f4792a1fdbd40d016fabf8649c7058adaedd00c
Reviewed-on: https://gerrit.libreoffice.org/6017
Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>
diff --git a/sw/JunitTest_sw_complex.mk b/sw/JunitTest_sw_complex.mk
index da9da1c..e9b344c 100644
--- a/sw/JunitTest_sw_complex.mk
+++ b/sw/JunitTest_sw_complex.mk
@@ -31,15 +31,12 @@ $(eval $(call gb_JunitTest_add_sourcefiles,sw_complex,\
sw/qa/complex/writer/CheckBookmarks \
sw/qa/complex/writer/CheckCrossReferences \
sw/qa/complex/writer/CheckFlies \
- sw/qa/complex/writer/CheckFields \
- sw/qa/complex/writer/CheckIndex \
sw/qa/complex/writer/CheckIndexedPropertyValues \
sw/qa/complex/writer/CheckNamedPropertyValues \
sw/qa/complex/writer/CheckTable \
sw/qa/complex/writer/LoadSaveTest \
sw/qa/complex/writer/TestDocument \
sw/qa/complex/writer/TextPortionEnumerationTest \
- sw/qa/complex/writer/VarFields \
))
$(eval $(call gb_JunitTest_use_jars,sw_complex,\
@@ -54,14 +51,11 @@ $(eval $(call gb_JunitTest_add_classes,sw_complex,\
complex.accessibility.AccessibleRelationSet \
complex.checkColor.CheckChangeColor \
complex.writer.CheckCrossReferences \
- complex.writer.CheckFields\
complex.writer.CheckFlies \
- complex.writer.CheckIndex \
complex.writer.CheckTable \
complex.writer.CheckIndexedPropertyValues \
complex.writer.CheckNamedPropertyValues \
complex.writer.TextPortionEnumerationTest \
- complex.writer.VarFields\
))
# FIXME has never worked on windows, hashes are different
diff --git a/sw/qa/complex/writer/CheckFields.java b/sw/qa/complex/writer/CheckFields.java
deleted file mode 100644
index f92438e..0000000
--- a/sw/qa/complex/writer/CheckFields.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package complex.writer;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XComponent;
-import com.sun.star.lang.XServiceInfo;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XEnumeration;
-import com.sun.star.util.XCloseable;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextField;
-import com.sun.star.text.XTextFieldsSupplier;
-import com.sun.star.text.XTextRange;
-import com.sun.star.text.XTextCursor;
-
-import org.openoffice.test.OfficeConnection;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.util.Set;
-import java.util.HashSet;
-
-
-public class CheckFields
-{
- private static final OfficeConnection connection = new OfficeConnection();
-
- @BeforeClass public static void setUpConnection() throws Exception {
- connection.setUp();
-//Thread.sleep(5000);
- }
-
- @AfterClass public static void tearDownConnection()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- connection.tearDown();
- }
-
- private XMultiServiceFactory m_xMSF = null;
- private XComponentContext m_xContext = null;
- private XTextDocument m_xDoc = null;
-
- @Before public void before() throws Exception
- {
- m_xMSF = UnoRuntime.queryInterface(
- XMultiServiceFactory.class,
- connection.getComponentContext().getServiceManager());
- m_xContext = connection.getComponentContext();
- assertNotNull("could not get component context.", m_xContext);
- m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
- }
-
- @After public void after()
- {
- util.DesktopTools.closeDoc(m_xDoc);
- }
-
- @Test
- public void test_fdo39694_load() throws Exception
- {
- PropertyValue[] loadProps = new PropertyValue[2];
- loadProps[0] = new PropertyValue();
- loadProps[0].Name = "AsTemplate";
- loadProps[0].Value = new Boolean(true);
- loadProps[1] = new PropertyValue();
- loadProps[1].Name = "Hidden";
- loadProps[1].Value = new Boolean(true);
-
- String file = TestDocument.getUrl("fdo39694.ott");
- XComponent xComp = util.DesktopTools.loadDoc(m_xMSF, file, loadProps);
- XTextDocument xTextDoc = UnoRuntime.queryInterface(XTextDocument.class, xComp);
-
- XTextFieldsSupplier xTFS = UnoRuntime.queryInterface(XTextFieldsSupplier.class, xComp);
- XEnumeration xEnum = xTFS.getTextFields().createEnumeration();
- Set<String> placeholders = new HashSet<String>();
- placeholders.add("<Kadr1>");
- placeholders.add("<Kadr2>");
- placeholders.add("<Kadr3>");
- placeholders.add("<Kadr4>");
- placeholders.add("<Pnname>");
- placeholders.add("<Pvname>");
- placeholders.add("<Pgeboren>");
-
- while (xEnum.hasMoreElements())
- {
- Object xField = xEnum.nextElement();
- XServiceInfo xSI = UnoRuntime.queryInterface(XServiceInfo.class, xField);
- if (xSI.supportsService("com.sun.star.text.TextField.JumpEdit"))
- {
- XTextContent xContent = UnoRuntime.queryInterface(XTextContent.class, xField);
- XTextRange xAnchor = xContent.getAnchor();
- String readContent = xAnchor.getString();
- if (!placeholders.remove(readContent))
- {
- System.out.println("field not found: " + readContent);
- assertFalse(true);
- }
- }
- }
- assertTrue(placeholders.isEmpty());
- XCloseable xClos = UnoRuntime.queryInterface(
- XCloseable.class, xComp);
- if (xClos != null) {
- xClos.close(true);
- }
- }
-
- @Test
- public void test_fdo42073() throws Exception
- {
- XMultiServiceFactory xDocFactory = UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xDoc);
- Object xField =
- xDocFactory.createInstance("com.sun.star.text.TextField.Input");
-
- XText xBodyText = m_xDoc.getText();
- XTextCursor xCursor = xBodyText.createTextCursor();
- XTextField xTextField = UnoRuntime.queryInterface(XTextField.class, xField);
- xBodyText.insertTextContent(xCursor, xTextField, true);
-
- XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xField);
- {
- Object readContent = xPropSet.getPropertyValue("Content");
- assertEquals("", readContent);
- }
-
- String content = "this is not surprising";
- xPropSet.setPropertyValue("Content", content);
- Object readContent = xPropSet.getPropertyValue("Content");
- assertEquals(content, readContent);
- readContent = xTextField.getPresentation(false);
- assertEquals(content, readContent);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/complex/writer/CheckIndex.java b/sw/qa/complex/writer/CheckIndex.java
deleted file mode 100644
index 641b012..0000000
--- a/sw/qa/complex/writer/CheckIndex.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package complex.writer;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.EventObject;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.util.XRefreshable;
-import com.sun.star.util.XRefreshListener;
-import com.sun.star.text.ControlCharacter;
-import com.sun.star.text.XDocumentIndex;
-import com.sun.star.text.XParagraphCursor;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextDocument;
-import org.openoffice.test.OfficeConnection;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-
-public class CheckIndex
-{
- private static final OfficeConnection connection = new OfficeConnection();
-
- @BeforeClass public static void setUpConnection() throws Exception {
- connection.setUp();
- }
-
- @AfterClass public static void tearDownConnection()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- connection.tearDown();
- }
-
- private XMultiServiceFactory m_xMSF = null;
- private XComponentContext m_xContext = null;
- private XTextDocument m_xDoc = null;
-
- @Before public void before() throws Exception
- {
- m_xMSF = UnoRuntime.queryInterface(
- XMultiServiceFactory.class,
- connection.getComponentContext().getServiceManager());
- m_xContext = connection.getComponentContext();
- assertNotNull("could not get component context.", m_xContext);
- m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
- }
-
- @After public void after()
- {
- util.DesktopTools.closeDoc(m_xDoc);
- }
-
- class RefreshListener implements XRefreshListener
- {
- public boolean m_bDisposed = false;
- public boolean m_bRefreshed = false;
- public void disposing(EventObject event)
- {
- m_bDisposed = true;
- }
- public void refreshed(EventObject event)
- {
- m_bRefreshed = true;
- }
- public void assertRefreshed()
- {
- assertTrue(m_bRefreshed);
- m_bRefreshed = false;
- }
- }
-
- @Test
- public void test_refresh() throws Exception
- {
- XMultiServiceFactory xDocFactory =
- UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xDoc);
- Object xIndex =
- xDocFactory.createInstance("com.sun.star.text.ContentIndex");
-
- XText xBodyText = m_xDoc.getText();
- XParagraphCursor xCursor = UnoRuntime.queryInterface(
- XParagraphCursor.class, xBodyText.createTextCursor());
- XPropertySet xCursorSet =
- UnoRuntime.queryInterface(XPropertySet.class, xCursor);
- XTextContent xIndexContent =
- UnoRuntime.queryInterface(XTextContent.class, xIndex);
- XPropertySet xIndexSet =
- UnoRuntime.queryInterface(XPropertySet.class, xIndex);
- xIndexSet.setPropertyValue("CreateFromOutline", true);
- xBodyText.insertTextContent(xCursor, xIndexContent, true);
-
- XRefreshable xRefreshable =
- UnoRuntime.queryInterface(XRefreshable.class, xIndex);
-
- // test that refresh calls listener
- RefreshListener listener = new RefreshListener();
- xRefreshable.addRefreshListener(listener);
- assertFalse(listener.m_bRefreshed);
- xRefreshable.refresh();
- listener.assertRefreshed();
-
- // insert some heading
- xCursor.gotoEnd(false);
- xBodyText.insertControlCharacter(xCursor,
- ControlCharacter.PARAGRAPH_BREAK, false);
- xCursor.gotoEnd(false);
- xCursor.setString("a heading");
- xCursor.gotoStartOfParagraph(true);
- xCursorSet.setPropertyValue("ParaStyleName", "Heading 1");
-
- xRefreshable.refresh();
- listener.assertRefreshed();
- // hope text is in last paragraph...
- xCursor.gotoRange(xIndexContent.getAnchor().getEnd(), false);
- xCursor.gotoStartOfParagraph(true);
- String text = xCursor.getString();
- assertTrue(text.contains("a heading"));
-
- // insert some more headings
- xCursor.gotoEnd(false);
- xBodyText.insertControlCharacter(xCursor,
- ControlCharacter.PARAGRAPH_BREAK, false);
- xCursor.gotoEnd(false);
- xCursor.setString("yet another heading");
- xCursor.gotoStartOfParagraph(true);
- xCursorSet.setPropertyValue("ParaStyleName", "Heading 1");
-
- // try again with update
- XDocumentIndex xIndexIndex =
- UnoRuntime.queryInterface(XDocumentIndex.class, xIndex);
- xIndexIndex.update();
- listener.assertRefreshed();
- xCursor.gotoRange(xIndexContent.getAnchor().getEnd(), false);
- xCursor.gotoStartOfParagraph(true);
- text = xCursor.getString();
- assertTrue(text.contains("yet another heading"));
-
- // dispose must call the listener
- assertFalse(listener.m_bDisposed);
- xIndexIndex.dispose();
- assertTrue(listener.m_bDisposed);
- }
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/qa/complex/writer/VarFields.java b/sw/qa/complex/writer/VarFields.java
deleted file mode 100644
index 5db8f78..0000000
--- a/sw/qa/complex/writer/VarFields.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-package complex.writer;
-
-import com.sun.star.uno.UnoRuntime;
-import com.sun.star.uno.XComponentContext;
-import com.sun.star.lang.XMultiServiceFactory;
-import com.sun.star.lang.XComponent;
-import com.sun.star.beans.XPropertySet;
-import com.sun.star.beans.PropertyValue;
-import com.sun.star.container.XEnumeration;
-import com.sun.star.container.XEnumerationAccess;
-import com.sun.star.container.XNameAccess;
-import com.sun.star.container.XIndexAccess;
-import com.sun.star.frame.XStorable;
-import com.sun.star.util.XRefreshable;
-import com.sun.star.text.XText;
-import com.sun.star.text.XTextContent;
-import com.sun.star.text.XTextDocument;
-import com.sun.star.text.XTextFieldsSupplier;
-import com.sun.star.text.XTextSectionsSupplier;
-import com.sun.star.text.XTextCursor;
-import com.sun.star.text.XTextSection;
-import com.sun.star.text.XParagraphCursor;
-import com.sun.star.text.ControlCharacter;
-import com.sun.star.text.XDependentTextField;
-import org.openoffice.test.OfficeConnection;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.net.URI;
-
-
-/**
- * This is the efforts to create a unit test to reproduce fdo#55814
- *
- * TODO:
- * create paragraph outside the section and check that recent fix really works
- **/
-
-public class VarFields
-{
- private static final OfficeConnection connection = new OfficeConnection();
-
- @BeforeClass public static void setUpConnection() throws Exception {
- connection.setUp();
- //Thread.sleep(5000);
- }
-
- @AfterClass public static void tearDownConnection()
- throws InterruptedException, com.sun.star.uno.Exception
- {
- connection.tearDown();
- }
-
- private XMultiServiceFactory m_xMSF = null;
- private XComponentContext m_xContext = null;
- private XTextDocument m_xDoc = null;
- private String m_TmpDir = null;
- private String m_FileName = null;
-
- @Before public void before() throws Exception
- {
- m_xMSF = UnoRuntime.queryInterface(
- XMultiServiceFactory.class,
- connection.getComponentContext().getServiceManager());
- m_xContext = connection.getComponentContext();
- assertNotNull("could not get component context.", m_xContext);
- m_xDoc = util.WriterTools.createTextDoc(m_xMSF);
- m_TmpDir = util.utils.getOfficeTemp/*Dir*/(m_xMSF);
- m_FileName = m_TmpDir + "VarFields.odt";
- System.out.println("file: " + m_FileName);
- }
-
- @After public void after()
- {
- util.DesktopTools.closeDoc(m_xDoc);
- }
-
- void checkTmpDirExists(String target) throws Exception
- {
- File f = new File(new URI(target));
- if (!f.exists()) {
- if (!f.mkdirs()) {
- throw new Exception("cannot mkdir: " + target);
- }
- }
- }
-
- // no paragraph after section: condition get corrupted
- @Test
- public void test_fdo_55814_still_problem_create_new_bz_for_that() throws Exception
- {
- // create MSF
- XMultiServiceFactory xDocFactory = UnoRuntime.queryInterface(XMultiServiceFactory.class, m_xDoc);
- // create body
- XText xBodyText = m_xDoc.getText();
- // create cursor
- XTextCursor xCursor = xBodyText.createTextCursor();
- // 0. create text field
- Object xField = xDocFactory.createInstance("com.sun.star.text.textfield.SetExpression");
- // 1. fill it with properties
- XPropertySet xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xField);
- xPropSet.setPropertyValue("Content", "0");
- xPropSet.setPropertyValue("IsVisible", true);
- xPropSet.setPropertyValue("Hint", "trying to reproduce fdo#55814");
- xPropSet.setPropertyValue("SubType", 0);// VAR
- xPropSet.setPropertyValue("Value", 0.0);
- // 2. create master field
- Object xMaster = xDocFactory.createInstance("com.sun.star.text.fieldmaster.SetExpression");
- xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xMaster);
- // 3. set name of the master field to "foo"
- xPropSet.setPropertyValue("Name", "foo");
- // 4. get Dependent Field
- XDependentTextField xDependentTextField = UnoRuntime.queryInterface(XDependentTextField.class, xField);
- // 5. connect real field to the master
- xDependentTextField.attachTextFieldMaster(xPropSet);
- // 6. insert text field into the document
- xBodyText.insertTextContent(xCursor, UnoRuntime.queryInterface(XTextContent.class, xField), false);
- // 7. retrieve paragraph cursor
- XParagraphCursor xParagraphCursor = UnoRuntime.queryInterface(XParagraphCursor.class, xCursor);
- xParagraphCursor.gotoEndOfParagraph(false /*not select*/);
- // 8. enter new line
- xBodyText.insertControlCharacter( xCursor, ControlCharacter.PARAGRAPH_BREAK, false );
- // 9. create new section
- Object xSection = xDocFactory.createInstance("com.sun.star.text.TextSection");
- XTextSection xTextSection = UnoRuntime.queryInterface(XTextSection.class, xSection);
- // 10. fill the properties of section
- xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xTextSection);
- xPropSet.setPropertyValue("Condition", "foo EQ 1");
- xPropSet.setPropertyValue("IsVisible", false);
- Object readContent = xPropSet.getPropertyValue("Condition");
- assertEquals("foo EQ 1", readContent);
- // 11. Insert some text to be content on the section
- xBodyText.insertString(xCursor,
- "The quick brown fox jumps over the lazy dog",
- true);
- // 12. insert section
- XTextContent xTextContext = UnoRuntime.queryInterface(XTextContent.class, xSection);
- xBodyText.insertTextContent(xCursor, xTextContext, true);
-
- // 12.1 insert new paragraph. Note: that's here the difference
- xParagraphCursor.gotoEndOfParagraph(false /*not select*/);
-
- // TODO: how to leave the section now?
- xBodyText.insertControlCharacter( xCursor, ControlCharacter.PARAGRAPH_BREAK, false );
-
- xBodyText.insertString(xCursor,
- "new paragraph",
- false);
-
- // 13. Access fields to refresh the document
- XTextFieldsSupplier xTextFieldsSupplier = UnoRuntime.queryInterface(XTextFieldsSupplier.class, m_xDoc);
- XEnumerationAccess xEnumerationAccess = xTextFieldsSupplier.getTextFields();
- // 14. refresh document to update the fields
- XRefreshable xRefreshable = UnoRuntime.queryInterface(XRefreshable.class, xEnumerationAccess);
- xRefreshable.refresh();
- // 15. retrieve the field
- XEnumeration xFieldEnum = xEnumerationAccess.createEnumeration();
- // Note: we have only one field here, that why nextElement() is just fine here
- xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xFieldEnum.nextElement());
- // check
- readContent = xPropSet.getPropertyValue("Content");
- assertEquals("0", readContent);
- readContent = xPropSet.getPropertyValue("Value");
- assertEquals(0.0, readContent);
- // 16. change the value of the field from 0 to 1 and check
- xPropSet.setPropertyValue("Value", 1.0);
- xPropSet.setPropertyValue("Content", "1");
- readContent = xPropSet.getPropertyValue("Value");
- assertEquals(1.0, readContent);
- readContent = xPropSet.getPropertyValue("Content");
- assertEquals("1", readContent);
- // 17. refresh document to update the fields again
- xRefreshable.refresh();
- // 18. store document
- doStore(m_xDoc, m_FileName);
- // 19. retrieve the section
- XTextSectionsSupplier xTextSectionsSupplier = UnoRuntime.queryInterface(XTextSectionsSupplier.class, m_xDoc);
- XNameAccess xNameAccess = xTextSectionsSupplier.getTextSections();
- XIndexAccess xIndexAccess = UnoRuntime.queryInterface(XIndexAccess.class, xNameAccess);
- xPropSet = UnoRuntime.queryInterface(XPropertySet.class, xIndexAccess.getByIndex(0));
-
- // 20. retrieve the condition property of that section
- readContent = xPropSet.getPropertyValue("Condition");
- // 21. check
- // expected:
- //assertEquals("foo EQ 1", readContent);
- // reality:
- assertEquals("0", readContent);
- }
-
- private void doStore(XComponent xComp, String file) throws Exception
- {
- System.out.println("Storing test document: " + file);
- XStorable xStor = UnoRuntime.queryInterface(XStorable.class, xComp);
- xStor.storeToURL(file, new PropertyValue[0]);
- System.out.println("...done");
- }
-
-}
More information about the Libreoffice-commits
mailing list