Modify license information.

JIRA:https://jira.open-o.org/browse/OCS-46

Change-Id: Iff62c4f5a9f29e20ab6f54772f60b1ab7ea65b1a
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

fix  the build error.

Change-Id: Iecab881eaad2442d48da9a162f2207f742e6982c
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

fix the build error.

Change-Id: Iecab881eaad2442d48da9a162f2207f742e6982c
Signed-off-by: tian.ming@huawei.com <tian.ming@huawei.com>

1 files changed, 16 insertions, 43 deletions

diff --git a/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java
index 624f54c..b91bbef 100644
--- a/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java
+++ b/rest-client/src/test/java/org/openo/baseservice/roa/util/restclient/TestRestfulOptions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, Huawei Technologies Co., Ltd.
+ * Copyright 2016 Huawei Technologies Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ import mockit.integration.junit4.JMockit;
  * </p>
  * 
  * @author
- * @version SDNO 0.5 20-Jun-2016
+ * @version   20-Jun-2016
  */
 @RunWith(JMockit.class)
 public class TestRestfulOptions {
@@ -55,7 +55,7 @@ public class TestRestfulOptions {
      * <br/>
      * 
      * @throws java.lang.Exception
-     * @since SDNO 0.5
+     * @since  
      */
     @BeforeClass
     public static void setUpBeforeClass() throws Exception {
@@ -65,7 +65,7 @@ public class TestRestfulOptions {
      * <br/>
      * 
      * @throws java.lang.Exception
-     * @since SDNO 0.5
+     * @since  
      */
     @AfterClass
     public static void tearDownAfterClass() throws Exception {
@@ -75,7 +75,7 @@ public class TestRestfulOptions {
      * <br/>
      * 
      * @throws java.lang.Exception
-     * @since SDNO 0.5
+     * @since  
      */
     @Before
     public void setUp() throws Exception {
@@ -85,7 +85,7 @@ public class TestRestfulOptions {
      * <br/>
      * 
      * @throws java.lang.Exception
-     * @since SDNO 0.5
+     * @since  
      */
     @After
     public void tearDown() throws Exception {
@@ -94,34 +94,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
-     */
-    @Test
-    public void testSetCalledServiceName() {
-        final RestfulOptions options = new RestfulOptions();
-        final String serviceName = "sample-service";
-        assertTrue(options.setCalledServiceName(serviceName));
-        assertEquals(serviceName, options.getCalledServicName());
-    }
-
-    /**
-     * <br/>
-     * 
-     * @since SDNO 0.5
-     */
-    @Test
-    public void testGetCalledServicName() {
-        final RestfulOptions options = new RestfulOptions();
-        final String serviceName = "sample-service";
-        assertEquals("", options.getCalledServicName());
-        options.setCalledServiceName(serviceName);
-        assertEquals(serviceName, options.getCalledServicName());
-    }
-
-    /**
-     * <br/>
-     * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testGetPort() {
@@ -135,7 +108,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testSetPort() {
@@ -148,7 +121,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testGetHost() {
@@ -162,7 +135,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testSetHost() {
@@ -175,7 +148,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testSetRestTimeout() {
@@ -207,7 +180,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testGetRestTimeout() {
@@ -223,7 +196,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testGetOption() {
@@ -248,7 +221,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testGetIntOption() {
@@ -270,7 +243,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testGetStringOption() {
@@ -291,7 +264,7 @@ public class TestRestfulOptions {
     /**
      * <br/>
      * 
-     * @since SDNO 0.5
+     * @since  
      */
     @Test
     public void testSetOption() {