From d5ea43db99b69fc738633b1abf8d95e1470d403a Mon Sep 17 00:00:00 2001 From: XavierNiu Date: Sun, 30 May 2021 21:35:11 +0800 Subject: [PATCH 1/2] unit tests for app metadata reporter of zookeeper --- metadata/report/zookeeper/report_test.go | 50 +++++++++++++++++++----- 1 file changed, 41 insertions(+), 9 deletions(-) diff --git a/metadata/report/zookeeper/report_test.go b/metadata/report/zookeeper/report_test.go index 4f27da4e84..76ad94091f 100644 --- a/metadata/report/zookeeper/report_test.go +++ b/metadata/report/zookeeper/report_test.go @@ -70,7 +70,7 @@ func newServiceMetadataIdentifier(side string) *identifier.ServiceMetadataIdenti } } -func newSubscribeMetadataIdentifier(side string) *identifier.SubscriberMetadataIdentifier { +func newSubscribeMetadataIdentifier() *identifier.SubscriberMetadataIdentifier { return &identifier.SubscriberMetadataIdentifier{ Revision: "1.0", BaseApplicationMetadataIdentifier: identifier.BaseApplicationMetadataIdentifier{Application: "provider"}, @@ -120,7 +120,7 @@ func (suite *zookeeperMetadataReportTestSuite) testGetExportedURLs() { } func (suite *zookeeperMetadataReportTestSuite) testSaveSubscribedData(url *common.URL) { - subscribeMi := newSubscribeMetadataIdentifier("provider") + subscribeMi := newSubscribeMetadataIdentifier() urls := []string{url.String()} bytes, _ := json.Marshal(urls) err := suite.m.SaveSubscribedData(subscribeMi, string(bytes)) @@ -128,7 +128,7 @@ func (suite *zookeeperMetadataReportTestSuite) testSaveSubscribedData(url *commo } func (suite *zookeeperMetadataReportTestSuite) testGetSubscribedURLs() { - subscribeMi := newSubscribeMetadataIdentifier("provider") + subscribeMi := newSubscribeMetadataIdentifier() urls, err := suite.m.GetSubscribedURLs(subscribeMi) assert.Equal(suite.t, 1, len(urls)) assert.NoError(suite.t, err) @@ -141,7 +141,21 @@ func (suite *zookeeperMetadataReportTestSuite) testGetServiceDefinition() { assert.NoError(suite.t, err) } -func test1(t *testing.T) { +func (suite *zookeeperMetadataReportTestSuite) testPublishAppMetadata() { + subscribeMi := newSubscribeMetadataIdentifier() + info := common.NewMetadataInfWithApp(subscribeMi.Application) + err := suite.m.PublishAppMetadata(subscribeMi, info) + assert.NoError(suite.t, err) +} + +func (suite *zookeeperMetadataReportTestSuite) testGetAppMetadata(info *common.MetadataInfo) { + subscribeMi := newSubscribeMetadataIdentifier() + info, err := suite.m.GetAppMetadata(subscribeMi) + assert.NoError(suite.t, err) + assert.Equal(suite.t, "provider", info.App) +} + +func testInterfaceMetadata(t *testing.T) { testCluster, err := zk.StartTestCluster(1, nil, nil, zk.WithRetryTimes(20)) assert.NoError(t, err) defer func() { @@ -149,23 +163,41 @@ func test1(t *testing.T) { assert.Nil(t, err) }() - url := newProviderRegistryUrl("127.0.0.1", testCluster.Servers[0].Port) + providerRegistryUrl := newProviderRegistryUrl("127.0.0.1", testCluster.Servers[0].Port) mf := extension.GetMetadataReportFactory("zookeeper") - m := mf.CreateMetadataReport(url) + m := mf.CreateMetadataReport(providerRegistryUrl) suite := newZookeeperMetadataReportTestSuite(t, m) suite.testStoreProviderMetadata() suite.testStoreConsumerMetadata() - suite.testSaveServiceMetadata(url) + suite.testSaveServiceMetadata(providerRegistryUrl) suite.testGetExportedURLs() suite.testRemoveServiceMetadata() - suite.testSaveSubscribedData(url) + suite.testSaveSubscribedData(providerRegistryUrl) suite.testGetSubscribedURLs() suite.testGetServiceDefinition() } +func testAppMetadata(t *testing.T) { + testCluster, err := zk.StartTestCluster(1, nil, nil, zk.WithRetryTimes(20)) + assert.NoError(t, err) + defer func() { + err := testCluster.Stop() + assert.Nil(t, err) + }() + + providerRegistryUrl := newProviderRegistryUrl("127.0.0.1", testCluster.Servers[0].Port) + mf := extension.GetMetadataReportFactory("zookeeper") + m := mf.CreateMetadataReport(providerRegistryUrl) + + suite := newZookeeperMetadataReportTestSuite(t, m) + suite.testPublishAppMetadata() + +} + // TestZookeeperMetadataReport is dependent on zookeeper-*-fatjar.jar, // please execute `make -f ../../../Makefile prepare` before running unittest. func TestZookeeperMetadataReport(t *testing.T) { - t.Run("test1", test1) + t.Run("testInterfaceMetadata", testInterfaceMetadata) + t.Run("testAppMetadata", testAppMetadata) } From cd59f0041fc8ab26e45731fa3685f5b91641f7ee Mon Sep 17 00:00:00 2001 From: XavierNiu Date: Sun, 30 May 2021 22:01:59 +0800 Subject: [PATCH 2/2] fix unused test case --- metadata/report/zookeeper/report_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/metadata/report/zookeeper/report_test.go b/metadata/report/zookeeper/report_test.go index 76ad94091f..8d718db214 100644 --- a/metadata/report/zookeeper/report_test.go +++ b/metadata/report/zookeeper/report_test.go @@ -148,7 +148,7 @@ func (suite *zookeeperMetadataReportTestSuite) testPublishAppMetadata() { assert.NoError(suite.t, err) } -func (suite *zookeeperMetadataReportTestSuite) testGetAppMetadata(info *common.MetadataInfo) { +func (suite *zookeeperMetadataReportTestSuite) testGetAppMetadata() { subscribeMi := newSubscribeMetadataIdentifier() info, err := suite.m.GetAppMetadata(subscribeMi) assert.NoError(suite.t, err) @@ -192,7 +192,7 @@ func testAppMetadata(t *testing.T) { suite := newZookeeperMetadataReportTestSuite(t, m) suite.testPublishAppMetadata() - + suite.testGetAppMetadata() } // TestZookeeperMetadataReport is dependent on zookeeper-*-fatjar.jar,