From 9cfba09e2f19ae987032108baeaf72428378a727 Mon Sep 17 00:00:00 2001
From: Can Bican <can@bican.net>
Date: Sun, 28 Jun 2015 21:10:06 +0300
Subject: [PATCH] term for taxonomies added & options implemented

---
 src/net/bican/wordpress/Option.java           |  79 +++++
 src/net/bican/wordpress/Term.java             | 159 +++++++++
 src/net/bican/wordpress/TermFilter.java       | 105 ++++++
 src/net/bican/wordpress/Wordpress.java        | 319 +++++++++++-------
 src/net/bican/wordpress/XmlRpcMapped.java     |   7 +-
 .../bican/wordpress/test/CategoryTest.java    |   3 +-
 .../net/bican/wordpress/test/OptionsTest.java |  81 +++++
 .../bican/wordpress/test/TaxonomyTest.java    |  76 +++++
 8 files changed, 699 insertions(+), 130 deletions(-)
 create mode 100644 src/net/bican/wordpress/Option.java
 create mode 100644 src/net/bican/wordpress/Term.java
 create mode 100644 src/net/bican/wordpress/TermFilter.java
 create mode 100644 test/net/bican/wordpress/test/OptionsTest.java

diff --git a/src/net/bican/wordpress/Option.java b/src/net/bican/wordpress/Option.java
new file mode 100644
index 0000000..a5e3f0e
--- /dev/null
+++ b/src/net/bican/wordpress/Option.java
@@ -0,0 +1,79 @@
+package net.bican.wordpress;
+
+/**
+ * Option object for a blog.
+ * 
+ * @author Can Bican &lt;can@bican.net&gt;
+ */
+public class Option extends XmlRpcMapped implements StringHeader {
+  String name;
+  String desc;
+  String value;
+  Boolean readonly;
+  
+  /**
+   * @return the name
+   */
+  public String getName() {
+    return this.name;
+  }
+  
+  /**
+   * @param name
+   *          name to set
+   */
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  /**
+   * @return the description
+   */
+  public String getDesc() {
+    return this.desc;
+  }
+  
+  /**
+   * @return the value
+   */
+  public String getValue() {
+    return this.value;
+  }
+  
+  /**
+   * @return read-only status
+   */
+  public Boolean isReadonly() {
+    return this.readonly;
+  }
+  
+  /**
+   * @param desc
+   *          description to set
+   */
+  public void setDesc(String desc) {
+    this.desc = desc;
+  }
+  
+  /**
+   * @param readonly
+   *          read-only status to set
+   */
+  public void setReadonly(Boolean readonly) {
+    this.readonly = readonly;
+  }
+  
+  /**
+   * @param value
+   *          value to set
+   */
+  public void setValue(String value) {
+    this.value = value;
+  }
+  
+  @Override
+  public String getStringHeader() {
+    return ""; //$NON-NLS-1$
+  }
+  
+}
diff --git a/src/net/bican/wordpress/Term.java b/src/net/bican/wordpress/Term.java
new file mode 100644
index 0000000..f1b3952
--- /dev/null
+++ b/src/net/bican/wordpress/Term.java
@@ -0,0 +1,159 @@
+package net.bican.wordpress;
+
+/**
+ * Term object for a blog.
+ * 
+ * @author Can Bican &lt;can@bican.net&gt;
+ */
+public class Term extends XmlRpcMapped implements StringHeader {
+  Integer term_id;
+  String name;
+  String slug;
+  String term_group;
+  String term_taxonomy_id;
+  String taxonomy;
+  String description;
+  Integer parent;
+  Integer count;
+  
+  /**
+   * @return the term id
+   */
+  public Integer getTerm_id() {
+    return this.term_id;
+  }
+  
+  /**
+   * @param term_id
+   *          term id to set
+   */
+  public void setTerm_id(Integer term_id) {
+    this.term_id = term_id;
+  }
+  
+  /**
+   * @return the name
+   */
+  public String getName() {
+    return this.name;
+  }
+  
+  /**
+   * @param name
+   *          name to set
+   */
+  public void setName(String name) {
+    this.name = name;
+  }
+  
+  /**
+   * @return the slug
+   */
+  public String getSlug() {
+    return this.slug;
+  }
+  
+  /**
+   * @param slug
+   *          slug to set
+   */
+  public void setSlug(String slug) {
+    this.slug = slug;
+  }
+  
+  /**
+   * @return the term group
+   */
+  public String getTerm_group() {
+    return this.term_group;
+  }
+  
+  /**
+   * @param term_group
+   *          term group to set
+   */
+  public void setTerm_group(String term_group) {
+    this.term_group = term_group;
+  }
+  
+  /**
+   * @return the taxonomy id
+   */
+  public String getTerm_taxonomy_id() {
+    return this.term_taxonomy_id;
+  }
+  
+  /**
+   * @param term_taxonomy_id
+   *          taxonomy id to set
+   */
+  public void setTerm_taxonomy_id(String term_taxonomy_id) {
+    this.term_taxonomy_id = term_taxonomy_id;
+  }
+  
+  /**
+   * @return the taxonomy
+   */
+  public String getTaxonomy() {
+    return this.taxonomy;
+  }
+  
+  /**
+   * @param taxonomy
+   *          taxonomy to set
+   */
+  public void setTaxonomy(String taxonomy) {
+    this.taxonomy = taxonomy;
+  }
+  
+  /**
+   * @return the description
+   */
+  public String getDescription() {
+    return this.description;
+  }
+  
+  /**
+   * @param description
+   *          description to set
+   */
+  public void setDescription(String description) {
+    this.description = description;
+  }
+  
+  /**
+   * @return the parent
+   */
+  public Integer getParent() {
+    return this.parent;
+  }
+  
+  /**
+   * @param parent
+   *          parent to set
+   */
+  public void setParent(Integer parent) {
+    this.parent = parent;
+  }
+  
+  /**
+   * @return the count
+   */
+  public Integer getCount() {
+    return this.count;
+  }
+  
+  /**
+   * @param count
+   *          count to set
+   */
+  public void setCount(Integer count) {
+    this.count = count;
+  }
+  
+  @Override
+  public String getStringHeader() {
+    return ""; //$NON-NLS-1$
+  }
+  
+}
diff --git a/src/net/bican/wordpress/TermFilter.java b/src/net/bican/wordpress/TermFilter.java
new file mode 100644
index 0000000..0c1167a
--- /dev/null
+++ b/src/net/bican/wordpress/TermFilter.java
@@ -0,0 +1,105 @@
+package net.bican.wordpress;
+
+/**
+ * Object for filtering terms during search
+ * 
+ * @author Can Bican &lt;can@bican.net&gt;
+ */
+public class TermFilter extends XmlRpcMapped {
+  Integer number;
+  Integer offset;
+  String orderby;
+  String order;
+  boolean hide_empty;
+  String search;
+  
+  /**
+   * @return the number
+   */
+  public Integer getNumber() {
+    return this.number;
+  }
+  
+  /**
+   * @param number
+   *          number to set
+   */
+  public void setNumber(Integer number) {
+    this.number = number;
+  }
+  
+  /**
+   * @return the offset
+   */
+  public Integer getOffset() {
+    return this.offset;
+  }
+  
+  /**
+   * @param offset
+   *          offset to set
+   */
+  public void setOffset(Integer offset) {
+    this.offset = offset;
+  }
+  
+  /**
+   * @return the order-by
+   */
+  public String getOrderby() {
+    return this.orderby;
+  }
+  
+  /**
+   * @param orderby
+   *          order-by to set
+   */
+  public void setOrderby(String orderby) {
+    this.orderby = orderby;
+  }
+  
+  /**
+   * @return the order
+   */
+  public String getOrder() {
+    return this.order;
+  }
+  
+  /**
+   * @param order
+   *          order to set
+   */
+  public void setOrder(String order) {
+    this.order = order;
+  }
+  
+  /**
+   * @return the hide-empty status
+   */
+  public boolean isHide_empty() {
+    return this.hide_empty;
+  }
+  
+  /**
+   * @param hide_empty
+   *          hide-empty status to set
+   */
+  public void setHide_empty(boolean hide_empty) {
+    this.hide_empty = hide_empty;
+  }
+  
+  /**
+   * @return the search terms
+   */
+  public String getSearch() {
+    return this.search;
+  }
+  
+  /**
+   * @param search
+   *          search terms to set
+   */
+  public void setSearch(String search) {
+    this.search = search;
+  }
+}
diff --git a/src/net/bican/wordpress/Wordpress.java b/src/net/bican/wordpress/Wordpress.java
index c0b67d8..6f65f7d 100644
--- a/src/net/bican/wordpress/Wordpress.java
+++ b/src/net/bican/wordpress/Wordpress.java
@@ -1014,10 +1014,193 @@ public List<Taxonomy> getTaxonomies() {
     XmlRpcArray r = this.wp.getTaxonomies(0, this.username, this.password);
     return fillFromXmlRpcArray(r, Taxonomy.class, new Taxonomy());
   }
+  
+  /**
+   * @param taxonomy
+   *          taxonomy to get
+   * @return the taxonomy
+   */
+  @SuppressWarnings("boxing")
+  public Taxonomy getTaxonomy(String taxonomy) {
+    XmlRpcStruct r = this.wp.getTaxonomy(0, this.username, this.password,
+        taxonomy);
+    Taxonomy t = new Taxonomy();
+    t.fromXmlRpcStruct(r);
+    return t;
+  }
+  
+  /**
+   * @param taxonomy
+   *          taxonomy name
+   * @return the list of terms
+   */
+  public List<Term> getTerms(String taxonomy) {
+    return this.getTerms(taxonomy, null);
+  }
+  
+  /**
+   * @param taxonomy
+   *          taxonomy name
+   * @param filter
+   *          term filter
+   * @return the list of terms
+   */
+  @SuppressWarnings("boxing")
+  public List<Term> getTerms(String taxonomy, TermFilter filter) {
+    XmlRpcArray r = (filter != null) ? this.wp.getTerms(0, this.username,
+        this.password, taxonomy, filter.toXmlRpcStruct()) : this.wp.getTerms(0,
+        this.username, this.password, taxonomy);
+    return fillFromXmlRpcArray(r, Term.class, new Term());
+  }
+  
+  /**
+   * @param taxonomy
+   *          taxonomy name
+   * @param termId
+   *          term id
+   * @return the term
+   */
+  @SuppressWarnings("boxing")
+  public Term getTerm(String taxonomy, Integer termId) {
+    XmlRpcStruct r = this.wp.getTerm(0, this.username, this.password, taxonomy,
+        termId);
+    Term t = new Term();
+    t.fromXmlRpcStruct(r);
+    return t;
+  }
+  
+  /**
+   * @param term
+   *          new term
+   * @return the term id
+   */
+  @SuppressWarnings("boxing")
+  public Integer newTerm(Term term) {
+    String r = this.wp.newTerm(0, this.username, this.password,
+        term.toXmlRpcStruct());
+    return Integer.valueOf(r);
+  }
+  
+  /**
+   * @param taxonomy
+   *          taxonomy name
+   * @param termId
+   *          term id
+   * @return result of the operation
+   */
+  @SuppressWarnings("boxing")
+  public boolean deleteTerm(String taxonomy, Integer termId) {
+    Boolean r = this.wp.deleteTerm(0, this.username, this.password, taxonomy,
+        termId);
+    return r.booleanValue();
+  }
+  
+  /**
+   * @param termId
+   *          term id
+   * @param content
+   *          new contents
+   * @return the result of the operation
+   */
+  @SuppressWarnings({ "unchecked", "boxing" })
+  public boolean editTerm(Integer termId, Term content) {
+    XmlRpcStruct datar = new XmlRpcStruct();
+    datar.put("taxonomy", content.getTaxonomy()); //$NON-NLS-1$
+    if (content.getName() != null)
+      datar.put("name", content.getName()); //$NON-NLS-1$
+    if (content.getSlug() != null)
+      datar.put("slug", content.getSlug()); //$NON-NLS-1$
+    if (content.getDescription() != null)
+      datar.put("description", content.getDescription()); //$NON-NLS-1$
+    if (content.getParent() != null)
+      datar.put("parent", content.getParent()); //$NON-NLS-1$
+    Boolean r = this.wp
+        .editTerm(0, this.username, this.password, termId, datar);
+    return r.booleanValue();
+  }
+  
+  /**
+   * @return the list of options
+   */
+  public List<Option> getOptions() {
+    return this.getOptions(null, null);
+  }
+  
+  /**
+   * @param optionName
+   *          option name to get
+   * @return the option
+   */
+  public Option getOption(String optionName) {
+    List<Option> result = this.getOptions(optionName, null);
+    return ((result == null) || (result.size() == 0)) ? null : result.get(0);
+  }
+  
+  /**
+   * @param optionNames
+   *          options to retrieve
+   * @return the options
+   */
+  @SuppressWarnings({ "unchecked", "boxing" })
+  public List<Option> getOptions(String... optionNames) {
+    XmlRpcArray options = null;
+    if (optionNames[0] != null) {
+      options = new XmlRpcArray();
+      for (String s : optionNames) {
+        if (s != null) {
+          options.add(s);
+        }
+      }
+    }
+    XmlRpcStruct r = (options != null) ? this.wp.getOptions(0, this.username,
+        this.password, options) : this.wp.getOptions(0, this.username,
+        this.password);
+    return structToOptions(r);
+  }
+  
+  private static List<Option> structToOptions(XmlRpcStruct r) {
+    List<Option> result = new ArrayList<>();
+    for (Object o : r.keySet()) {
+      String name = (String) o;
+      Option option = new Option();
+      option.setName(name);
+      option.fromXmlRpcStruct(r.getStruct(o));
+      result.add(option);
+    }
+    return result;
+  }
+  
+  /**
+   * @param option
+   *          option to set
+   * @return modified option
+   */
+  public Option setOption(Option option) {
+    List<Option> r = this.setOptions(option);
+    return ((r == null) || (r.size() == 0)) ? null : r.get(0);
+  }
+  
+  /**
+   * @param options
+   *          options to set
+   * @return modified options
+   */
+  @SuppressWarnings({ "boxing", "unchecked" })
+  public List<Option> setOptions(Option... options) {
+    XmlRpcStruct opts = new XmlRpcStruct();
+    for (Option o : options) {
+      if (o != null) {
+        opts.put(o.getName(), o.getValue());
+      }
+    }
+    XmlRpcArray optsArr = new XmlRpcArray();
+    optsArr.add(opts);
+    XmlRpcStruct r = this.wp.setOptions(0, this.username, this.password, opts);
+    return structToOptions(r);
+  }
 }
 
 interface WordpressBridge {
-  
   Boolean editComment(Integer blogid, String username, String password,
       Integer comment_id, Comment comment) throws XmlRpcFault;
   
@@ -1027,157 +1210,35 @@ Object deleteCategory(Integer blogid, String username, String password,
   Boolean deleteComment(Integer blogid, String username, String password,
       Integer comment_id) throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @param post_ID
-   *          ID of the post to delete
-   * @param publish
-   *          Publish status
-   * @return Result of deletion--
-   * @throws XmlRpcFault
-   */
   Boolean deletePage(Integer blogid, String username, String password,
       Integer post_ID, String publish) throws XmlRpcFault;
   
   XmlRpcStruct getCommentStatusList(int i, String username, String password);
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param post_ID
-   *          ID of the post to edit
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @param post
-   *          Post information
-   * @param publish
-   *          Publish status
-   * @return Result of edit
-   * @throws XmlRpcFault
-   */
   Boolean editPage(Integer blogid, Integer post_ID, String username,
       String password, XmlRpcStruct post, String publish) throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @return Array of Authors
-   * @throws XmlRpcFault
-   */
   XmlRpcArray getAuthors(int blogid, String username, String password)
       throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @return Array of categories
-   * @throws XmlRpcFault
-   */
   XmlRpcArray getCategories(int blogid, String username, String password)
       throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param pageid
-   *          Page id
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @return Page information
-   * @throws XmlRpcFault
-   */
   XmlRpcStruct getPage(Integer blogid, Integer pageid, String username,
       String password) throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @return Array of Pages
-   * @throws XmlRpcFault
-   */
   XmlRpcArray getPageList(Integer blogid, String username, String password)
       throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @return Array of Pages
-   * @throws XmlRpcFault
-   */
   XmlRpcArray getPages(Integer blogid, String username, String password)
       throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @param category
-   *          Category information
-   * @return new category id
-   * @throws XmlRpcFault
-   */
   Integer newCategory(Integer blogid, String username, String password,
       XmlRpcStruct category) throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @param post
-   *          Page information
-   * @param publish
-   *          Publish status
-   * @return Post ID
-   * @throws XmlRpcFault
-   */
   String newPage(Integer blogid, String username, String password,
       XmlRpcStruct post, String publish) throws XmlRpcFault;
   
-  /**
-   * @param blogid
-   *          Blog id, not used in wordpress
-   * @param username
-   *          User name
-   * @param password
-   *          Password
-   * @param category
-   *          Category to search
-   * @param max_results
-   *          Maximum results to return
-   * @return List of suggested categories
-   * @throws XmlRpcFault
-   */
   XmlRpcArray suggestCategories(Integer blogid, String username,
       String password, String category, Integer max_results) throws XmlRpcFault;
   
@@ -1202,7 +1263,6 @@ XmlRpcStruct getComment(Integer blogid, String username, String password,
   Integer newComment(Integer blogid, String username, String password,
       Integer post_id, XmlRpcStruct comment) throws XmlRpcFault;
   
-  /* begin TODO */
   XmlRpcStruct getTaxonomy(Integer blogid, String username, String password,
       String taxonomy);
   
@@ -1214,6 +1274,9 @@ XmlRpcStruct getTerm(Integer blogid, String username, String password,
   XmlRpcArray getTerms(Integer blogid, String username, String password,
       String taxonomy, XmlRpcStruct filter);
   
+  XmlRpcArray getTerms(Integer blogid, String username, String password,
+      String taxonomy);
+  
   String newTerm(Integer blogid, String username, String password,
       XmlRpcStruct content);
   
@@ -1223,11 +1286,11 @@ Boolean editTerm(Integer blogid, String username, String password,
   Boolean deleteTerm(Integer blogid, String username, String password,
       String taxonomy, Integer term_id);
   
-  XmlRpcArray getOptions(Integer blogid, String username, String password,
+  XmlRpcStruct getOptions(Integer blogid, String username, String password,
       XmlRpcArray options);
   
-  XmlRpcArray setOptions(Integer blogid, String username, String password,
-      XmlRpcArray options);
-  /* end TODO */
+  XmlRpcStruct getOptions(Integer blogid, String username, String password);
   
+  XmlRpcStruct setOptions(Integer blogid, String username, String password,
+      XmlRpcStruct options);
 }
diff --git a/src/net/bican/wordpress/XmlRpcMapped.java b/src/net/bican/wordpress/XmlRpcMapped.java
index 2988c47..09ceec1 100644
--- a/src/net/bican/wordpress/XmlRpcMapped.java
+++ b/src/net/bican/wordpress/XmlRpcMapped.java
@@ -151,7 +151,12 @@ public void fromXmlRpcStruct(XmlRpcStruct x) {
                 throw new IllegalArgumentException(e1);
               }
             } else {
-              field.set(this, v);
+              if ((v instanceof Boolean) && (kType == String.class)) { // yes it
+                                                                       // happens
+                field.set(this, ((Boolean) v).toString());
+              } else {
+                field.set(this, v);
+              }
             }
           }
         }
diff --git a/test/net/bican/wordpress/test/CategoryTest.java b/test/net/bican/wordpress/test/CategoryTest.java
index d0d046e..37ff1a3 100644
--- a/test/net/bican/wordpress/test/CategoryTest.java
+++ b/test/net/bican/wordpress/test/CategoryTest.java
@@ -10,7 +10,7 @@
 
 @SuppressWarnings({ "static-method", "javadoc", "nls", "boxing" })
 public class CategoryTest extends AbstractWordpressTest {
-
+  
   @Test
   public void testCategories() throws Exception {
     List<Category> categories = WP.getCategories();
@@ -36,5 +36,6 @@ public void testCategories() throws Exception {
     assertNotNull(found);
     assertEquals("deneme", found.getCategoryName());
     assertEquals(rStr, found.getCategoryId());
+    WP.deleteCategory(Integer.valueOf(found.getCategoryId()));
   }
 }
diff --git a/test/net/bican/wordpress/test/OptionsTest.java b/test/net/bican/wordpress/test/OptionsTest.java
new file mode 100644
index 0000000..ac5dfc8
--- /dev/null
+++ b/test/net/bican/wordpress/test/OptionsTest.java
@@ -0,0 +1,81 @@
+package net.bican.wordpress.test;
+
+import static org.junit.Assert.*;
+
+import java.util.List;
+
+import net.bican.wordpress.Option;
+
+import org.junit.Test;
+
+@SuppressWarnings({ "static-method", "javadoc" })
+public class OptionsTest extends AbstractWordpressTest {
+  
+  private static final String DEFAULT_SITE_TITLE = "WordpressJavaTest"; //$NON-NLS-1$
+  private static final String TEST_SITE_TITLE = "test site title"; //$NON-NLS-1$
+  private static final String DEFAULT_TAGLINE = "Just another WordPress site"; //$NON-NLS-1$
+  private static final String TEST_SITE = "test site"; //$NON-NLS-1$
+  private static final String BLOG_TITLE = "blog_title"; //$NON-NLS-1$
+  private static final String SITE_TAGLINE = "Site Tagline"; //$NON-NLS-1$
+  private static final String BLOG_TAGLINE = "blog_tagline"; //$NON-NLS-1$
+  
+  @Test
+  public void testGetOptions() {
+    List<Option> options = WP.getOptions();
+    assertNotNull(options);
+    assertEquals(27, options.size()); // This is epic, I chose 27 before
+                                      // counting. Marking the day I am lucky in
+                                      // the most useless sense: 2015/06/28
+  }
+  
+  @Test
+  public void testGetOption() {
+    Option option = WP.getOption(BLOG_TAGLINE);
+    assertNotNull(option);
+    assertEquals(BLOG_TAGLINE, option.getName());
+    assertEquals(SITE_TAGLINE, option.getDesc());
+  }
+  
+  @Test
+  public void testGetOptionMore() {
+    List<Option> options = WP.getOptions(BLOG_TAGLINE, BLOG_TITLE);
+    assertNotNull(options);
+    assertEquals(2, options.size());
+  }
+  
+  @Test
+  public void testSetOption() {
+    Option option = new Option();
+    option.setName(BLOG_TAGLINE);
+    option.setValue(TEST_SITE);
+    Option r = WP.setOption(option);
+    assertNotNull(r);
+    assertEquals(TEST_SITE, r.getValue());
+    assertEquals(BLOG_TAGLINE, r.getName());
+    option.setValue(DEFAULT_TAGLINE);
+    WP.setOption(option);
+  }
+  
+  @Test
+  public void testSetOptions() {
+    Option option1 = new Option();
+    option1.setName(BLOG_TAGLINE);
+    option1.setValue(TEST_SITE);
+    Option option2 = new Option();
+    option2.setName(BLOG_TITLE);
+    option2.setValue(TEST_SITE_TITLE);
+    List<Option> r = WP.setOptions(option1, option2);
+    assertNotNull(r);
+    assertEquals(2, r.size());
+    Option r1 = r.get(0);
+    assertNotNull(r1);
+    assertEquals(BLOG_TAGLINE, r1.getName());
+    assertEquals(TEST_SITE, r1.getValue());
+    Option r2 = r.get(1);
+    assertNotNull(r2);
+    assertEquals(BLOG_TITLE, r2.getName());
+    assertEquals(TEST_SITE_TITLE, r2.getValue());
+    option1.setValue(DEFAULT_TAGLINE);
+    option2.setValue(DEFAULT_SITE_TITLE);
+  }
+}
diff --git a/test/net/bican/wordpress/test/TaxonomyTest.java b/test/net/bican/wordpress/test/TaxonomyTest.java
index 5246eb6..8f32515 100644
--- a/test/net/bican/wordpress/test/TaxonomyTest.java
+++ b/test/net/bican/wordpress/test/TaxonomyTest.java
@@ -2,9 +2,12 @@
 
 import static org.junit.Assert.*;
 
+import java.lang.reflect.UndeclaredThrowableException;
 import java.util.List;
 
 import net.bican.wordpress.Taxonomy;
+import net.bican.wordpress.Term;
+import net.bican.wordpress.TermFilter;
 
 import org.junit.Test;
 
@@ -31,4 +34,77 @@ public void testGetTaxonomies() {
       }
     }
   }
+  
+  @Test
+  public void testGetTaxonomy() {
+    Taxonomy taxonomy = WP.getTaxonomy("category");
+    assertNotNull(taxonomy);
+    assertEquals("category", taxonomy.getName());
+  }
+  
+  @Test
+  public void testGetTerms() {
+    List<Term> terms = WP.getTerms("category");
+    assertNotNull(terms);
+    assertEquals(1, terms.size());
+    Term term = terms.get(0);
+    assertNotNull(term);
+    assertEquals("Uncategorized", term.getName());
+  }
+  
+  @Test
+  public void testGetTermsWithFilter() {
+    TermFilter filter = new TermFilter();
+    filter.setSearch("xxx");
+    List<Term> terms = WP.getTerms("category", filter);
+    assertNotNull(terms);
+    assertEquals(0, terms.size());
+    filter.setSearch("cate");
+    terms = WP.getTerms("category", filter);
+    assertNotNull(terms);
+    assertEquals(1, terms.size());
+  }
+  
+  @Test
+  public void testGetTerm() {
+    @SuppressWarnings("boxing")
+    Term term = WP.getTerm("category", 1);
+    assertNotNull(term);
+    assertEquals("Uncategorized", term.getName());
+  }
+  
+  @Test
+  public void testNewDeleteTerm() {
+    Term term = new Term();
+    term.setName("denemeterm");
+    term.setTaxonomy("category");
+    Integer termId = WP.newTerm(term);
+    assertNotNull(termId);
+    assertTrue(termId.intValue() > 0);
+    assertTrue(WP.deleteTerm("category", termId));
+    try {
+      assertFalse(WP.deleteTerm("category", termId));
+      fail();
+    } catch (UndeclaredThrowableException e) {
+      // that's what we expect
+    }
+  }
+  
+  @SuppressWarnings("boxing")
+  @Test
+  public void testEditTerm() {
+    Term term = WP.getTerm("category", 1);
+    String oldName = term.getName();
+    term.setName("newnamedeneme");
+    Term editTerm = new Term();
+    editTerm.setTaxonomy("category");
+    editTerm.setName("newnamedeneme");
+    assertTrue(WP.editTerm(term.getTerm_id(), editTerm));
+    term = WP.getTerm("category", 1);
+    assertEquals("newnamedeneme", term.getName());
+    editTerm.setName(oldName);
+    assertTrue(WP.editTerm(term.getTerm_id(), editTerm));
+    term = WP.getTerm("category", 1);
+    assertEquals(oldName, term.getName());
+  }
 }