diff --git a/buildprbody_test.py b/buildprbody_test.py index 3cc0ba5..e2cce5c 100644 --- a/buildprbody_test.py +++ b/buildprbody_test.py @@ -1,18 +1,5 @@ -# Copyright 2021 Google LLC -# -# Licensed 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. - -"""BuildPrBody tests.""" + + __author__ = "partheniou@google.com (Anthonios Partheniou)" diff --git a/changesummary_test.py b/changesummary_test.py index 0ef0202..f616cdb 100644 --- a/changesummary_test.py +++ b/changesummary_test.py @@ -3,30 +3,11 @@ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obta -"""ChangeSummary tests.""" -__author__ = "partheniou@google.com (Anthonios Partheniou)" -import pandas as pd -from changesummary import ChangeSummary -from changesummary import ChangeType -from changesummary import DirectoryDoesNotExist - -SCRIPTS_DIR = pathlib.Path(__file__).parent.resolve() -NEW_ARTIFACTS_DIR = SCRIPTS_DIR / "test_resources" / "new_artifacts_dir" -CURRENT_ARTIFACTS_DIR = SCRIPTS_DIR / "test_resources" / "current_artifacts_dir" -TEMP_DIR = SCRIPTS_DIR / "test_resources" / "temp" - - -class TestChangeSummary(unittest.TestCase): - def setUp(self): - # Clear temporary directory - shutil.rmtree(TEMP_DIR, ignore_errors=True) - # Create temporary directory - pathlib.Path(TEMP_DIR).mkdir() self.cs = ChangeSummary(NEW_ARTIFACTS_DIR, CURRENT_ARTIFACTS_DIR, TEMP_DIR, []) diff --git a/testresult.xml b/testresult.xml new file mode 100644 index 0000000..ee27b2b --- /dev/null +++ b/testresult.xml @@ -0,0 +1,41 @@ + + + + + java.lang.AssertionError: Result expected:<50> but was:<2> + at org.junit.Assert.fail(Assert.java:91) + at org.junit.Assert.failNotEquals(Assert.java:645) + at org.junit.Assert.assertEquals(Assert.java:126) + at org.junit.Assert.assertEquals(Assert.java:470) + at de.vogella.junit.first.MyClassTest.testMultiply(MyClassTest.java:13) + at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) + at sun.reflect.NativeMethodAccessorImpl.invoke(Unknown Source) + at sun.reflect.DelegatingMethodAccessorImpl.invoke(Unknown Source) + at java.lang.reflect.Method.invoke(Unknown Source) + at org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:44) + at org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:15) + at org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:41) + at org.junit.internal.runners.statements.InvokeMethod.evaluate(InvokeMethod.java:20) + at org.junit.runners.BlockJUnit4ClassRunner.runNotIgnored(BlockJUnit4ClassRunner.java:79) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:71) + at org.junit.runners.BlockJUnit4ClassRunner.runChild(BlockJUnit4ClassRunner.java:49) + at org.junit.runners.ParentRunner$3.run(ParentRunner.java:193) + at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:52) + at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:191) + at org.junit.runners.ParentRunner.access$000(ParentRunner.java:42) + at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:184) + at org.junit.runners.ParentRunner.run(ParentRunner.java:236) + at org.eclipse.jdt.internal.junit4.runner.JUnit4TestReference.run(JUnit4TestReference.java:50) + at org.eclipse.jdt.internal.junit.runner.TestExecution.run(TestExecution.java:38) + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:467) + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.runTests(RemoteTestRunner.java:683) + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.run(RemoteTestRunner.java:390) + at org.eclipse.jdt.internal.junit.runner.RemoteTestRunner.main(RemoteTestRunner.java:197) + + + + + + + + diff --git a/updatediscoveryartifacts.py b/updatediscoveryartifacts.py new file mode 100644 index 0000000..b823bd7 --- /dev/null +++ b/updatediscoveryartifacts.py @@ -0,0 +1,81 @@ +# Copyright 2021 Google LLC + +# Licensed 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 + +# https://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. + + +import pathlib +import shutil +import subprocess +import tempfile + +import describe +import changesummary + + +SCRIPTS_DIR = pathlib.Path(__file__).parent.resolve() +DISCOVERY_DOC_DIR = ( + SCRIPTS_DIR / ".." / "googleapiclient" / "discovery_cache" / "documents" +) +REFERENCE_DOC_DIR = SCRIPTS_DIR / ".." / "docs" / "dyn" +TEMP_DIR = SCRIPTS_DIR / "temp" + +# Clear discovery documents and reference documents directory +shutil.rmtree(DISCOVERY_DOC_DIR, ignore_errors=True) +shutil.rmtree(REFERENCE_DOC_DIR, ignore_errors=True) + +# Clear temporary directory +shutil.rmtree(TEMP_DIR, ignore_errors=True) + +# Check out a fresh copy +subprocess.call(["git", "checkout", DISCOVERY_DOC_DIR]) +subprocess.call(["git", "checkout", REFERENCE_DOC_DIR]) + +# Snapshot current discovery artifacts to a temporary directory +with tempfile.TemporaryDirectory() as current_discovery_doc_dir: + shutil.copytree(DISCOVERY_DOC_DIR, current_discovery_doc_dir, dirs_exist_ok=True) + + # Download discovery artifacts and generate documentation + describe.generate_all_api_documents() + + # Get a list of files changed using `git diff` + git_diff_output = subprocess.check_output( + [ + "git", + "diff", + "origin/master", + "--name-only", + "--", + DISCOVERY_DOC_DIR / "*.json", + REFERENCE_DOC_DIR / "*.html", + REFERENCE_DOC_DIR / "*.md", + ], + universal_newlines=True, + ) + + # Create lists of the changed files + all_changed_files = [ + pathlib.Path(file_name).name for file_name in git_diff_output.split("\n") + ] + json_changed_files = [file for file in all_changed_files if file.endswith(".json")] + + # Create temporary directory + pathlib.Path(TEMP_DIR).mkdir() + + # Analyze the changes in discovery artifacts using the changesummary module + changesummary.ChangeSummary( + DISCOVERY_DOC_DIR, current_discovery_doc_dir, TEMP_DIR, json_changed_files + ).detect_discovery_changes() + + # Write a list of the files changed to a file called `changed files` which will be used in the `createcommits.sh` script. + with open(TEMP_DIR / "changed_files", "w") as f: + f.writelines("\n".join(all_changed_files))