accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/5] accumulo git commit: Merge branch '1.7'
Date Wed, 13 May 2015 20:30:52 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
index 9a12383,0000000..6359d1e
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/TBinaryProxyIT.java
@@@ -1,33 -1,0 +1,33 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test.proxy;
 +
 +import org.apache.thrift.protocol.TBinaryProtocol;
- import org.apache.thrift.protocol.TProtocolFactory;
++import org.junit.BeforeClass;
 +
 +/**
 + *
 + */
 +public class TBinaryProxyIT extends SimpleProxyBase {
 +
-   private static final TBinaryProtocol.Factory factory = new TBinaryProtocol.Factory();
- 
-   @Override
-   public TProtocolFactory getProtocol() {
-     return factory;
++  @BeforeClass
++  public static void setProtocol() throws Exception {
++    SimpleProxyBase.factory = new TBinaryProtocol.Factory();
++    setUpProxy();
 +  }
++
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
index 4d3e775,0000000..a92414a
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/TCompactProxyIT.java
@@@ -1,33 -1,0 +1,32 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test.proxy;
 +
 +import org.apache.thrift.protocol.TCompactProtocol;
- import org.apache.thrift.protocol.TProtocolFactory;
++import org.junit.BeforeClass;
 +
 +/**
 + *
 + */
 +public class TCompactProxyIT extends SimpleProxyBase {
 +
-   private static final TCompactProtocol.Factory factory = new TCompactProtocol.Factory();
- 
-   @Override
-   public TProtocolFactory getProtocol() {
-     return factory;
++  @BeforeClass
++  public static void setProtocol() throws Exception {
++    SimpleProxyBase.factory = new TCompactProtocol.Factory();
++    setUpProxy();
 +  }
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
index fa04427,0000000..5fcbf53
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/TJsonProtocolProxyIT.java
@@@ -1,33 -1,0 +1,33 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test.proxy;
 +
 +import org.apache.thrift.protocol.TJSONProtocol;
- import org.apache.thrift.protocol.TProtocolFactory;
++import org.junit.BeforeClass;
 +
 +/**
 + *
 + */
 +public class TJsonProtocolProxyIT extends SimpleProxyBase {
 +
-   private static final TJSONProtocol.Factory factory = new TJSONProtocol.Factory();
- 
-   @Override
-   public TProtocolFactory getProtocol() {
-     return factory;
++  @BeforeClass
++  public static void setProtocol() throws Exception {
++    SimpleProxyBase.factory = new TJSONProtocol.Factory();
++    setUpProxy();
 +  }
++
 +}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eeca25db/test/src/test/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
----------------------------------------------------------------------
diff --cc test/src/test/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
index 6c039dd,0000000..cdecf2c
mode 100644,000000..100644
--- a/test/src/test/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/proxy/TTupleProxyIT.java
@@@ -1,33 -1,0 +1,33 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the "License"); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + *     http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an "AS IS" BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test.proxy;
 +
- import org.apache.thrift.protocol.TProtocolFactory;
 +import org.apache.thrift.protocol.TTupleProtocol;
++import org.junit.BeforeClass;
 +
 +/**
 + *
 + */
 +public class TTupleProxyIT extends SimpleProxyBase {
 +
-   private static final TTupleProtocol.Factory factory = new TTupleProtocol.Factory();
- 
-   @Override
-   public TProtocolFactory getProtocol() {
-     return factory;
++  @BeforeClass
++  public static void setProtocol() throws Exception {
++    SimpleProxyBase.factory = new TTupleProtocol.Factory();
++    setUpProxy();
 +  }
++
 +}


Mime
View raw message