You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@ozone.apache.org by GitBox <gi...@apache.org> on 2020/09/23 08:03:06 UTC
[GitHub] [hadoop-ozone] cxorm commented on a change in pull request #1425: HDDS-2981 Add unit tests for Proto [de]serialization
cxorm commented on a change in pull request #1425:
URL: https://github.com/apache/hadoop-ozone/pull/1425#discussion_r493277765
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java
##########
@@ -18,39 +18,91 @@
package org.apache.hadoop.ozone.om.helpers;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.junit.Assert;
import org.junit.Test;
import java.util.Collections;
import java.util.HashMap;
+
import static org.apache.hadoop.ozone.OzoneAcl.AclScope.ACCESS;
/**
* Class to test OmPrefixInfo.
*/
public class TestOmPrefixInfo {
- @Test
- public void testCopyObject() {
- OmPrefixInfo omPrefixInfo = new OmPrefixInfo("/path",
+ public OmPrefixInfo getOmPrefixInfoForTest(String path,
+ IAccessAuthorizer.ACLIdentityType identityType,
+ String identityString,
+ IAccessAuthorizer.ACLType aclType,
+ OzoneAcl.AclScope scope){
+ return new OmPrefixInfo(path,
Collections.singletonList(new OzoneAcl(
- IAccessAuthorizer.ACLIdentityType.USER, "user1",
- IAccessAuthorizer.ACLType.WRITE, ACCESS)), new HashMap<>(), 10, 100);
+ identityType, identityString,
+ aclType, scope)), new HashMap<>(), 10, 100);
+ }
+
+ @Test
+ public void testCopyObject() {
+ String testPath = "/my/custom/path";
+ String username = "myuser";
+ OmPrefixInfo omPrefixInfo = getOmPrefixInfoForTest(testPath,
+ IAccessAuthorizer.ACLIdentityType.USER,
+ username,
+ IAccessAuthorizer.ACLType.WRITE,
+ ACCESS);
OmPrefixInfo clonePrefixInfo = omPrefixInfo.copyObject();
Assert.assertEquals(omPrefixInfo, clonePrefixInfo);
// Change acls and check.
omPrefixInfo.addAcl(new OzoneAcl(
- IAccessAuthorizer.ACLIdentityType.USER, "user1",
+ IAccessAuthorizer.ACLIdentityType.USER, username,
IAccessAuthorizer.ACLType.READ, ACCESS));
Assert.assertNotEquals(omPrefixInfo, clonePrefixInfo);
}
+
+ @Test
+ public void testgetFromProtobufOneMetadataOneAcl(){
+ String prefixInfoPath = "/mypath/path";
+ String aclString = "user:myuser:rw";
+ String metakey = "metakey";
+ String metaval = "metaval";
+ HddsProtos.KeyValue metadata = TestInstanceHelper
+ .getDefaultTestMetadata(metakey, metaval);
+ OzoneManagerProtocolProtos.PrefixInfo prefixInfo =
+ TestInstanceHelper.getDefaultTestPrefixInfo(prefixInfoPath,
+ aclString, metadata);
+
+ OmPrefixInfo ompri = OmPrefixInfo.getFromProtobuf(prefixInfo);
+
+ Assert.assertEquals(prefixInfoPath, ompri.getName());
+ Assert.assertEquals(1, ompri.getMetadata().size());
+ Assert.assertEquals(metaval, ompri.getMetadata().get(metakey));
+ Assert.assertEquals(1, ompri.getAcls().size());
+ }
+
+ @Test
+ public void testGetProtobuf(){
Review comment:
```suggestion
public void testGetProtobuf() {
```
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java
##########
@@ -18,39 +18,91 @@
package org.apache.hadoop.ozone.om.helpers;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.junit.Assert;
import org.junit.Test;
import java.util.Collections;
import java.util.HashMap;
+
import static org.apache.hadoop.ozone.OzoneAcl.AclScope.ACCESS;
/**
* Class to test OmPrefixInfo.
*/
public class TestOmPrefixInfo {
- @Test
- public void testCopyObject() {
- OmPrefixInfo omPrefixInfo = new OmPrefixInfo("/path",
+ public OmPrefixInfo getOmPrefixInfoForTest(String path,
+ IAccessAuthorizer.ACLIdentityType identityType,
+ String identityString,
+ IAccessAuthorizer.ACLType aclType,
+ OzoneAcl.AclScope scope){
Review comment:
```suggestion
OzoneAcl.AclScope scope) {
```
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestInstanceHelper.java
##########
@@ -0,0 +1,67 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.ozone.om.helpers;
+
+import com.google.protobuf.ByteString;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+
+
+/**
+ * Test TestInstanceHelper.
+ *
+ * Utility methods to create test instances of protobuf related classes
+ */
+public final class TestInstanceHelper {
+
+ private TestInstanceHelper(){
+ super();
+ }
+
+ public static OzoneManagerProtocolProtos.OzoneAclInfo buildTestOzoneAclInfo(
+ String aclString){
+ OzoneAcl oacl = OzoneAcl.parseAcl(aclString);
+ ByteString rights = ByteString.copyFrom(oacl.getAclBitSet().toByteArray());
+ return OzoneManagerProtocolProtos.OzoneAclInfo.newBuilder()
+ .setType(OzoneManagerProtocolProtos.OzoneAclInfo.OzoneAclType.USER)
+ .setName(oacl.getName())
+ .setRights(rights)
+ .setAclScope(OzoneManagerProtocolProtos.
+ OzoneAclInfo.OzoneAclScope.ACCESS)
+ .build();
+ }
+
+ public static HddsProtos.KeyValue getDefaultTestMetadata(
+ String key, String value){
+ return HddsProtos.KeyValue.newBuilder()
+ .setKey(key)
+ .setValue(value)
+ .build();
+ }
+
+ public static OzoneManagerProtocolProtos.PrefixInfo getDefaultTestPrefixInfo(
+ String name, String aclString, HddsProtos.KeyValue metadata){
Review comment:
```suggestion
String name, String aclString, HddsProtos.KeyValue metadata) {
```
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestInstanceHelper.java
##########
@@ -0,0 +1,67 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.ozone.om.helpers;
+
+import com.google.protobuf.ByteString;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+
+
+/**
+ * Test TestInstanceHelper.
+ *
+ * Utility methods to create test instances of protobuf related classes
+ */
+public final class TestInstanceHelper {
+
+ private TestInstanceHelper(){
Review comment:
```suggestion
private TestInstanceHelper() {
```
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestInstanceHelper.java
##########
@@ -0,0 +1,67 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.ozone.om.helpers;
+
+import com.google.protobuf.ByteString;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+
+
+/**
+ * Test TestInstanceHelper.
+ *
+ * Utility methods to create test instances of protobuf related classes
+ */
+public final class TestInstanceHelper {
+
+ private TestInstanceHelper(){
+ super();
+ }
+
+ public static OzoneManagerProtocolProtos.OzoneAclInfo buildTestOzoneAclInfo(
+ String aclString){
+ OzoneAcl oacl = OzoneAcl.parseAcl(aclString);
+ ByteString rights = ByteString.copyFrom(oacl.getAclBitSet().toByteArray());
+ return OzoneManagerProtocolProtos.OzoneAclInfo.newBuilder()
+ .setType(OzoneManagerProtocolProtos.OzoneAclInfo.OzoneAclType.USER)
+ .setName(oacl.getName())
+ .setRights(rights)
+ .setAclScope(OzoneManagerProtocolProtos.
+ OzoneAclInfo.OzoneAclScope.ACCESS)
+ .build();
+ }
+
+ public static HddsProtos.KeyValue getDefaultTestMetadata(
+ String key, String value){
Review comment:
```suggestion
String key, String value) {
```
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestOmPrefixInfo.java
##########
@@ -18,39 +18,91 @@
package org.apache.hadoop.ozone.om.helpers;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
import org.apache.hadoop.ozone.security.acl.IAccessAuthorizer;
import org.junit.Assert;
import org.junit.Test;
import java.util.Collections;
import java.util.HashMap;
+
import static org.apache.hadoop.ozone.OzoneAcl.AclScope.ACCESS;
/**
* Class to test OmPrefixInfo.
*/
public class TestOmPrefixInfo {
- @Test
- public void testCopyObject() {
- OmPrefixInfo omPrefixInfo = new OmPrefixInfo("/path",
+ public OmPrefixInfo getOmPrefixInfoForTest(String path,
+ IAccessAuthorizer.ACLIdentityType identityType,
+ String identityString,
+ IAccessAuthorizer.ACLType aclType,
+ OzoneAcl.AclScope scope){
+ return new OmPrefixInfo(path,
Collections.singletonList(new OzoneAcl(
- IAccessAuthorizer.ACLIdentityType.USER, "user1",
- IAccessAuthorizer.ACLType.WRITE, ACCESS)), new HashMap<>(), 10, 100);
+ identityType, identityString,
+ aclType, scope)), new HashMap<>(), 10, 100);
+ }
+
+ @Test
+ public void testCopyObject() {
+ String testPath = "/my/custom/path";
+ String username = "myuser";
+ OmPrefixInfo omPrefixInfo = getOmPrefixInfoForTest(testPath,
+ IAccessAuthorizer.ACLIdentityType.USER,
+ username,
+ IAccessAuthorizer.ACLType.WRITE,
+ ACCESS);
OmPrefixInfo clonePrefixInfo = omPrefixInfo.copyObject();
Assert.assertEquals(omPrefixInfo, clonePrefixInfo);
// Change acls and check.
omPrefixInfo.addAcl(new OzoneAcl(
- IAccessAuthorizer.ACLIdentityType.USER, "user1",
+ IAccessAuthorizer.ACLIdentityType.USER, username,
IAccessAuthorizer.ACLType.READ, ACCESS));
Assert.assertNotEquals(omPrefixInfo, clonePrefixInfo);
}
+
+ @Test
+ public void testgetFromProtobufOneMetadataOneAcl(){
Review comment:
```suggestion
public void testgetFromProtobufOneMetadataOneAcl() {
```
##########
File path: hadoop-ozone/common/src/test/java/org/apache/hadoop/ozone/om/helpers/TestInstanceHelper.java
##########
@@ -0,0 +1,67 @@
+/**
+ * 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
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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.hadoop.ozone.om.helpers;
+
+import com.google.protobuf.ByteString;
+import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
+import org.apache.hadoop.ozone.OzoneAcl;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
+
+
+/**
+ * Test TestInstanceHelper.
+ *
+ * Utility methods to create test instances of protobuf related classes
+ */
+public final class TestInstanceHelper {
+
+ private TestInstanceHelper(){
+ super();
+ }
+
+ public static OzoneManagerProtocolProtos.OzoneAclInfo buildTestOzoneAclInfo(
+ String aclString){
Review comment:
```suggestion
String aclString) {
```
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: ozone-issues-unsubscribe@hadoop.apache.org
For additional commands, e-mail: ozone-issues-help@hadoop.apache.org